|
16 | 16 | #include "drv_dma.h" |
17 | 17 |
|
18 | 18 | // #define DRV_DEBUG |
19 | | -#define LOG_TAG "drv.dma" |
| 19 | +#define LOG_TAG "drv.dma" |
20 | 20 | #include <drv_log.h> |
21 | 21 | /* |
22 | 22 | * DMA-capable BSPs are expected to enable HAL_DMA_MODULE_ENABLED in the |
@@ -86,12 +86,9 @@ static void stm32_dma_enable_clock(rt_uint32_t dma_rcc, rt_bool_t is_bdma) |
86 | 86 | * DMA client does not disable a line still used by another active client. |
87 | 87 | * All other DMA IRQs keep the direct enable/disable behavior. |
88 | 88 | */ |
89 | | -#if (defined(SOC_SERIES_STM32F1) && defined(DMA2_Channel4_5_IRQn)) \ |
90 | | - || (defined(SOC_SERIES_STM32L0) && defined(DMA1_Channel4_5_6_7_IRQn)) \ |
91 | | - || (defined(SOC_SERIES_STM32G0) && defined(DMA1_Channel2_3_IRQn)) \ |
92 | | - || (defined(SOC_SERIES_STM32F0) && (defined(DMA1_Channel2_3_IRQn) || defined(DMA1_Channel4_5_IRQn) || defined(DMA1_Channel4_5_6_7_IRQn))) |
| 89 | +#if (defined(SOC_SERIES_STM32F1) && defined(DMA2_Channel4_5_IRQn)) || (defined(SOC_SERIES_STM32L0) && defined(DMA1_Channel4_5_6_7_IRQn)) || (defined(SOC_SERIES_STM32G0) && defined(DMA1_Channel2_3_IRQn)) || (defined(SOC_SERIES_STM32F0) && (defined(DMA1_Channel2_3_IRQn) || defined(DMA1_Channel4_5_IRQn) || defined(DMA1_Channel4_5_6_7_IRQn))) |
93 | 90 | #define STM32_DMA_HAS_SHARED_IRQ_REFCNT |
94 | | -#define STM32_DMA_IRQ_SLOT_COUNT ((rt_uint32_t)(sizeof(NVIC->ISER) / sizeof(NVIC->ISER[0]) * 32U)) |
| 91 | +#define STM32_DMA_IRQ_SLOT_COUNT ((rt_uint32_t)(sizeof(NVIC->ISER) / sizeof(NVIC->ISER[0]) * 32U)) |
95 | 92 |
|
96 | 93 | /** |
97 | 94 | * @brief Reference count for each shared DMA IRQ line. |
@@ -139,24 +136,24 @@ static rt_bool_t stm32_dma_irq_needs_refcount(IRQn_Type dma_irq) |
139 | 136 | #endif /* defined(SOC_SERIES_STM32G0) && defined(DMA1_Channel2_3_IRQn) */ |
140 | 137 |
|
141 | 138 | #if defined(SOC_SERIES_STM32F0) |
142 | | -# if defined(DMA1_Channel2_3_IRQn) |
| 139 | +#if defined(DMA1_Channel2_3_IRQn) |
143 | 140 | if (dma_irq == DMA1_Channel2_3_IRQn) |
144 | 141 | { |
145 | 142 | return RT_TRUE; |
146 | 143 | } |
147 | | -# endif /* defined(DMA1_Channel2_3_IRQn) */ |
148 | | -# if defined(DMA1_Channel4_5_IRQn) |
| 144 | +#endif /* defined(DMA1_Channel2_3_IRQn) */ |
| 145 | +#if defined(DMA1_Channel4_5_IRQn) |
149 | 146 | if (dma_irq == DMA1_Channel4_5_IRQn) |
150 | 147 | { |
151 | 148 | return RT_TRUE; |
152 | 149 | } |
153 | | -# endif /* defined(DMA1_Channel4_5_IRQn) */ |
154 | | -# if defined(DMA1_Channel4_5_6_7_IRQn) |
| 150 | +#endif /* defined(DMA1_Channel4_5_IRQn) */ |
| 151 | +#if defined(DMA1_Channel4_5_6_7_IRQn) |
155 | 152 | if (dma_irq == DMA1_Channel4_5_6_7_IRQn) |
156 | 153 | { |
157 | 154 | return RT_TRUE; |
158 | 155 | } |
159 | | -# endif /* defined(DMA1_Channel4_5_6_7_IRQn) */ |
| 156 | +#endif /* defined(DMA1_Channel4_5_6_7_IRQn) */ |
160 | 157 | #endif /* defined(SOC_SERIES_STM32F0) */ |
161 | 158 |
|
162 | 159 | return RT_FALSE; |
|
0 commit comments