diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-30 17:36:46 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-30 17:36:46 +0000 |
| commit | 844e426199c79c06f1863d63850d362ca3d27ac5 (patch) | |
| tree | 230951790028e64eb726ce7482780b80ec3c0a54 /nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c | |
| parent | 499461a9c0a8a4c4840511f9467d13f756d4bc7f (diff) | |
| download | px4-nuttx-844e426199c79c06f1863d63850d362ca3d27ac5.tar.gz px4-nuttx-844e426199c79c06f1863d63850d362ca3d27ac5.tar.bz2 px4-nuttx-844e426199c79c06f1863d63850d362ca3d27ac5.zip | |
Completes coding of the LPC17 DMA driver
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5801 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c')
| -rw-r--r-- | nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c index f449685de..c776395a7 100644 --- a/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c +++ b/nuttx/arch/arm/src/lpc17xx/lpc17_sdcard.c @@ -152,7 +152,11 @@ * - Memory burst size (F4 only) */ -/* DMA control register settings */ +/* DMA control register settings. All CONTROL register fields need to be + * specified except for the transfer size which is passed as a separate + * parameter and for the terminal count interrupt enable bit which is + * controlled by the driver. + */ #define SDCARD_RXDMA32_CONTROL (DMACH_CONTROL_SBSIZE_4|DMACH_CONTROL_DBSIZE_4|\ DMACH_CONTROL_SWIDTH_32BIT|DMACH_CONTROL_DWIDTH_32BIT|\ @@ -161,19 +165,12 @@ DMACH_CONTROL_SWIDTH_32BIT|DMACH_CONTROL_DWIDTH_32BIT|\ DMACH_CONTROL_SI) -/* DMA configuration register settings */ - -#define SDCARD_RXDMA32_CONFIG (DMACH_CONFIG_E|DMACH_CONFIG_SRCPER_SDCARD|\ - DMACH_CONFIG_XFRTYPE_P2M) -#define SDCARD_TXDMA32_CONFIG (DMACH_CONFIG_E|DMACH_CONFIG_DSTPER_SDCARD|\ - DMACH_CONFIG_XFRTYPE_M2P) - -/* SD card DMA Channel/Stream selection. For the the case of the LPC17XX F4, there - * are multiple DMA stream options that must be dis-ambiguated in the board.h - * file. +/* DMA configuration register settings. Only the SRCPER, DSTPER, and + * XFRTTYPE fields of the CONFIG register need be specified. */ -#define SDCARD_DMACHAN DMAMAP_SDCARD +#define SDCARD_RXDMA32_CONFIG (DMACH_CONFIG_SRCPER_SDCARD|DMACH_CONFIG_XFRTYPE_P2M) +#define SDCARD_TXDMA32_CONFIG (DMACH_CONFIG_DSTPER_SDCARD|DMACH_CONFIG_XFRTYPE_M2P) /* FIFO sizes */ |