diff --git a/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/mcuconf.h index d400fd083..1fb9f89b3 100644 --- a/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32H743I-NUCLEO144/cfg/mcuconf.h @@ -183,8 +183,8 @@ #define STM32_IRQ_QUADSPI1_PRIORITY 10 -#define STM32_IRQ_SDMMC1_PRIORITY 8 -#define STM32_IRQ_SDMMC2_PRIORITY 8 +#define STM32_IRQ_SDMMC1_PRIORITY 9 +#define STM32_IRQ_SDMMC2_PRIORITY 9 #define STM32_IRQ_TIM1_UP_PRIORITY 7 #define STM32_IRQ_TIM1_CC_PRIORITY 7 diff --git a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h index 2dae81f98..97ece82bc 100644 --- a/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32L4R5ZI-NUCLEO144/cfg/mcuconf.h @@ -125,6 +125,8 @@ #define STM32_IRQ_EXTI20_PRIORITY 6 #define STM32_IRQ_EXTI21_22_PRIORITY 6 +#define STM32_IRQ_SDMMC1_PRIORITY 9 + #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7 #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7 #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7 diff --git a/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h b/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h index 1da66fa96..bdad0744e 100644 --- a/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h +++ b/demos/STM32/RT-STM32L4R9-DISCOVERY/cfg/mcuconf.h @@ -125,6 +125,8 @@ #define STM32_IRQ_EXTI20_PRIORITY 6 #define STM32_IRQ_EXTI21_22_PRIORITY 6 +#define STM32_IRQ_SDMMC1_PRIORITY 9 + #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7 #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7 #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7 diff --git a/os/hal/ports/STM32/STM32L4xx+/stm32_isr.c b/os/hal/ports/STM32/STM32L4xx+/stm32_isr.c index 8800b0200..e36ca8db0 100644 --- a/os/hal/ports/STM32/STM32L4xx+/stm32_isr.c +++ b/os/hal/ports/STM32/STM32L4xx+/stm32_isr.c @@ -64,6 +64,8 @@ #include "stm32_exti20.inc" #include "stm32_exti21_22.inc" +#include "stm32_sdmmc1.inc" + #include "stm32_usart1.inc" #include "stm32_usart2.inc" #include "stm32_usart3.inc" @@ -103,6 +105,8 @@ void irqInit(void) { exti19_irq_init(); exti21_22_irq_init(); + sdmmc1_irq_init(); + tim1_tim15_tim16_tim17_irq_init(); tim2_irq_init(); tim3_irq_init(); @@ -139,6 +143,8 @@ void irqDeinit(void) { exti19_irq_deinit(); exti21_22_irq_deinit(); + sdmmc1_irq_deinit(); + tim1_tim15_tim16_tim17_irq_deinit(); tim2_irq_deinit(); tim3_irq_deinit(); diff --git a/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/mcuconf.h b/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/mcuconf.h index ed2beaadb..e35eb01bd 100644 --- a/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/ADC/cfg/stm32h743_nucleo144/mcuconf.h @@ -183,8 +183,8 @@ #define STM32_IRQ_QUADSPI1_PRIORITY 10 -#define STM32_IRQ_SDMMC1_PRIORITY 8 -#define STM32_IRQ_SDMMC2_PRIORITY 8 +#define STM32_IRQ_SDMMC1_PRIORITY 9 +#define STM32_IRQ_SDMMC2_PRIORITY 9 #define STM32_IRQ_TIM1_UP_PRIORITY 7 #define STM32_IRQ_TIM1_CC_PRIORITY 7 diff --git a/testhal/STM32/multi/ADC/cfg/stm32l4r5zi_nucleo144/mcuconf.h b/testhal/STM32/multi/ADC/cfg/stm32l4r5zi_nucleo144/mcuconf.h index 442ad9d33..73787927f 100644 --- a/testhal/STM32/multi/ADC/cfg/stm32l4r5zi_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/ADC/cfg/stm32l4r5zi_nucleo144/mcuconf.h @@ -125,6 +125,8 @@ #define STM32_IRQ_EXTI20_PRIORITY 6 #define STM32_IRQ_EXTI21_22_PRIORITY 6 +#define STM32_IRQ_SDMMC1_PRIORITY 9 + #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7 #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7 #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7 diff --git a/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h b/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h index 4c858fefb..64df3f71c 100644 --- a/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/DAC/cfg/stm32h743_nucleo144/mcuconf.h @@ -183,8 +183,8 @@ #define STM32_IRQ_QUADSPI1_PRIORITY 10 -#define STM32_IRQ_SDMMC1_PRIORITY 8 -#define STM32_IRQ_SDMMC2_PRIORITY 8 +#define STM32_IRQ_SDMMC1_PRIORITY 9 +#define STM32_IRQ_SDMMC2_PRIORITY 9 #define STM32_IRQ_TIM1_UP_PRIORITY 7 #define STM32_IRQ_TIM1_CC_PRIORITY 7 diff --git a/testhal/STM32/multi/DAC/cfg/stm32l4r5zi_nucleo144/mcuconf.h b/testhal/STM32/multi/DAC/cfg/stm32l4r5zi_nucleo144/mcuconf.h index b0267b8b5..5ddb1ee24 100644 --- a/testhal/STM32/multi/DAC/cfg/stm32l4r5zi_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/DAC/cfg/stm32l4r5zi_nucleo144/mcuconf.h @@ -125,6 +125,8 @@ #define STM32_IRQ_EXTI20_PRIORITY 6 #define STM32_IRQ_EXTI21_22_PRIORITY 6 +#define STM32_IRQ_SDMMC1_PRIORITY 9 + #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7 #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7 #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7 diff --git a/testhal/STM32/multi/RTC/cfg/stm32l4r5_nucleo144/mcuconf.h b/testhal/STM32/multi/RTC/cfg/stm32l4r5_nucleo144/mcuconf.h index 2dae81f98..97ece82bc 100644 --- a/testhal/STM32/multi/RTC/cfg/stm32l4r5_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/RTC/cfg/stm32l4r5_nucleo144/mcuconf.h @@ -125,6 +125,8 @@ #define STM32_IRQ_EXTI20_PRIORITY 6 #define STM32_IRQ_EXTI21_22_PRIORITY 6 +#define STM32_IRQ_SDMMC1_PRIORITY 9 + #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7 #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7 #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7 diff --git a/testhal/STM32/multi/SDMMC-FATFS/cfg/stm32l4r9ai_discovery/mcuconf.h b/testhal/STM32/multi/SDMMC-FATFS/cfg/stm32l4r9ai_discovery/mcuconf.h index bb0ee4136..1d335785d 100644 --- a/testhal/STM32/multi/SDMMC-FATFS/cfg/stm32l4r9ai_discovery/mcuconf.h +++ b/testhal/STM32/multi/SDMMC-FATFS/cfg/stm32l4r9ai_discovery/mcuconf.h @@ -125,6 +125,8 @@ #define STM32_IRQ_EXTI20_PRIORITY 6 #define STM32_IRQ_EXTI21_22_PRIORITY 6 +#define STM32_IRQ_SDMMC1_PRIORITY 9 + #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7 #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7 #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7 diff --git a/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h b/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h index f0ccdde72..08cda49a1 100644 --- a/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/SPI/cfg/stm32h743_nucleo144/mcuconf.h @@ -183,8 +183,8 @@ #define STM32_IRQ_QUADSPI1_PRIORITY 10 -#define STM32_IRQ_SDMMC1_PRIORITY 8 -#define STM32_IRQ_SDMMC2_PRIORITY 8 +#define STM32_IRQ_SDMMC1_PRIORITY 9 +#define STM32_IRQ_SDMMC2_PRIORITY 9 #define STM32_IRQ_TIM1_UP_PRIORITY 7 #define STM32_IRQ_TIM1_CC_PRIORITY 7 diff --git a/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/mcuconf.h b/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/mcuconf.h index a66bf8c57..b202b1ff1 100644 --- a/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/SPI/cfg/stm32l4r5_nucleo144/mcuconf.h @@ -125,6 +125,8 @@ #define STM32_IRQ_EXTI20_PRIORITY 6 #define STM32_IRQ_EXTI21_22_PRIORITY 6 +#define STM32_IRQ_SDMMC1_PRIORITY 9 + #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7 #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7 #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7 diff --git a/testhal/STM32/multi/SPI/cfg/stm32l4r9_discovery/mcuconf.h b/testhal/STM32/multi/SPI/cfg/stm32l4r9_discovery/mcuconf.h index e8cb2ba8d..39cbbe68a 100644 --- a/testhal/STM32/multi/SPI/cfg/stm32l4r9_discovery/mcuconf.h +++ b/testhal/STM32/multi/SPI/cfg/stm32l4r9_discovery/mcuconf.h @@ -125,6 +125,8 @@ #define STM32_IRQ_EXTI20_PRIORITY 6 #define STM32_IRQ_EXTI21_22_PRIORITY 6 +#define STM32_IRQ_SDMMC1_PRIORITY 9 + #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7 #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7 #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7 diff --git a/testhal/STM32/multi/TRNG/cfg/stm32l4r5zi_nucleo144/mcuconf.h b/testhal/STM32/multi/TRNG/cfg/stm32l4r5zi_nucleo144/mcuconf.h index d598d42a1..467b16ce7 100644 --- a/testhal/STM32/multi/TRNG/cfg/stm32l4r5zi_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/TRNG/cfg/stm32l4r5zi_nucleo144/mcuconf.h @@ -125,6 +125,8 @@ #define STM32_IRQ_EXTI20_PRIORITY 6 #define STM32_IRQ_EXTI21_22_PRIORITY 6 +#define STM32_IRQ_SDMMC1_PRIORITY 9 + #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7 #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7 #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7 diff --git a/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h index bf8472654..fd8a280fd 100644 --- a/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg/stm32h743_nucleo144/mcuconf.h @@ -183,8 +183,8 @@ #define STM32_IRQ_QUADSPI1_PRIORITY 10 -#define STM32_IRQ_SDMMC1_PRIORITY 8 -#define STM32_IRQ_SDMMC2_PRIORITY 8 +#define STM32_IRQ_SDMMC1_PRIORITY 9 +#define STM32_IRQ_SDMMC2_PRIORITY 9 #define STM32_IRQ_TIM1_UP_PRIORITY 7 #define STM32_IRQ_TIM1_CC_PRIORITY 7 diff --git a/testhal/STM32/multi/USB_CDC/cfg/stm32l4r5_nucleo144/mcuconf.h b/testhal/STM32/multi/USB_CDC/cfg/stm32l4r5_nucleo144/mcuconf.h index 0bde215aa..7622b3981 100644 --- a/testhal/STM32/multi/USB_CDC/cfg/stm32l4r5_nucleo144/mcuconf.h +++ b/testhal/STM32/multi/USB_CDC/cfg/stm32l4r5_nucleo144/mcuconf.h @@ -125,6 +125,8 @@ #define STM32_IRQ_EXTI20_PRIORITY 6 #define STM32_IRQ_EXTI21_22_PRIORITY 6 +#define STM32_IRQ_SDMMC1_PRIORITY 9 + #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7 #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7 #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7 diff --git a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/mcuconf.h b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/mcuconf.h index f0ddcb5bd..cdb7dfd3d 100644 --- a/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/mcuconf.h +++ b/testhal/STM32/multi/WSPI-MFS/cfg/stm32l4r9_discovery/mcuconf.h @@ -125,6 +125,8 @@ #define STM32_IRQ_EXTI20_PRIORITY 6 #define STM32_IRQ_EXTI21_22_PRIORITY 6 +#define STM32_IRQ_SDMMC1_PRIORITY 9 + #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY 7 #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY 7 #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7 diff --git a/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl index 5c7731107..bd9f1c492 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32h743xx/mcuconf.h.ftl @@ -194,8 +194,8 @@ #define STM32_IRQ_QUADSPI1_PRIORITY ${doc.STM32_IRQ_QUADSPI1_PRIORITY!"10"} -#define STM32_IRQ_SDMMC1_PRIORITY ${doc.STM32_IRQ_SDMMC1_PRIORITY!"8"} -#define STM32_IRQ_SDMMC2_PRIORITY ${doc.STM32_IRQ_SDMMC2_PRIORITY!"8"} +#define STM32_IRQ_SDMMC1_PRIORITY ${doc.STM32_IRQ_SDMMC1_PRIORITY!"9"} +#define STM32_IRQ_SDMMC2_PRIORITY ${doc.STM32_IRQ_SDMMC2_PRIORITY!"9"} #define STM32_IRQ_TIM1_UP_PRIORITY ${doc.STM32_IRQ_TIM1_UP_PRIORITY!"7"} #define STM32_IRQ_TIM1_CC_PRIORITY ${doc.STM32_IRQ_TIM1_CC_PRIORITY!"7"} diff --git a/tools/ftl/processors/conf/mcuconf_stm32l4rxxx/mcuconf.h.ftl b/tools/ftl/processors/conf/mcuconf_stm32l4rxxx/mcuconf.h.ftl index 43973bbdd..d4c0b3633 100644 --- a/tools/ftl/processors/conf/mcuconf_stm32l4rxxx/mcuconf.h.ftl +++ b/tools/ftl/processors/conf/mcuconf_stm32l4rxxx/mcuconf.h.ftl @@ -136,6 +136,8 @@ #define STM32_IRQ_EXTI20_PRIORITY ${doc.STM32_IRQ_EXTI20_PRIORITY!"6"} #define STM32_IRQ_EXTI21_22_PRIORITY ${doc.STM32_IRQ_EXTI21_22_PRIORITY!"6"} +#define STM32_IRQ_SDMMC1_PRIORITY ${doc.STM32_IRQ_SDMMC1_PRIORITY!"9"} + #define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY ${doc.STM32_IRQ_TIM1_BRK_TIM15_PRIORITY!"7"} #define STM32_IRQ_TIM1_UP_TIM16_PRIORITY ${doc.STM32_IRQ_TIM1_UP_TIM16_PRIORITY!"7"} #define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY ${doc.STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY!"7"}