diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-03-27 20:37:26 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-03-27 20:37:26 +0000 |
| commit | ddf824b8aa26b9825850a910461557243ecf4225 (patch) | |
| tree | b6fa85b490d0087f01ff135d04c88eb1de45ce96 /nuttx/arch/arm/src/sam3u/sam3u_hsmci.c | |
| parent | f636ee02124366885a669d2434e408e43ad08ebf (diff) | |
| download | px4-nuttx-ddf824b8aa26b9825850a910461557243ecf4225.tar.gz px4-nuttx-ddf824b8aa26b9825850a910461557243ecf4225.tar.bz2 px4-nuttx-ddf824b8aa26b9825850a910461557243ecf4225.zip | |
A little more DMA logic
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2557 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/sam3u/sam3u_hsmci.c')
| -rwxr-xr-x | nuttx/arch/arm/src/sam3u/sam3u_hsmci.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c b/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c index 94a8b7d91..144a6026a 100755 --- a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c +++ b/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c @@ -117,12 +117,10 @@ #define HSMCI_DTIMER_DATATIMEOUT (0x000fffff) -/* DMA CCR register settings */ +/* DMA configuration flags */ -#define HSMCI_RXDMA32_CONFIG \ - ( CONFIG_HSMCI_DMAPRIO | DMA_CCR_MSIZE_32BITS | DMA_CCR_PSIZE_32BITS | DMA_CCR_MINC) -#define HSMCI_TXDMA32_CONFIG \ - ( CONFIG_HSMCI_DMAPRIO | DMA_CCR_MSIZE_32BITS | DMA_CCR_PSIZE_32BITS | DMA_CCR_MINC | DMA_CCR_DIR) +#define DMA_FLAGS \ + (DMACH_FLAG_FIFO_8BYTES|DMACH_FLAG_SRCWIDTH_32BITS|DMACH_FLAG_DESTWIDTH_32BITS|DMACH_FLAG_MEMINCREMENT) /* FIFO sizes */ @@ -2346,8 +2344,7 @@ 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_dmarxsetup(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); /* Start the DMA */ @@ -2412,8 +2409,7 @@ static int sam3u_dmasendsetup(FAR struct sdio_dev_s *dev, /* Configure the TX DMA */ - sam3u_dmatxsetup(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); sam3u_sample(priv, SAMPLENDX_BEFORE_ENABLE); putreg32(1, HSMCI_DCTRL_DMAEN_BB); @@ -2545,7 +2541,7 @@ FAR struct sdio_dev_s *sdio_initialize(int slotno) /* Allocate a DMA channel. A FIFO size of 8 is sufficient. */ - priv->dma = sam3u_dmachannel(8); + priv->dma = sam3u_dmachannel(DMA_FLAGS); DEBUGASSERT(priv->dma); /* Configure GPIOs for 4-bit, wide-bus operation. NOTE: (1) the chip is capable of |