From 533608a2f4b2e0c19cb2f696fc491908ec980812 Mon Sep 17 00:00:00 2001 From: Uwe Bonnes Date: Sun, 13 Jan 2013 18:37:32 +0100 Subject: [PATCH] Move usbuart to the stm32 directory --- src/{platforms/stm32 => include}/usbuart.h | 0 src/platforms/native/Makefile.inc | 3 +-- src/platforms/stlink/Makefile.inc | 4 ++-- src/platforms/{native => stm32}/usbuart.c | 5 ++--- 4 files changed, 5 insertions(+), 7 deletions(-) rename src/{platforms/stm32 => include}/usbuart.h (100%) rename src/platforms/{native => stm32}/usbuart.c (97%) diff --git a/src/platforms/stm32/usbuart.h b/src/include/usbuart.h similarity index 100% rename from src/platforms/stm32/usbuart.h rename to src/include/usbuart.h diff --git a/src/platforms/native/Makefile.inc b/src/platforms/native/Makefile.inc index 585c50d0..36ee01cd 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 7cacb0e3..0f784f50 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 similarity index 97% rename from src/platforms/native/usbuart.c rename to src/platforms/stm32/usbuart.c index 3d07b33a..27dbaa2f 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; } -