summaryrefslogtreecommitdiff
path: root/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-03-27 02:07:51 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2010-03-27 02:07:51 +0000
commitf636ee02124366885a669d2434e408e43ad08ebf (patch)
tree28848182f4410fefb633bf2ef3da6c17628efd9a /nuttx/arch/arm/src/sam3u/sam3u_hsmci.c
parent055617cdf4b31f891d727786682e3343cc67046b (diff)
downloadpx4-nuttx-f636ee02124366885a669d2434e408e43ad08ebf.tar.gz
px4-nuttx-f636ee02124366885a669d2434e408e43ad08ebf.tar.bz2
px4-nuttx-f636ee02124366885a669d2434e408e43ad08ebf.zip
A little more DMA logic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2556 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/sam3u/sam3u_hsmci.c')
-rwxr-xr-xnuttx/arch/arm/src/sam3u/sam3u_hsmci.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c b/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c
index 64bef3ff0..94a8b7d91 100755
--- a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c
+++ b/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c
@@ -2346,8 +2346,8 @@ static int sam3u_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer,
sam3u_enablexfrints(priv, HSMCI_DMARECV_INTS);
putreg32(1, HSMCI_DCTRL_DMAEN_BB);
- sam3u_dmasetup(priv->dma, SAM3U_HSMCI_FIFO, (uint32_t)buffer,
- (buflen + 3) >> 2, HSMCI_RXDMA32_CONFIG);
+ sam3u_dmarxsetup(priv->dma, SAM3U_HSMCI_FIFO, (uint32_t)buffer,
+ (buflen + 3) >> 2, HSMCI_RXDMA32_CONFIG);
/* Start the DMA */
@@ -2412,8 +2412,8 @@ static int sam3u_dmasendsetup(FAR struct sdio_dev_s *dev,
/* Configure the TX DMA */
- sam3u_dmasetup(priv->dma, SAM3U_HSMCI_FIFO, (uint32_t)buffer,
- (buflen + 3) >> 2, HSMCI_TXDMA32_CONFIG);
+ sam3u_dmatxsetup(priv->dma, SAM3U_HSMCI_FIFO, (uint32_t)buffer,
+ (buflen + 3) >> 2, HSMCI_TXDMA32_CONFIG);
sam3u_sample(priv, SAMPLENDX_BEFORE_ENABLE);
putreg32(1, HSMCI_DCTRL_DMAEN_BB);
@@ -2543,9 +2543,9 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno)
priv->waitwdog = wd_create();
DEBUGASSERT(priv->waitwdog);
- /* Allocate a DMA channel */
+ /* Allocate a DMA channel. A FIFO size of 8 is sufficient. */
- priv->dma = sam3u_dmachannel();
+ priv->dma = sam3u_dmachannel(8);
DEBUGASSERT(priv->dma);
/* Configure GPIOs for 4-bit, wide-bus operation. NOTE: (1) the chip is capable of