Move usbuart to the stm32 directory

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 \
+	-DSTM32F1 -DBLACKMAGIC -I../libopencm3/include
-	-Iplatforms/stm32
 
 LDFLAGS_BOOT = -lopencm3_stm32f1 -Wl,--defsym,_stack=0x20005000 \
 	-Wl,-T,platforms/stm32/blackmagic.ld -nostartfiles -lc -lnosys \

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
 

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;
 }
-