diff options
| author | Marti Bolivar <mbolivar@mit.edu> | 2010-12-28 19:06:27 -0500 |
|---|---|---|
| committer | Marti Bolivar <mbolivar@mit.edu> | 2010-12-28 19:06:27 -0500 |
| commit | d1a8d832af96efdd1b399799dfae81517dc04dfa (patch) | |
| tree | 3ce037909f3fdec9167557544c19a8c94726838b /libmaple/dma.c | |
| parent | d38ffc1c658476a5c28e3d70ac9abd300f914433 (diff) | |
| download | librambutan-d1a8d832af96efdd1b399799dfae81517dc04dfa.tar.gz librambutan-d1a8d832af96efdd1b399799dfae81517dc04dfa.zip | |
nzmichaelh's pull request mods compile and upload.
renamed SysTick_Handler back to SysTickHandler since all of our linker magic/lanchon-stm32 depends on that name. added backup register support in order to test independent watchdog support; it seems to work. next major test target is DMA support.
Diffstat (limited to 'libmaple/dma.c')
| -rw-r--r-- | libmaple/dma.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libmaple/dma.c b/libmaple/dma.c index 4ad7fd2..88c1342 100644 --- a/libmaple/dma.c +++ b/libmaple/dma.c @@ -63,7 +63,8 @@ static dma_regs *dma_get_regs(uint8 channel) { * to memory * @param mode OR of the dma_mode_flags */ -void dma_init(uint8 channel, volatile void *peripheral, bool from_peripheral, enum dma_mode_flags mode) { +void dma_init(uint8 channel, volatile void *peripheral, int from_peripheral, + dma_mode_flags mode) { volatile dma_regs *regs = dma_get_regs(channel); if (regs != NULL) { @@ -79,6 +80,7 @@ void dma_init(uint8 channel, volatile void *peripheral, bool from_peripheral, en | (mode << 5) // Increment and circular modes | (0 << 0); // Not enabled + /* FIXME XXX integer from pointer without a cast. */ regs->CPAR = peripheral; if (!from_peripheral) { |