aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorFergus Noble2011-10-26 13:33:40 -0700
committerFergus Noble2011-10-26 13:33:40 -0700
commit0f6a0276aab597d23639988fa5cc457bc1186818 (patch)
tree72972eb507f5e77bc6e5065d3df254703ad1cf10 /lib
parent869a0df701e6f937a7d350350aebe3772c51f7ba (diff)
parentae44add1b6910c349917ce106d995d06da8e2879 (diff)
Merge branch 'stm32f2' of github.com:fnoble/libopenstm32 into stm32f2
Diffstat (limited to 'lib')
-rw-r--r--lib/lm3s/Makefile4
-rw-r--r--lib/lpc13xx/Makefile4
-rw-r--r--lib/stm32_common/usart.c3
-rw-r--r--lib/stm32f1/Makefile4
4 files changed, 7 insertions, 8 deletions
diff --git a/lib/lm3s/Makefile b/lib/lm3s/Makefile
index e2be89f..93a67ad 100644
--- a/lib/lm3s/Makefile
+++ b/lib/lm3s/Makefile
@@ -19,8 +19,8 @@
LIBNAME = libopencm3_lm3s
-PREFIX ?= arm-none-eabi
-# PREFIX ?= arm-elf
+PREFIX ?= arm-none-eabi
+#PREFIX ?= arm-elf
CC = $(PREFIX)-gcc
AR = $(PREFIX)-ar
CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \
diff --git a/lib/lpc13xx/Makefile b/lib/lpc13xx/Makefile
index 9b90316..04e33c8 100644
--- a/lib/lpc13xx/Makefile
+++ b/lib/lpc13xx/Makefile
@@ -19,8 +19,8 @@
LIBNAME = libopencm3_lpc13xx
-PREFIX ?= arm-none-eabi
-# PREFIX ?= arm-elf
+PREFIX ?= arm-none-eabi
+#PREFIX ?= arm-elf
CC = $(PREFIX)-gcc
AR = $(PREFIX)-ar
CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \
diff --git a/lib/stm32_common/usart.c b/lib/stm32_common/usart.c
index 026af3a..116b159 100644
--- a/lib/stm32_common/usart.c
+++ b/lib/stm32_common/usart.c
@@ -116,9 +116,8 @@ void usart_wait_recv_ready(u32 usart)
void usart_send_blocking(u32 usart, u16 data)
{
- usart_send(usart, data);
-
usart_wait_send_ready(usart);
+ usart_send(usart, data);
}
u16 usart_recv_blocking(u32 usart)
diff --git a/lib/stm32f1/Makefile b/lib/stm32f1/Makefile
index f2f5382..bd9fca2 100644
--- a/lib/stm32f1/Makefile
+++ b/lib/stm32f1/Makefile
@@ -19,8 +19,8 @@
LIBNAME = libopencm3_stm32f1
-PREFIX ?= arm-none-eabi
-# PREFIX ?= arm-elf
+PREFIX ?= arm-none-eabi
+#PREFIX ?= arm-elf
CC = $(PREFIX)-gcc
AR = $(PREFIX)-ar
CFLAGS = -Os -g -Wall -Wextra -I../../include -fno-common \