stm32/sdcard: Fix H7 build when using SDMMC2.
Changes are:
Fix missing IRQ handler when SDMMC2 is used instead of SDMMC1 with H7
MCUs.
Removed outdated H7 series compatibility macros.
Defined common IRQ handler macro for F4 series.
#if defined(MICROPY_HW_SDMMC2_CK)
#define SDIO SDMMC2
+#define SDMMC_IRQHandler SDMMC2_IRQHandler
#define SDMMC_CLK_ENABLE() __HAL_RCC_SDMMC2_CLK_ENABLE()
#define SDMMC_CLK_DISABLE() __HAL_RCC_SDMMC2_CLK_DISABLE()
#define SDMMC_IRQn SDMMC2_IRQn
#define SDMMC_DMA dma_SDMMC_2
#else
#define SDIO SDMMC1
+#define SDMMC_IRQHandler SDMMC1_IRQHandler
#define SDMMC_CLK_ENABLE() __HAL_RCC_SDMMC1_CLK_ENABLE()
#define SDMMC_CLK_DISABLE() __HAL_RCC_SDMMC1_CLK_DISABLE()
#define SDMMC_IRQn SDMMC1_IRQn
#define SDIO_HARDWARE_FLOW_CONTROL_ENABLE SDMMC_HARDWARE_FLOW_CONTROL_ENABLE
#if defined(STM32H7)
-#define GPIO_AF12_SDIO GPIO_AF12_SDIO1
-#define SDIO_IRQHandler SDMMC1_IRQHandler
#define SDIO_TRANSFER_CLK_DIV SDMMC_NSpeed_CLK_DIV
#define SDIO_USE_GPDMA 0
#else
#define SDMMC_CLK_ENABLE() __SDIO_CLK_ENABLE()
#define SDMMC_CLK_DISABLE() __SDIO_CLK_DISABLE()
#define SDMMC_IRQn SDIO_IRQn
+#define SDMMC_IRQHandler SDIO_IRQHandler
#define SDMMC_DMA dma_SDIO_0
#define SDIO_USE_GPDMA 1
#define STATIC_AF_SDMMC_CK STATIC_AF_SDIO_CK
@@ -398,21 +399,11 @@ STATIC void sdmmc_irq_handler(void) {
}
}
-#if !defined(MICROPY_HW_SDMMC2_CK)
-void SDIO_IRQHandler(void) {
- IRQ_ENTER(SDIO_IRQn);
+void SDMMC_IRQHandler(void) {
+ IRQ_ENTER(SDMMC_IRQn);
sdmmc_irq_handler();
- IRQ_EXIT(SDIO_IRQn);
+ IRQ_EXIT(SDMMC_IRQn);
}
-#endif
-
-#if defined(STM32F7)
-void SDMMC2_IRQHandler(void) {
- IRQ_ENTER(SDMMC2_IRQn);
- sdmmc_irq_handler();
- IRQ_EXIT(SDMMC2_IRQn);
-}
-#endif
STATIC void sdcard_reset_periph(void) {
// Fully reset the SDMMC peripheral before calling HAL SD DMA functions.
