aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorUwe Bonnes2013-01-13 18:37:32 +0100
committerUwe Bonnes2013-01-21 11:02:43 +0100
commit533608a2f4b2e0c19cb2f696fc491908ec980812 (patch)
tree9cc4803c232274175ec458e8a7244b7822310c00 /src
parent16ac8e0478e5c2c9049d56f9d953648100f1264d (diff)
Move usbuart to the stm32 directory
Diffstat (limited to 'src')
-rw-r--r--src/include/usbuart.h (renamed from src/platforms/stm32/usbuart.h)0
-rw-r--r--src/platforms/native/Makefile.inc3
-rw-r--r--src/platforms/stlink/Makefile.inc4
-rw-r--r--src/platforms/stm32/usbuart.c (renamed from src/platforms/native/usbuart.c)5
4 files changed, 5 insertions, 7 deletions
diff --git a/src/platforms/stm32/usbuart.h b/src/include/usbuart.h
index 39f7dcd..39f7dcd 100644
--- a/src/platforms/stm32/usbuart.h
+++ b/src/include/usbuart.h
diff --git a/src/platforms/native/Makefile.inc b/src/platforms/native/Makefile.inc
index 585c50d..36ee01c 100644
--- a/src/platforms/native/Makefile.inc
+++ b/src/platforms/native/Makefile.inc
@@ -3,8 +3,7 @@ CC = $(CROSS_COMPILE)gcc
OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS += -Istm32/include -mcpu=cortex-m3 -mthumb \
- -DSTM32F1 -DBLACKMAGIC -I../libopencm3/include -Iplatforms/native \
- -Iplatforms/stm32
+ -DSTM32F1 -DBLACKMAGIC -I../libopencm3/include
LDFLAGS_BOOT = -lopencm3_stm32f1 -Wl,--defsym,_stack=0x20005000 \
-Wl,-T,platforms/stm32/blackmagic.ld -nostartfiles -lc -lnosys \
diff --git a/src/platforms/stlink/Makefile.inc b/src/platforms/stlink/Makefile.inc
index 7cacb0e..0f784f5 100644
--- a/src/platforms/stlink/Makefile.inc
+++ b/src/platforms/stlink/Makefile.inc
@@ -3,7 +3,7 @@ CC = $(CROSS_COMPILE)gcc
OBJCOPY = $(CROSS_COMPILE)objcopy
CFLAGS += -mcpu=cortex-m3 -mthumb \
- -DSTM32F1 -DDISCOVERY_STLINK -I../libopencm3/include -Iplatforms/stlink -Iplatforms/stm32
+ -DSTM32F1 -DDISCOVERY_STLINK -I../libopencm3/include
LDFLAGS_BOOT = -lopencm3_stm32f1 -Wl,--defsym,_stack=0x20005000 \
-Wl,-T,platforms/stm32/stlink.ld -nostartfiles -lc -lnosys \
-Wl,-Map=mapfile -mthumb -mcpu=cortex-m3 -Wl,-gc-sections \
@@ -14,7 +14,7 @@ VPATH += platforms/stm32
SRC += cdcacm.c \
platform.c \
- platforms/native/usbuart.c \
+ usbuart.c \
all: blackmagic.bin blackmagic_dfu.bin blackmagic_dfu.hex
diff --git a/src/platforms/native/usbuart.c b/src/platforms/stm32/usbuart.c
index 3d07b33..27dbaa2 100644
--- a/src/platforms/native/usbuart.c
+++ b/src/platforms/stm32/usbuart.c
@@ -98,9 +98,9 @@ void usbuart_usb_out_cb(usbd_device *dev, uint8_t ep)
#if defined(BLACKMAGIC)
/* Don't bother if uart is disabled.
- * This will be the case on mini while we're being debugged.
+ * This will be the case on mini while we're being debugged.
*/
- if(!(RCC_APB2ENR & RCC_APB2ENR_USART1EN))
+ if(!(RCC_APB2ENR & RCC_APB2ENR_USART1EN))
return;
#endif
@@ -142,4 +142,3 @@ void USBUSART_ISR(void)
uart_usb_buf[uart_usb_buf_size++] = c;
}
-