aboutsummaryrefslogtreecommitdiff
path: root/lib/stm32/f4
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2012-11-08 12:04:07 -0800
committerPiotr Esden-Tempski2012-11-08 12:04:28 -0800
commitf714ee42c0d2f6c53ffa42bb466573e1d34b912a (patch)
tree06c227d3509deb91d62d118c85fcaaf71f74b472 /lib/stm32/f4
parentd87e751f71b729b01153bb4091eca5842f6229f1 (diff)
parent095e6cdb5dfacb715b5266ba3f76ed9021ef532e (diff)
Merging pull request #60 Miscellaneous DMA fixes for F4
Merge remote-tracking branch 'bgamari/master'
Diffstat (limited to 'lib/stm32/f4')
-rw-r--r--lib/stm32/f4/Makefile2
-rw-r--r--lib/stm32/f4/dma.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile
index 9e62fea..09fe573 100644
--- a/lib/stm32/f4/Makefile
+++ b/lib/stm32/f4/Makefile
@@ -32,7 +32,7 @@ ARFLAGS = rcs
OBJS = rcc.o gpio2.o usart.o spi.o flash.o \
i2c.o exti2.o pwr.o timer.o \
usb.o usb_standard.o usb_control.o usb_fx07_common.o usb_f107.o \
- usb_f207.o adc.o
+ usb_f207.o adc.o dma.o
VPATH += ../../usb:../:../../cm3
diff --git a/lib/stm32/f4/dma.c b/lib/stm32/f4/dma.c
index 80eb963..7c80dcf 100644
--- a/lib/stm32/f4/dma.c
+++ b/lib/stm32/f4/dma.c
@@ -123,7 +123,7 @@ The interrupt flag for the stream is returned.
@param[in] dma unsigned int32. DMA controller base address: DMA1 or DMA2
@param[in] stream unsigned int8. Stream number: @ref dma_st_number
-@param[in] interrupt unsigned int32. Interrupt number: @ref dma_st_number
+@param[in] interrupt unsigned int32. Interrupt number: @ref dma_if_offset
@returns bool interrupt flag is set.
*/