Re-aligned mcuconf.h files for F0 devices.

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

9 files changed, 116 insertions, 121 deletions

diff --git a/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h b/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h
index e9cad16db..49aaf37d1 100644
--- a/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h
+++ b/demos/STM32/NIL-STM32F051-DISCOVERY/mcuconf.h
@@ -41,7 +41,6 @@
 #define STM32_PLS                           STM32_PLS_LEV0

 #define STM32_HSI_ENABLED                   TRUE

 #define STM32_HSI14_ENABLED                 TRUE

-#define STM32_HSI48_ENABLED                 FALSE

 #define STM32_LSI_ENABLED                   TRUE

 #define STM32_HSE_ENABLED                   FALSE

 #define STM32_LSE_ENABLED                   FALSE

@@ -61,6 +60,16 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY     3

+#define STM32_IRQ_EXTI16_IRQ_PRIORITY       3

+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY    3

+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY    3

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

@@ -70,16 +79,6 @@
 #define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       3

-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY    3

-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY    3

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

diff --git a/demos/STM32/RT-STM32F030R8-NUCLEO64/mcuconf.h b/demos/STM32/RT-STM32F030R8-NUCLEO64/mcuconf.h
index e47f6600d..dea87437c 100644
--- a/demos/STM32/RT-STM32F030R8-NUCLEO64/mcuconf.h
+++ b/demos/STM32/RT-STM32F030R8-NUCLEO64/mcuconf.h
@@ -59,6 +59,15 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY     3

+#define STM32_IRQ_EXTI16_IRQ_PRIORITY       3

+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY    3

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

@@ -68,15 +77,6 @@
 #define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       3

-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY    3

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

diff --git a/demos/STM32/RT-STM32F031K6-NUCLEO32/mcuconf.h b/demos/STM32/RT-STM32F031K6-NUCLEO32/mcuconf.h
index 3fc828e95..dbfa093b9 100644
--- a/demos/STM32/RT-STM32F031K6-NUCLEO32/mcuconf.h
+++ b/demos/STM32/RT-STM32F031K6-NUCLEO32/mcuconf.h
@@ -60,6 +60,16 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY     3

+#define STM32_IRQ_EXTI16_IRQ_PRIORITY       3

+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY    3

+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY    3

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

@@ -69,16 +79,6 @@
 #define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       3

-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY    3

-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY    3

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

diff --git a/demos/STM32/RT-STM32F042K6-NUCLEO32/mcuconf.h b/demos/STM32/RT-STM32F042K6-NUCLEO32/mcuconf.h
index ca1303cd2..6db87e57b 100644
--- a/demos/STM32/RT-STM32F042K6-NUCLEO32/mcuconf.h
+++ b/demos/STM32/RT-STM32F042K6-NUCLEO32/mcuconf.h
@@ -61,6 +61,16 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY     3

+#define STM32_IRQ_EXTI16_IRQ_PRIORITY       3

+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY    3

+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY    3

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

@@ -70,16 +80,6 @@
 #define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       3

-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY    3

-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY    3

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

diff --git a/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h
index aacd56eb4..49aaf37d1 100644
--- a/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F051-DISCOVERY/mcuconf.h
@@ -60,6 +60,16 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY     3

+#define STM32_IRQ_EXTI16_IRQ_PRIORITY       3

+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY    3

+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY    3

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

@@ -69,24 +79,6 @@
 #define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

- * DAC driver system settings.

- */

-#define STM32_DAC_USE_DAC1_CH1              FALSE

-#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY     10

-#define STM32_DAC_DAC1_CH1_DMA_PRIORITY     2

-#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

-

-/*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       3

-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY    3

-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY    3

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

diff --git a/demos/STM32/RT-STM32F070RB-NUCLEO64/mcuconf.h b/demos/STM32/RT-STM32F070RB-NUCLEO64/mcuconf.h
index a862926d8..b0d21e4b4 100644
--- a/demos/STM32/RT-STM32F070RB-NUCLEO64/mcuconf.h
+++ b/demos/STM32/RT-STM32F070RB-NUCLEO64/mcuconf.h
@@ -60,6 +60,16 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY     3

+#define STM32_IRQ_EXTI16_IRQ_PRIORITY       3

+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY    3

+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY    3

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

@@ -69,24 +79,16 @@
 #define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       3

-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY    3

-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY    3

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

+#define STM32_GPT_USE_TIM2                  FALSE

 #define STM32_GPT_USE_TIM3                  FALSE

 #define STM32_GPT_USE_TIM6                  FALSE

 #define STM32_GPT_USE_TIM7                  FALSE

 #define STM32_GPT_USE_TIM14                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         2

+#define STM32_GPT_TIM2_IRQ_PRIORITY         2

 #define STM32_GPT_TIM3_IRQ_PRIORITY         2

 #define STM32_GPT_TIM6_IRQ_PRIORITY         2

 #define STM32_GPT_TIM7_IRQ_PRIORITY         2

@@ -124,8 +126,10 @@
  */

 #define STM32_PWM_USE_ADVANCED              FALSE

 #define STM32_PWM_USE_TIM1                  FALSE

+#define STM32_PWM_USE_TIM2                  FALSE

 #define STM32_PWM_USE_TIM3                  FALSE

 #define STM32_PWM_TIM1_IRQ_PRIORITY         3

+#define STM32_PWM_TIM2_IRQ_PRIORITY         3

 #define STM32_PWM_TIM3_IRQ_PRIORITY         3

 

 /*

diff --git a/demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h
index 558a0eda6..63fd3852c 100644
--- a/demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32F072-DISCOVERY/mcuconf.h
@@ -61,6 +61,16 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY     3

+#define STM32_IRQ_EXTI16_IRQ_PRIORITY       3

+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY    3

+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY    3

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

@@ -79,26 +89,16 @@
  * DAC driver system settings.

  */

 #define STM32_DAC_DUAL_MODE                 FALSE

-#define STM32_DAC_USE_DAC1_CH1              TRUE

-#define STM32_DAC_USE_DAC1_CH2              TRUE

-#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY     10

-#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY     10

+#define STM32_DAC_USE_DAC1_CH1              FALSE

+#define STM32_DAC_USE_DAC1_CH2              FALSE

+#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY     2

+#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY     2

 #define STM32_DAC_DAC1_CH1_DMA_PRIORITY     2

 #define STM32_DAC_DAC1_CH2_DMA_PRIORITY     2

 #define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       3

-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY    3

-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY    3

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

@@ -149,25 +149,6 @@
 #define STM32_I2S_DMA_ERROR_HOOK(i2sp)      osalSysHalt("DMA failure")

 

 /*

- * I2S driver system settings.

- */

-#define STM32_I2S_USE_SPI1                  FALSE

-#define STM32_I2S_USE_SPI2                  FALSE

-#define STM32_I2S_SPI1_MODE                 (STM32_I2S_MODE_MASTER |        \

-                                             STM32_I2S_MODE_RX)

-#define STM32_I2S_SPI2_MODE                 (STM32_I2S_MODE_MASTER |        \

-                                             STM32_I2S_MODE_RX)

-#define STM32_I2S_SPI1_IRQ_PRIORITY         2

-#define STM32_I2S_SPI2_IRQ_PRIORITY         2

-#define STM32_I2S_SPI1_DMA_PRIORITY         1

-#define STM32_I2S_SPI2_DMA_PRIORITY         1

-#define STM32_I2S_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)

-#define STM32_I2S_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)

-#define STM32_I2S_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)

-#define STM32_I2S_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)

-#define STM32_I2S_DMA_ERROR_HOOK(i2sp)      osalSysHalt("DMA failure")

-

-/*

  * ICU driver system settings.

  */

 #define STM32_ICU_USE_TIM1                  FALSE

diff --git a/demos/STM32/RT-STM32F072RB-NUCLEO64/mcuconf.h b/demos/STM32/RT-STM32F072RB-NUCLEO64/mcuconf.h
index 04018b0ce..c51384690 100644
--- a/demos/STM32/RT-STM32F072RB-NUCLEO64/mcuconf.h
+++ b/demos/STM32/RT-STM32F072RB-NUCLEO64/mcuconf.h
@@ -61,6 +61,16 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY     3

+#define STM32_IRQ_EXTI16_IRQ_PRIORITY       3

+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY    3

+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY    3

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

@@ -79,26 +89,16 @@
  * DAC driver system settings.

  */

 #define STM32_DAC_DUAL_MODE                 FALSE

-#define STM32_DAC_USE_DAC1_CH1              TRUE

-#define STM32_DAC_USE_DAC1_CH2              TRUE

-#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY     10

-#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY     10

+#define STM32_DAC_USE_DAC1_CH1              FALSE

+#define STM32_DAC_USE_DAC1_CH2              FALSE

+#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY     2

+#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY     2

 #define STM32_DAC_DAC1_CH1_DMA_PRIORITY     2

 #define STM32_DAC_DAC1_CH2_DMA_PRIORITY     2

 #define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       3

-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY    3

-#define STM32_EXT_EXTI21_22_IRQ_PRIORITY    3

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

diff --git a/demos/STM32/RT-STM32F091RC-NUCLEO64/mcuconf.h b/demos/STM32/RT-STM32F091RC-NUCLEO64/mcuconf.h
index c4134b130..00c8ccdbb 100644
--- a/demos/STM32/RT-STM32F091RC-NUCLEO64/mcuconf.h
+++ b/demos/STM32/RT-STM32F091RC-NUCLEO64/mcuconf.h
@@ -60,6 +60,15 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY      3

+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY     3

+#define STM32_IRQ_EXTI16_IRQ_PRIORITY       3

+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY    3

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_USE_ADC1                  FALSE

@@ -69,13 +78,23 @@
 #define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)

 

 /*

- * EXT driver system settings.

+ * CAN driver system settings.

+ */

+#define STM32_CAN_USE_CAN1                  FALSE

+#define STM32_CAN_CAN1_IRQ_PRIORITY         3

+

+/*

+ * DAC driver system settings.

  */

-#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3

-#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3

-#define STM32_EXT_EXTI16_IRQ_PRIORITY       3

-#define STM32_EXT_EXTI17_20_IRQ_PRIORITY    3

+#define STM32_DAC_DUAL_MODE                 FALSE

+#define STM32_DAC_USE_DAC1_CH1              FALSE

+#define STM32_DAC_USE_DAC1_CH2              FALSE

+#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY     2

+#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY     2

+#define STM32_DAC_DAC1_CH1_DMA_PRIORITY     2

+#define STM32_DAC_DAC1_CH2_DMA_PRIORITY     2

+#define STM32_DAC_DAC1_CH1_DMA_STREAM       STM32_DMA_STREAM_ID(1, 3)

+#define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

 

 /*

  * GPT driver system settings.