From ef1ca963a5a18f200f5f8dca45ac5f34e2d45875 Mon Sep 17 00:00:00 2001 From: Dmitriy Linikov Date: Mon, 30 Oct 2017 19:20:52 +0000 Subject: [PATCH] Merged in hardlulz/modem-3.0-nuttx/fix-stm32_dmacapable-on-f20xx (pull request #522) Fix stm32 dmacapable on f20xx * Fixed build for STM32F20XX platforms when CONFIG_STM32_DMACAPABLE is enabled * Fixed build for STM32F20XX platforms when CONFIG_STM32_DMACAPABLE is enabled Approved-by: Gregory Nutt --- arch/arm/src/stm32/stm32f20xxx_dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/src/stm32/stm32f20xxx_dma.c b/arch/arm/src/stm32/stm32f20xxx_dma.c index f355c9b0ac..8c06819f7a 100644 --- a/arch/arm/src/stm32/stm32f20xxx_dma.c +++ b/arch/arm/src/stm32/stm32f20xxx_dma.c @@ -877,7 +877,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) * multiply. */ - switch (ccr & STM32_DMA_SCR_MSIZE_MASK) + switch (ccr & DMA_SCR_MSIZE_MASK) { case DMA_SCR_MSIZE_8BITS: transfer_size = 1; @@ -894,7 +894,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) mend = maddr + (count << 2) - 1; break; - default + default: return false; } @@ -912,7 +912,7 @@ bool stm32_dmacapable(uint32_t maddr, uint32_t count, uint32_t ccr) * is aligned to the burst length. */ - switch (ccr & STM32_DMA_SCR_MBURST_MASK) + switch (ccr & DMA_SCR_MBURST_MASK) { case DMA_SCR_MBURST_SINGLE: burst_length = transfer_size;