djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stm32/sdcard: Fix H7 build when using SDMMC2.

Browse Source 
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.
This commit is contained in:
iabdalkader 2020-10-02 21:44:15 +02:00 committed by Damien George
parent 7497d891a7
commit 9855b9cd82
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ports/stm32/sdcard.c
View File

@ -48,12 +48,14 @@
#if defined(MICROPY_HW_SDMMC2_CK) #if defined(MICROPY_HW_SDMMC2_CK)
#define SDIO SDMMC2 #define SDIO SDMMC2
#define SDMMC_IRQHandler SDMMC2_IRQHandler
#define SDMMC_CLK_ENABLE() __HAL_RCC_SDMMC2_CLK_ENABLE() #define SDMMC_CLK_ENABLE() __HAL_RCC_SDMMC2_CLK_ENABLE()
#define SDMMC_CLK_DISABLE() __HAL_RCC_SDMMC2_CLK_DISABLE() #define SDMMC_CLK_DISABLE() __HAL_RCC_SDMMC2_CLK_DISABLE()
#define SDMMC_IRQn SDMMC2_IRQn #define SDMMC_IRQn SDMMC2_IRQn
#define SDMMC_DMA dma_SDMMC_2 #define SDMMC_DMA dma_SDMMC_2
#else #else
#define SDIO SDMMC1 #define SDIO SDMMC1
#define SDMMC_IRQHandler SDMMC1_IRQHandler
#define SDMMC_CLK_ENABLE() __HAL_RCC_SDMMC1_CLK_ENABLE() #define SDMMC_CLK_ENABLE() __HAL_RCC_SDMMC1_CLK_ENABLE()
#define SDMMC_CLK_DISABLE() __HAL_RCC_SDMMC1_CLK_DISABLE() #define SDMMC_CLK_DISABLE() __HAL_RCC_SDMMC1_CLK_DISABLE()
#define SDMMC_IRQn SDMMC1_IRQn #define SDMMC_IRQn SDMMC1_IRQn
@ -86,8 +88,6 @@
#define SDIO_HARDWARE_FLOW_CONTROL_ENABLE SDMMC_HARDWARE_FLOW_CONTROL_ENABLE #define SDIO_HARDWARE_FLOW_CONTROL_ENABLE SDMMC_HARDWARE_FLOW_CONTROL_ENABLE
#if defined(STM32H7) #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_TRANSFER_CLK_DIV SDMMC_NSpeed_CLK_DIV
#define SDIO_USE_GPDMA 0 #define SDIO_USE_GPDMA 0
#else #else
@ -102,6 +102,7 @@
#define SDMMC_CLK_ENABLE() __SDIO_CLK_ENABLE() #define SDMMC_CLK_ENABLE() __SDIO_CLK_ENABLE()
#define SDMMC_CLK_DISABLE() __SDIO_CLK_DISABLE() #define SDMMC_CLK_DISABLE() __SDIO_CLK_DISABLE()
#define SDMMC_IRQn SDIO_IRQn #define SDMMC_IRQn SDIO_IRQn
#define SDMMC_IRQHandler SDIO_IRQHandler
#define SDMMC_DMA dma_SDIO_0 #define SDMMC_DMA dma_SDIO_0
#define SDIO_USE_GPDMA 1 #define SDIO_USE_GPDMA 1
#define STATIC_AF_SDMMC_CK STATIC_AF_SDIO_CK #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 SDMMC_IRQHandler(void) {
void SDIO_IRQHandler(void) { IRQ_ENTER(SDMMC_IRQn);
IRQ_ENTER(SDIO_IRQn);
sdmmc_irq_handler(); 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) { STATIC void sdcard_reset_periph(void) {
// Fully reset the SDMMC peripheral before calling HAL SD DMA functions. // Fully reset the SDMMC peripheral before calling HAL SD DMA functions.