From 3877cb09d9bb025df2ea8921670cb6cde999893f Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Sat, 29 Aug 2015 10:04:36 -0600 Subject: [PATCH] Trivial renaming --- arch/arm/src/samv7/sam_qspi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/arch/arm/src/samv7/sam_qspi.c b/arch/arm/src/samv7/sam_qspi.c index e8c324a115a..26a1b297468 100644 --- a/arch/arm/src/samv7/sam_qspi.c +++ b/arch/arm/src/samv7/sam_qspi.c @@ -795,7 +795,7 @@ static int qspi_memory_enable(struct sam_qspidev_s *priv, static int qspi_memory_dma(struct sam_qspidev_s *priv, struct qspi_meminfo_s *meminfo) { - uintptr_t paddr = SAM_QSPIMEM_BASE + meminfo->addr; + uintptr_t qspimem = SAM_QSPIMEM_BASE + meminfo->addr; uint32_t dmaflags; int ret; @@ -821,7 +821,7 @@ static int qspi_memory_dma(struct sam_qspidev_s *priv, /* Setup the TX DMA (peripheral-to-memory) */ - ret = sam_dmatxsetup(priv->dmach, paddr, (uint32_t)meminfo->buffer, + ret = sam_dmatxsetup(priv->dmach, qspimem, (uint32_t)meminfo->buffer, meminfo->buflen); } else @@ -834,7 +834,7 @@ static int qspi_memory_dma(struct sam_qspidev_s *priv, /* Setup the RX DMA (memory-to-peripheral) */ - ret = sam_dmarxsetup(priv->dmach, paddr, (uint32_t)meminfo->buffer, + ret = sam_dmarxsetup(priv->dmach, qspimem, (uint32_t)meminfo->buffer, meminfo->buflen); } @@ -952,7 +952,7 @@ static int qspi_memory_dma(struct sam_qspidev_s *priv, static int qspi_memory_nodma(struct sam_qspidev_s *priv, struct qspi_meminfo_s *meminfo) { - uintptr_t paddr = SAM_QSPIMEM_BASE + meminfo->addr; + uintptr_t qspimem = SAM_QSPIMEM_BASE + meminfo->addr; /* Enable the memory transfer */ @@ -962,11 +962,11 @@ static int qspi_memory_nodma(struct sam_qspidev_s *priv, if (QSPIMEM_ISWRITE(meminfo->flags)) { - memcpy((void *)paddr, meminfo->buffer, meminfo->buflen); + memcpy((void *)qspimem, meminfo->buffer, meminfo->buflen); } else { - memcpy(meminfo->buffer, (void *)paddr, meminfo->buflen); + memcpy(meminfo->buffer, (void *)qspimem, meminfo->buflen); } MEMORY_SYNC();