jackcartersmith/blackmagic
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merging pull request #60 Miscellaneous DMA fixes for F4

Browse Source 
Merge remote-tracking branch 'bgamari/master'
This commit is contained in:
Piotr Esden-Tempski 2012-11-08 12:04:07 -08:00
commit f714ee42c0
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libopencm3/stm32/f4/dma.h
View File

@ -233,7 +233,7 @@ LGPL License Terms @ref lgpl_license
/**@}*/ /**@}*/
/* Offset within interrupt status register to start of stream interrupt flag field */ /* Offset within interrupt status register to start of stream interrupt flag field */
#define DMA_ISR_OFFSET(stream) (6*(stream & 0x01)+16*(stream & 0x02)) #define DMA_ISR_OFFSET(stream) (6*(stream & 0x01)+16*((stream & 0x02) >> 1))
#define DMA_ISR_FLAGS (DMA_ISR_TCIF | DMA_ISR_HTIF | DMA_ISR_TEIF | DMA_ISR_DMEIF | DMA_ISR_FEIF) #define DMA_ISR_FLAGS (DMA_ISR_TCIF | DMA_ISR_HTIF | DMA_ISR_TEIF | DMA_ISR_DMEIF | DMA_ISR_FEIF)
#define DMA_ISR_MASK(stream) DMA_ISR_FLAGS << DMA_ISR_OFFSET(stream) #define DMA_ISR_MASK(stream) DMA_ISR_FLAGS << DMA_ISR_OFFSET(stream)

2
lib/stm32/f4/Makefile
View File

@ -32,7 +32,7 @@ ARFLAGS = rcs
OBJS = rcc.o gpio2.o usart.o spi.o flash.o \ OBJS = rcc.o gpio2.o usart.o spi.o flash.o \
i2c.o exti2.o pwr.o timer.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.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 VPATH += ../../usb:../:../../cm3

2
lib/stm32/f4/dma.c
View File

@ -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] dma unsigned int32. DMA controller base address: DMA1 or DMA2
@param[in] stream unsigned int8. Stream number: @ref dma_st_number @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. @returns bool interrupt flag is set.
*/ */