diff --git a/os/hal/platforms/STM32F1xx/stm32_dma.h b/os/hal/platforms/STM32F1xx/stm32_dma.h index 67cdab540..a4cae4ea6 100644 --- a/os/hal/platforms/STM32F1xx/stm32_dma.h +++ b/os/hal/platforms/STM32F1xx/stm32_dma.h @@ -363,7 +363,7 @@ typedef void (*stm32_dmaisr_t)(void *p, uint32_t flags); * * @param[in] dmastp pointer to a stm32_dma_stream_t structure */ -#define dmaWaitCompletion(dmastp) \ +#define dmaWaitCompletion(dmastp) { \ while ((dmastp)->channel->CNDTR > 0) \ ; \ dmaStreamDisable(dmastp); \ diff --git a/os/hal/platforms/STM32L1xx/stm32_dma.h b/os/hal/platforms/STM32L1xx/stm32_dma.h index 71db4ba65..bf3f3f3ca 100644 --- a/os/hal/platforms/STM32L1xx/stm32_dma.h +++ b/os/hal/platforms/STM32L1xx/stm32_dma.h @@ -354,7 +354,7 @@ typedef void (*stm32_dmaisr_t)(void *p, uint32_t flags); * * @param[in] dmastp pointer to a stm32_dma_stream_t structure */ -#define dmaWaitCompletion(dmastp) \ +#define dmaWaitCompletion(dmastp) { \ while ((dmastp)->channel->CNDTR > 0) \ ; \ dmaStreamDisable(dmastp); \ diff --git a/readme.txt b/readme.txt index 04877f44b..91c655298 100644 --- a/readme.txt +++ b/readme.txt @@ -79,6 +79,8 @@ ***************************************************************************** *** 2.5.0 *** +- FIX: Fixed macro dmaWaitCompletion() fails to compile in STM32 HAL (bug + 3519202)(backported to 2.4.1). - FIX: Fixed ARM addresses generated in vectors table (bug 3519037)(backported to 2.2.10 and 2.4.1). - FIX: Fixed missing serial driver functionality for SAM7S64, SAM7S128 and