aboutsummaryrefslogtreecommitdiff
path: root/lib/stm32/f4
diff options
context:
space:
mode:
authorPiotr Esden-Tempski2012-10-31 13:34:18 -0700
committerPiotr Esden-Tempski2012-10-31 13:34:18 -0700
commit6b2ca89f48bef80dd37fa4245a7138b7e5c36c91 (patch)
treef3d85ab83a90a8285faf677befc2a386141d165a /lib/stm32/f4
parentfd3ee124f838aedc90e591f94201b75171219b56 (diff)
parente8ec29e636ec78da27efd2a077125144039a73c5 (diff)
Merge pull request #22 fixing usb and f4 alignment issues
Merge remote-tracking branch 'jdk/master' Conflicts: lib/stm32/f1/Makefile lib/stm32/f4/Makefile
Diffstat (limited to 'lib/stm32/f4')
-rw-r--r--lib/stm32/f4/Makefile3
-rw-r--r--lib/stm32/f4/gpio.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/stm32/f4/Makefile b/lib/stm32/f4/Makefile
index e09ef26..a286f4a 100644
--- a/lib/stm32/f4/Makefile
+++ b/lib/stm32/f4/Makefile
@@ -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
diff --git a/lib/stm32/f4/gpio.c b/lib/stm32/f4/gpio.c
index 1d7739d..aa2fda4 100644
--- a/lib/stm32/f4/gpio.c
+++ b/lib/stm32/f4/gpio.c
@@ -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);
}