diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-04-02 00:45:28 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2010-04-02 00:45:28 +0000 |
| commit | cb55abfbb0ad9ce15b3b1863f05ba209356ad69c (patch) | |
| tree | 59b11f3d2a7d863ed0f6803a65aaaa9e0c5ff263 /nuttx/arch/arm/src/sam3u/sam3u_hsmci.c | |
| parent | e7c943a501d80d81c967815466f286285443353d (diff) | |
| download | px4-nuttx-cb55abfbb0ad9ce15b3b1863f05ba209356ad69c.tar.gz px4-nuttx-cb55abfbb0ad9ce15b3b1863f05ba209356ad69c.tar.bz2 px4-nuttx-cb55abfbb0ad9ce15b3b1863f05ba209356ad69c.zip | |
DMA updates
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2568 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 | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c b/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c index 552d554c7..f0b26169d 100755 --- a/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c +++ b/nuttx/arch/arm/src/sam3u/sam3u_hsmci.c @@ -122,10 +122,9 @@ #define DMA_FLAGS \ (DMACH_FLAG_FIFO_8BYTES | DMACH_FLAG_FIFOCFG_LARGEST | \ (DMACHAN_PID_MCI0 << DMACH_FLAG_PERIPHPID_SHIFT) | \ - DMACH_FLAG_PERIPHH2SEL | DMACH_FLAG_PERIPHLLIMODE | \ + DMACH_FLAG_PERIPHH2SEL | DMACH_FLAG_PERIPHISPERIPH | \ DMACH_FLAG_PERIPHWIDTH_32BITS | DMACH_FLAG_PERIPHCHUNKSIZE_1 | \ - DMACH_FLAG_MEMLLIMODE | DMACH_FLAG_MEMWIDTH_32BITS | \ - DMACH_FLAG_MEMINCREMENT | DMACH_FLAG_MEMCHUNKSIZE_4) + DMACH_FLAG_MEMWIDTH_32BITS | DMACH_FLAG_MEMINCREMENT | DMACH_FLAG_MEMCHUNKSIZE_4) /* FIFO sizes */ @@ -328,7 +327,7 @@ static void sam3u_dumpsamples(struct sam3u_dev_s *priv); # define sam3u_dumpsamples(priv) #endif -static void sam3u_dmacallback(DMA_HANDLE handle, uint8_t isr, void *arg); +static void sam3u_dmacallback(DMA_HANDLE handle, void *arg, int result); /* Data Transfer Helpers ****************************************************/ @@ -791,7 +790,7 @@ static void sam3u_dumpsamples(struct sam3u_dev_s *priv) * ****************************************************************************/ -static void sam3u_dmacallback(DMA_HANDLE handle, uint8_t isr, void *arg) +static void sam3u_dmacallback(DMA_HANDLE handle, void *arg, int result) { /* FAR struct sam3u_spidev_s *priv = (FAR struct sam3u_spidev_s *)arg; */ @@ -2354,7 +2353,7 @@ static int sam3u_dmarecvsetup(FAR struct sdio_dev_s *dev, FAR uint8_t *buffer, /* Start the DMA */ sam3u_sample(priv, SAMPLENDX_BEFORE_ENABLE); - sam3u_dmastart(priv->dma, sam3u_dmacallback, priv, false); + sam3u_dmastart(priv->dma, sam3u_dmacallback, priv); sam3u_sample(priv, SAMPLENDX_AFTER_SETUP); ret = OK; } @@ -2421,7 +2420,7 @@ static int sam3u_dmasendsetup(FAR struct sdio_dev_s *dev, /* Start the DMA */ - sam3u_dmastart(priv->dma, sam3u_dmacallback, priv, false); + sam3u_dmastart(priv->dma, sam3u_dmacallback, priv); sam3u_sample(priv, SAMPLENDX_AFTER_SETUP); /* Enable TX interrrupts */ |