EMTime/libopencm3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #22 fixing usb and f4 alignment issues

Browse Source 
Merge remote-tracking branch 'jdk/master'

Conflicts:
	lib/stm32/f1/Makefile
	lib/stm32/f4/Makefile
This commit is contained in:
Piotr Esden-Tempski
2012-10-31 13:34:18 -07:00
parent fd3ee124f8 e8ec29e636
commit 6b2ca89f48
30 changed files with 1502 additions and 774 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/stm32/f4/Makefile
View File

@@ -31,7 +31,8 @@ CFLAGS = -Os -g -Wall -Wextra -I../../../include -fno-common \
ARFLAGS = rcs
OBJS = rcc.o gpio.o usart.o spi.o flash.o \
i2c.o exti.o pwr.o timer.o \
usb.o usb_standard.o usb_control.o usb_f107.o
usb.o usb_standard.o usb_control.o usb_fx07_common.o usb_f107.o \
usb_f207.o
VPATH += ../../usb:../:../../cm3

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

@@ -86,7 +86,7 @@ void gpio_set_af(u32 gpioport, u8 alt_func_num, u16 gpios)
for (i = 8; i < 16; i++) {
if (!((1 << i) & gpios))
continue;
afrl &= ~GPIO_AFR_MASK(i - 8);
afrh &= ~GPIO_AFR_MASK(i - 8);
afrh |= GPIO_AFR(i - 8, alt_func_num);
}