diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2015-09-02 08:14:28 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2015-09-02 08:14:28 +0000 |
| commit | 97856f589402092759ebcc188c99f2595a9e296b (patch) | |
| tree | c73ddf769da269781f94b6431ed3b4bfbb29f18b /os | |
| parent | 64689ec9b44217acd92443e88793a6e8387dd709 (diff) | |
| download | ChibiOS-97856f589402092759ebcc188c99f2595a9e296b.tar.gz ChibiOS-97856f589402092759ebcc188c99f2595a9e296b.tar.bz2 ChibiOS-97856f589402092759ebcc188c99f2595a9e296b.zip | |
Restored original dmaStreamDisable() macro.
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@8268 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h b/os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h index b64bc525f..7f7b5a1dc 100644 --- a/os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h +++ b/os/hal/ports/STM32/LLD/DMAv2/stm32_dma.h @@ -576,10 +576,11 @@ typedef void (*stm32_dmaisr_t)(void *p, uint32_t flags); * @special
*/
#define dmaStreamDisable(dmastp) { \
- (dmastp)->stream->CR &= ~STM32_DMA_CR_EN; \
- while (((dmastp)->stream->CR & STM32_DMA_CR_EN) != 0U) \
+ (dmastp)->stream->CR &= ~(STM32_DMA_CR_TCIE | STM32_DMA_CR_HTIE | \
+ STM32_DMA_CR_TEIE | STM32_DMA_CR_DMEIE | \
+ STM32_DMA_CR_EN); \
+ while (((dmastp)->stream->CR & STM32_DMA_CR_EN) != 0) \
; \
- (dmastp)->stream->CR = STM32_DMA_CR_RESET_VALUE; \
dmaStreamClearInterrupt(dmastp); \
}
|