Update L4 mcuconf.h files.

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

10 files changed, 129 insertions, 135 deletions

diff --git a/demos/STM32/RT-STM32L432KC-NUCLEO32/mcuconf.h b/demos/STM32/RT-STM32L432KC-NUCLEO32/mcuconf.h
index 094f1a243..c53776bb2 100644
--- a/demos/STM32/RT-STM32L432KC-NUCLEO32/mcuconf.h
+++ b/demos/STM32/RT-STM32L432KC-NUCLEO32/mcuconf.h
@@ -92,6 +92,22 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_PRIORITY            6

+#define STM32_IRQ_EXTI1_PRIORITY            6

+#define STM32_IRQ_EXTI2_PRIORITY            6

+#define STM32_IRQ_EXTI3_PRIORITY            6

+#define STM32_IRQ_EXTI4_PRIORITY            6

+#define STM32_IRQ_EXTI5_9_PRIORITY          6

+#define STM32_IRQ_EXTI10_15_PRIORITY        6

+#define STM32_IRQ_EXTI1635_38_PRIORITY      6

+#define STM32_IRQ_EXTI18_PRIORITY           6

+#define STM32_IRQ_EXTI19_PRIORITY           6

+#define STM32_IRQ_EXTI20_PRIORITY           6

+#define STM32_IRQ_EXTI21_22_PRIORITY        15

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_DUAL_MODE                 FALSE

@@ -101,6 +117,7 @@
 #define STM32_ADC_ADC1_DMA_PRIORITY         2

 #define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     5

 #define STM32_ADC_ADC123_CLOCK_MODE         ADC_CCR_CKMODE_AHB_DIV1

+

 /*

  * CAN driver system settings.

  */

@@ -121,23 +138,6 @@
 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI1635_38_IRQ_PRIORITY  6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI2122_IRQ_PRIORITY     15

-

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

diff --git a/demos/STM32/RT-STM32L476-DISCOVERY/mcuconf.h b/demos/STM32/RT-STM32L476-DISCOVERY/mcuconf.h
index 82560bcfb..fa8a9a690 100644
--- a/demos/STM32/RT-STM32L476-DISCOVERY/mcuconf.h
+++ b/demos/STM32/RT-STM32L476-DISCOVERY/mcuconf.h
@@ -92,6 +92,22 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_PRIORITY            6

+#define STM32_IRQ_EXTI1_PRIORITY            6

+#define STM32_IRQ_EXTI2_PRIORITY            6

+#define STM32_IRQ_EXTI3_PRIORITY            6

+#define STM32_IRQ_EXTI4_PRIORITY            6

+#define STM32_IRQ_EXTI5_9_PRIORITY          6

+#define STM32_IRQ_EXTI10_15_PRIORITY        6

+#define STM32_IRQ_EXTI1635_38_PRIORITY      6

+#define STM32_IRQ_EXTI18_PRIORITY           6

+#define STM32_IRQ_EXTI19_PRIORITY           6

+#define STM32_IRQ_EXTI20_PRIORITY           6

+#define STM32_IRQ_EXTI21_22_PRIORITY        15

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_DUAL_MODE                 FALSE

@@ -132,23 +148,6 @@
 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI1635_38_IRQ_PRIORITY  6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI2122_IRQ_PRIORITY     15

-

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

@@ -279,7 +278,7 @@
 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

- * ST driver system settings.+++

+ * ST driver system settings.

  */

 #define STM32_ST_IRQ_PRIORITY               8

 #define STM32_ST_USE_TIMER                  2

@@ -329,7 +328,7 @@
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

 

 /*

- * WDG driver system settings.+++

+ * WDG driver system settings.

  */

 #define STM32_WDG_USE_IWDG                  FALSE

 

diff --git a/demos/STM32/RT-STM32L476RG-NUCLEO64/mcuconf.h b/demos/STM32/RT-STM32L476RG-NUCLEO64/mcuconf.h
index d8773b13c..30d897eee 100644
--- a/demos/STM32/RT-STM32L476RG-NUCLEO64/mcuconf.h
+++ b/demos/STM32/RT-STM32L476RG-NUCLEO64/mcuconf.h
@@ -92,6 +92,22 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_PRIORITY            6

+#define STM32_IRQ_EXTI1_PRIORITY            6

+#define STM32_IRQ_EXTI2_PRIORITY            6

+#define STM32_IRQ_EXTI3_PRIORITY            6

+#define STM32_IRQ_EXTI4_PRIORITY            6

+#define STM32_IRQ_EXTI5_9_PRIORITY          6

+#define STM32_IRQ_EXTI10_15_PRIORITY        6

+#define STM32_IRQ_EXTI1635_38_PRIORITY      6

+#define STM32_IRQ_EXTI18_PRIORITY           6

+#define STM32_IRQ_EXTI19_PRIORITY           6

+#define STM32_IRQ_EXTI20_PRIORITY           6

+#define STM32_IRQ_EXTI21_22_PRIORITY        15

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_DUAL_MODE                 FALSE

@@ -132,23 +148,6 @@
 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI1635_38_IRQ_PRIORITY  6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI2122_IRQ_PRIORITY     15

-

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

diff --git a/testhal/STM32/STM32L4xx/ADC/mcuconf.h b/testhal/STM32/STM32L4xx/ADC/mcuconf.h
index 30ed18ef0..c5f238704 100644
--- a/testhal/STM32/STM32L4xx/ADC/mcuconf.h
+++ b/testhal/STM32/STM32L4xx/ADC/mcuconf.h
@@ -92,6 +92,22 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_PRIORITY            6

+#define STM32_IRQ_EXTI1_PRIORITY            6

+#define STM32_IRQ_EXTI2_PRIORITY            6

+#define STM32_IRQ_EXTI3_PRIORITY            6

+#define STM32_IRQ_EXTI4_PRIORITY            6

+#define STM32_IRQ_EXTI5_9_PRIORITY          6

+#define STM32_IRQ_EXTI10_15_PRIORITY        6

+#define STM32_IRQ_EXTI1635_38_PRIORITY      6

+#define STM32_IRQ_EXTI18_PRIORITY           6

+#define STM32_IRQ_EXTI19_PRIORITY           6

+#define STM32_IRQ_EXTI20_PRIORITY           6

+#define STM32_IRQ_EXTI21_22_PRIORITY        15

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_DUAL_MODE                 FALSE

@@ -132,23 +148,6 @@
 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI1635_38_IRQ_PRIORITY  6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI2122_IRQ_PRIORITY     15

-

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

@@ -288,7 +287,7 @@
  * UART driver system settings.

  */

 #define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               TRUE

+#define STM32_UART_USE_USART2               FALSE

 #define STM32_UART_USE_USART3               FALSE

 #define STM32_UART_USE_UART4                FALSE

 #define STM32_UART_USE_UART5                FALSE

diff --git a/testhal/STM32/STM32L4xx/CAN/mcuconf.h b/testhal/STM32/STM32L4xx/CAN/mcuconf.h
index ccc501b0f..25d8ba73d 100644
--- a/testhal/STM32/STM32L4xx/CAN/mcuconf.h
+++ b/testhal/STM32/STM32L4xx/CAN/mcuconf.h
@@ -92,6 +92,22 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_PRIORITY            6

+#define STM32_IRQ_EXTI1_PRIORITY            6

+#define STM32_IRQ_EXTI2_PRIORITY            6

+#define STM32_IRQ_EXTI3_PRIORITY            6

+#define STM32_IRQ_EXTI4_PRIORITY            6

+#define STM32_IRQ_EXTI5_9_PRIORITY          6

+#define STM32_IRQ_EXTI10_15_PRIORITY        6

+#define STM32_IRQ_EXTI1635_38_PRIORITY      6

+#define STM32_IRQ_EXTI18_PRIORITY           6

+#define STM32_IRQ_EXTI19_PRIORITY           6

+#define STM32_IRQ_EXTI20_PRIORITY           6

+#define STM32_IRQ_EXTI21_22_PRIORITY        15

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_DUAL_MODE                 FALSE

@@ -132,23 +148,6 @@
 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI1635_38_IRQ_PRIORITY  6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI2122_IRQ_PRIORITY     15

-

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

@@ -288,7 +287,7 @@
  * UART driver system settings.

  */

 #define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               TRUE

+#define STM32_UART_USE_USART2               FALSE

 #define STM32_UART_USE_USART3               FALSE

 #define STM32_UART_USE_UART4                FALSE

 #define STM32_UART_USE_UART5                FALSE

diff --git a/testhal/STM32/STM32L4xx/GPT-ADC/mcuconf.h b/testhal/STM32/STM32L4xx/GPT-ADC/mcuconf.h
index 58f23cd60..4872a5283 100644
--- a/testhal/STM32/STM32L4xx/GPT-ADC/mcuconf.h
+++ b/testhal/STM32/STM32L4xx/GPT-ADC/mcuconf.h
@@ -92,6 +92,22 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_PRIORITY            6

+#define STM32_IRQ_EXTI1_PRIORITY            6

+#define STM32_IRQ_EXTI2_PRIORITY            6

+#define STM32_IRQ_EXTI3_PRIORITY            6

+#define STM32_IRQ_EXTI4_PRIORITY            6

+#define STM32_IRQ_EXTI5_9_PRIORITY          6

+#define STM32_IRQ_EXTI10_15_PRIORITY        6

+#define STM32_IRQ_EXTI1635_38_PRIORITY      6

+#define STM32_IRQ_EXTI18_PRIORITY           6

+#define STM32_IRQ_EXTI19_PRIORITY           6

+#define STM32_IRQ_EXTI20_PRIORITY           6

+#define STM32_IRQ_EXTI21_22_PRIORITY        15

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_DUAL_MODE                 FALSE

@@ -132,23 +148,6 @@
 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI1635_38_IRQ_PRIORITY  6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI2122_IRQ_PRIORITY     15

-

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

@@ -288,7 +287,7 @@
  * UART driver system settings.

  */

 #define STM32_UART_USE_USART1               FALSE

-#define STM32_UART_USE_USART2               TRUE

+#define STM32_UART_USE_USART2               FALSE

 #define STM32_UART_USE_USART3               FALSE

 #define STM32_UART_USE_UART4                FALSE

 #define STM32_UART_USE_UART5                FALSE

diff --git a/testhal/STM32/STM32L4xx/IRQ_STORM/mcuconf.h b/testhal/STM32/STM32L4xx/IRQ_STORM/mcuconf.h
index fc8d078e2..baa52e611 100644
--- a/testhal/STM32/STM32L4xx/IRQ_STORM/mcuconf.h
+++ b/testhal/STM32/STM32L4xx/IRQ_STORM/mcuconf.h
@@ -92,6 +92,22 @@
 #define STM32_RTCSEL                        STM32_RTCSEL_LSI

 

 /*

+ * IRQ system settings.

+ */

+#define STM32_IRQ_EXTI0_PRIORITY            6

+#define STM32_IRQ_EXTI1_PRIORITY            6

+#define STM32_IRQ_EXTI2_PRIORITY            6

+#define STM32_IRQ_EXTI3_PRIORITY            6

+#define STM32_IRQ_EXTI4_PRIORITY            6

+#define STM32_IRQ_EXTI5_9_PRIORITY          6

+#define STM32_IRQ_EXTI10_15_PRIORITY        6

+#define STM32_IRQ_EXTI1635_38_PRIORITY      6

+#define STM32_IRQ_EXTI18_PRIORITY           6

+#define STM32_IRQ_EXTI19_PRIORITY           6

+#define STM32_IRQ_EXTI20_PRIORITY           6

+#define STM32_IRQ_EXTI21_22_PRIORITY        15

+

+/*

  * ADC driver system settings.

  */

 #define STM32_ADC_DUAL_MODE                 FALSE

@@ -132,23 +148,6 @@
 #define STM32_DAC_DAC1_CH2_DMA_STREAM       STM32_DMA_STREAM_ID(1, 4)

 

 /*

- * EXT driver system settings.

- */

-#define STM32_EXT_EXTI0_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI1_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI2_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI3_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI4_IRQ_PRIORITY        6

-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6

-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6

-#define STM32_EXT_EXTI1635_38_IRQ_PRIORITY  6

-#define STM32_EXT_EXTI18_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI19_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI20_IRQ_PRIORITY       6

-#define STM32_EXT_EXTI2122_IRQ_PRIORITY     15

-

-

-/*

  * GPT driver system settings.

  */

 #define STM32_GPT_USE_TIM1                  FALSE

@@ -164,8 +163,8 @@
 #define STM32_GPT_USE_TIM17                 FALSE

 #define STM32_GPT_TIM1_IRQ_PRIORITY         7

 #define STM32_GPT_TIM2_IRQ_PRIORITY         7

-#define STM32_GPT_TIM3_IRQ_PRIORITY         7

-#define STM32_GPT_TIM4_IRQ_PRIORITY         7

+#define STM32_GPT_TIM3_IRQ_PRIORITY         6

+#define STM32_GPT_TIM4_IRQ_PRIORITY         8

 #define STM32_GPT_TIM5_IRQ_PRIORITY         7

 #define STM32_GPT_TIM6_IRQ_PRIORITY         7

 #define STM32_GPT_TIM7_IRQ_PRIORITY         7

diff --git a/testhal/STM32/multi/PAL/cfg-stm32l476_discovery/mcuconf.h b/testhal/STM32/multi/PAL/cfg-stm32l476_discovery/mcuconf.h
index 77f07088a..1fdf05ccc 100644
--- a/testhal/STM32/multi/PAL/cfg-stm32l476_discovery/mcuconf.h
+++ b/testhal/STM32/multi/PAL/cfg-stm32l476_discovery/mcuconf.h
@@ -105,7 +105,7 @@
 #define STM32_IRQ_EXTI18_PRIORITY           6

 #define STM32_IRQ_EXTI19_PRIORITY           6

 #define STM32_IRQ_EXTI20_PRIORITY           6

-#define STM32_IRQ_EXTI2122_PRIORITY         15

+#define STM32_IRQ_EXTI21_22_PRIORITY        15

 

 /*

  * ADC driver system settings.

@@ -278,7 +278,7 @@
 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

- * ST driver system settings.+++

+ * ST driver system settings.

  */

 #define STM32_ST_IRQ_PRIORITY               8

 #define STM32_ST_USE_TIMER                  2

@@ -328,7 +328,7 @@
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

 

 /*

- * WDG driver system settings.+++

+ * WDG driver system settings.

  */

 #define STM32_WDG_USE_IWDG                  FALSE

 

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 7a934bb4d..657efae66 100644
--- a/testhal/STM32/multi/QSPI-MFS/cfg-stm32l476_discovery/mcuconf.h
+++ b/testhal/STM32/multi/QSPI-MFS/cfg-stm32l476_discovery/mcuconf.h
@@ -105,7 +105,7 @@
 #define STM32_IRQ_EXTI18_PRIORITY           6

 #define STM32_IRQ_EXTI19_PRIORITY           6

 #define STM32_IRQ_EXTI20_PRIORITY           6

-#define STM32_IRQ_EXTI2122_PRIORITY         15

+#define STM32_IRQ_EXTI21_22_PRIORITY        15

 

 /*

  * ADC driver system settings.

@@ -278,7 +278,7 @@
 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

- * ST driver system settings.+++

+ * ST driver system settings.

  */

 #define STM32_ST_IRQ_PRIORITY               8

 #define STM32_ST_USE_TIMER                  2

@@ -328,7 +328,7 @@
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

 

 /*

- * WDG driver system settings.+++

+ * WDG driver system settings.

  */

 #define STM32_WDG_USE_IWDG                  FALSE

 

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 1c4e0a88d..bc2a38ac8 100644
--- a/testhal/STM32/multi/USB_CDC/cfg-stm32l476_discovery/mcuconf.h
+++ b/testhal/STM32/multi/USB_CDC/cfg-stm32l476_discovery/mcuconf.h
@@ -105,7 +105,7 @@
 #define STM32_IRQ_EXTI18_PRIORITY           6

 #define STM32_IRQ_EXTI19_PRIORITY           6

 #define STM32_IRQ_EXTI20_PRIORITY           6

-#define STM32_IRQ_EXTI2122_PRIORITY         15

+#define STM32_IRQ_EXTI21_22_PRIORITY        15

 

 /*

  * ADC driver system settings.

@@ -278,7 +278,7 @@
 #define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")

 

 /*

- * ST driver system settings.+++

+ * ST driver system settings.

  */

 #define STM32_ST_IRQ_PRIORITY               8

 #define STM32_ST_USE_TIMER                  2

@@ -328,7 +328,7 @@
 #define STM32_USB_OTGFIFO_FILL_BASEPRI      0

 

 /*

- * WDG driver system settings.+++

+ * WDG driver system settings.

  */

 #define STM32_WDG_USE_IWDG                  FALSE