Fixed missing vector in STM32F3xx EXT ISRs.

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

12 files changed, 33 insertions, 13 deletions

diff --git a/demos/ARMCM4-STM32F303-DISCOVERY/mcuconf.h b/demos/ARMCM4-STM32F303-DISCOVERY/mcuconf.h
index 7472fe42b..220a3ce9d 100644
--- a/demos/ARMCM4-STM32F303-DISCOVERY/mcuconf.h
+++ b/demos/ARMCM4-STM32F303-DISCOVERY/mcuconf.h
@@ -87,7 +87,8 @@
 #define STM32_EXT_EXTI17_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI18_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_23_IRQ_PRIORITY    6

+#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI21_23_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI30_32_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI33_IRQ_PRIORITY       6

 

diff --git a/os/hal/platforms/STM32F30x/ext_lld_isr.c b/os/hal/platforms/STM32F30x/ext_lld_isr.c
index 7017293a1..4603a0f81 100644
--- a/os/hal/platforms/STM32F30x/ext_lld_isr.c
+++ b/os/hal/platforms/STM32F30x/ext_lld_isr.c
@@ -383,8 +383,10 @@ void ext_lld_exti_irq_enable(void) {
                    CORTEX_PRIORITY_MASK(STM32_EXT_EXTI18_IRQ_PRIORITY));

   nvicEnableVector(TAMPER_STAMP_IRQn,

                    CORTEX_PRIORITY_MASK(STM32_EXT_EXTI19_IRQ_PRIORITY));

+  nvicEnableVector(RTC_WKUP_IRQn,

+                   CORTEX_PRIORITY_MASK(STM32_EXT_EXTI20_IRQ_PRIORITY));

   nvicEnableVector(COMP1_2_3_IRQn,

-                   CORTEX_PRIORITY_MASK(STM32_EXT_EXTI20_23_IRQ_PRIORITY));

+                   CORTEX_PRIORITY_MASK(STM32_EXT_EXTI21_23_IRQ_PRIORITY));

   nvicEnableVector(COMP4_5_6_IRQn,

                    CORTEX_PRIORITY_MASK(STM32_EXT_EXTI30_32_IRQ_PRIORITY));

   nvicEnableVector(COMP7_IRQn,

@@ -409,6 +411,7 @@ void ext_lld_exti_irq_disable(void) {
   nvicDisableVector(RTC_Alarm_IRQn);

   nvicDisableVector(USBWakeUp_IRQn);

   nvicDisableVector(TAMPER_STAMP_IRQn);

+  nvicDisableVector(RTC_WKUP_IRQn);

   nvicDisableVector(COMP1_2_3_IRQn);

   nvicDisableVector(COMP4_5_6_IRQn);

   nvicDisableVector(COMP7_IRQn);

diff --git a/os/hal/platforms/STM32F30x/ext_lld_isr.h b/os/hal/platforms/STM32F30x/ext_lld_isr.h
index 6fc84bf6a..1ca3be565 100644
--- a/os/hal/platforms/STM32F30x/ext_lld_isr.h
+++ b/os/hal/platforms/STM32F30x/ext_lld_isr.h
@@ -123,8 +123,15 @@
 /**

  * @brief   EXTI20 interrupt priority level setting.

  */

-#if !defined(STM32_EXT_EXTI20_23_IRQ_PRIORITY) || defined(__DOXYGEN__)

-#define STM32_EXT_EXTI20_23_IRQ_PRIORITY    6

+#if !defined(STM32_EXT_EXTI20_IRQ_PRIORITY) || defined(__DOXYGEN__)

+#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

+#endif

+

+/**

+ * @brief   EXTI21..23 interrupt priority level setting.

+ */

+#if !defined(STM32_EXT_EXTI21_23_IRQ_PRIORITY) || defined(__DOXYGEN__)

+#define STM32_EXT_EXTI21_23_IRQ_PRIORITY    6

 #endif

 

 /**

diff --git a/testhal/STM32F30x/ADC/mcuconf.h b/testhal/STM32F30x/ADC/mcuconf.h
index c6ccf5b70..392ed7649 100644
--- a/testhal/STM32F30x/ADC/mcuconf.h
+++ b/testhal/STM32F30x/ADC/mcuconf.h
@@ -102,7 +102,8 @@
 #define STM32_EXT_EXTI17_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI18_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_23_IRQ_PRIORITY    6

+#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI21_23_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI30_32_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI33_IRQ_PRIORITY       6

 

diff --git a/testhal/STM32F30x/ADC_DUAL/mcuconf.h b/testhal/STM32F30x/ADC_DUAL/mcuconf.h
index 3cac0290b..c74b7d1cc 100644
--- a/testhal/STM32F30x/ADC_DUAL/mcuconf.h
+++ b/testhal/STM32F30x/ADC_DUAL/mcuconf.h
@@ -102,7 +102,8 @@
 #define STM32_EXT_EXTI17_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI18_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_23_IRQ_PRIORITY    6

+#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI21_23_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI30_32_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI33_IRQ_PRIORITY       6

 

diff --git a/testhal/STM32F30x/CAN/mcuconf.h b/testhal/STM32F30x/CAN/mcuconf.h
index 6cbd6b4f7..438e59dbe 100644
--- a/testhal/STM32F30x/CAN/mcuconf.h
+++ b/testhal/STM32F30x/CAN/mcuconf.h
@@ -87,7 +87,8 @@
 #define STM32_EXT_EXTI17_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI18_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_23_IRQ_PRIORITY    6

+#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI21_23_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI30_32_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI33_IRQ_PRIORITY       6

 

diff --git a/testhal/STM32F30x/EXT/mcuconf.h b/testhal/STM32F30x/EXT/mcuconf.h
index 6cbd6b4f7..438e59dbe 100644
--- a/testhal/STM32F30x/EXT/mcuconf.h
+++ b/testhal/STM32F30x/EXT/mcuconf.h
@@ -87,7 +87,8 @@
 #define STM32_EXT_EXTI17_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI18_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_23_IRQ_PRIORITY    6

+#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI21_23_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI30_32_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI33_IRQ_PRIORITY       6

 

diff --git a/testhal/STM32F30x/IRQ_STORM/mcuconf.h b/testhal/STM32F30x/IRQ_STORM/mcuconf.h
index e088afed2..996f10c1b 100644
--- a/testhal/STM32F30x/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32F30x/IRQ_STORM/mcuconf.h
@@ -87,7 +87,8 @@
 #define STM32_EXT_EXTI17_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI18_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_23_IRQ_PRIORITY    6

+#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI21_23_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI30_32_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI33_IRQ_PRIORITY       6

 

diff --git a/testhal/STM32F30x/PWM-ICU/mcuconf.h b/testhal/STM32F30x/PWM-ICU/mcuconf.h
index 25b0b645f..662a09b28 100644
--- a/testhal/STM32F30x/PWM-ICU/mcuconf.h
+++ b/testhal/STM32F30x/PWM-ICU/mcuconf.h
@@ -87,7 +87,8 @@
 #define STM32_EXT_EXTI17_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI18_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_23_IRQ_PRIORITY    6

+#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI21_23_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI30_32_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI33_IRQ_PRIORITY       6

 

diff --git a/testhal/STM32F30x/SPI/mcuconf.h b/testhal/STM32F30x/SPI/mcuconf.h
index e9ac5c67d..e45f0d62d 100644
--- a/testhal/STM32F30x/SPI/mcuconf.h
+++ b/testhal/STM32F30x/SPI/mcuconf.h
@@ -87,7 +87,8 @@
 #define STM32_EXT_EXTI17_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI18_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_23_IRQ_PRIORITY    6

+#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI21_23_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI30_32_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI33_IRQ_PRIORITY       6

 

diff --git a/testhal/STM32F30x/UART/mcuconf.h b/testhal/STM32F30x/UART/mcuconf.h
index 2c8e21a96..c43945bbf 100644
--- a/testhal/STM32F30x/UART/mcuconf.h
+++ b/testhal/STM32F30x/UART/mcuconf.h
@@ -87,7 +87,8 @@
 #define STM32_EXT_EXTI17_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI18_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_23_IRQ_PRIORITY    6

+#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI21_23_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI30_32_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI33_IRQ_PRIORITY       6

 

diff --git a/testhal/STM32F30x/USB_CDC/mcuconf.h b/testhal/STM32F30x/USB_CDC/mcuconf.h
index 2592db249..ec1e46fa4 100644
--- a/testhal/STM32F30x/USB_CDC/mcuconf.h
+++ b/testhal/STM32F30x/USB_CDC/mcuconf.h
@@ -87,7 +87,8 @@
 #define STM32_EXT_EXTI17_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI18_IRQ_PRIORITY       6

 #define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_23_IRQ_PRIORITY    6

+#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

+#define STM32_EXT_EXTI21_23_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI30_32_IRQ_PRIORITY    6

 #define STM32_EXT_EXTI33_IRQ_PRIORITY       6