You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by gu...@apache.org on 2021/09/23 01:48:16 UTC
[incubator-nuttx] branch master updated: stm32h7:DMA_TRBUFF is
DMA_SCR_TRBUFF
This is an automated email from the ASF dual-hosted git repository.
gustavonihei pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
The following commit(s) were added to refs/heads/master by this push:
new 6d299ce stm32h7:DMA_TRBUFF is DMA_SCR_TRBUFF
6d299ce is described below
commit 6d299ce802da4897e03f817b64214272b18ed138
Author: David Sidrane <Da...@NscDg.com>
AuthorDate: Wed Sep 22 14:16:38 2021 -0700
stm32h7:DMA_TRBUFF is DMA_SCR_TRBUFF
---
arch/arm/src/stm32h7/hardware/stm32_dma.h | 2 +-
arch/arm/src/stm32h7/stm32_dma.c | 2 +-
arch/arm/src/stm32h7/stm32_serial.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/src/stm32h7/hardware/stm32_dma.h b/arch/arm/src/stm32h7/hardware/stm32_dma.h
index d998dfc..eb00eb4 100644
--- a/arch/arm/src/stm32h7/hardware/stm32_dma.h
+++ b/arch/arm/src/stm32h7/hardware/stm32_dma.h
@@ -319,7 +319,7 @@
#define DMA_SCR_DBM (1 << 18) /* Bit 15: Double buffer mode */
#define DMA_SCR_CT (1 << 19) /* Bit 19: Current target */
-#define DMA_TRBUFF (1 << 20) /* Bit 20: Enable the DMA to handle bufferable transfers*/
+#define DMA_SCR_TRBUFF (1 << 20) /* Bit 20: Enable the DMA to handle bufferable transfers */
#define DMA_SCR_PBURST_SHIFT (21) /* Bits 21-22: Peripheral burst transfer configuration */
#define DMA_SCR_PBURST_MASK (3 << DMA_SCR_PBURST_SHIFT)
# define DMA_SCR_PBURST_SINGLE (0 << DMA_SCR_PBURST_SHIFT) /* 00: Single transfer */
diff --git a/arch/arm/src/stm32h7/stm32_dma.c b/arch/arm/src/stm32h7/stm32_dma.c
index fc096c1..e2cf791 100644
--- a/arch/arm/src/stm32h7/stm32_dma.c
+++ b/arch/arm/src/stm32h7/stm32_dma.c
@@ -1350,7 +1350,7 @@ static void stm32_sdma_setup(DMA_HANDLE handle, FAR stm32_dmacfg_t *cfg)
scr &= (DMA_SCR_PFCTRL | DMA_SCR_DIR_MASK | DMA_SCR_PINC |
DMA_SCR_MINC | DMA_SCR_PSIZE_MASK | DMA_SCR_MSIZE_MASK |
DMA_SCR_PINCOS | DMA_SCR_DBM | DMA_SCR_CIRC |
- DMA_SCR_PBURST_MASK | DMA_SCR_MBURST_MASK | DMA_TRBUFF);
+ DMA_SCR_PBURST_MASK | DMA_SCR_MBURST_MASK | DMA_SCR_TRBUFF);
regval |= scr;
dmachan_putreg(dmachan, STM32_DMA_SCR_OFFSET, regval);
}
diff --git a/arch/arm/src/stm32h7/stm32_serial.c b/arch/arm/src/stm32h7/stm32_serial.c
index 6bc4225..9ca3186 100644
--- a/arch/arm/src/stm32h7/stm32_serial.c
+++ b/arch/arm/src/stm32h7/stm32_serial.c
@@ -468,7 +468,7 @@
DMA_SCR_PBURST_SINGLE | \
DMA_SCR_MBURST_SINGLE | \
CONFIG_USART_TXDMAPRIO | \
- DMA_TRBUFF)
+ DMA_SCR_TRBUFF)
#endif /* SERIAL_HAVE_TXDMA */