usb: Move the USB stack to its own top-level dir

COPYING

@@ -1,6 +1,6 @@
 All code is licensed as follows, with these exceptions:
  - src/fatfs/*
- - src/gotek/stm32_usbh_msc/*
+ - src/usb/stm32_usbh_msc/*
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 This is free and unencumbered software released into the public domain.
 
@@ -47,7 +47,7 @@ by use of this software.
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 
-All code within src/gotek/stm32_usbh_msc/* is licensed as follows:
+All code within src/usb/stm32_usbh_msc/* is licensed as follows:
 -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 Copyright (C) 2015 STMicroelectronics International N.V.. All rights reserved.
 

bootloader/Makefile

@@ -20,3 +20,4 @@ OBJS-$(debug) += console.o
 
 SUBDIRS += fatfs
 SUBDIRS += gotek
+SUBDIRS += usb

bootloader/gotek/Makefile

@@ -4,9 +4,3 @@ OBJS += board.o
 OBJS += lcd.o
 OBJS += oled_font_6x13.o
 OBJS += led_7seg.o
-OBJS += usb_bsp.o
-OBJS += usbh_msc_fatfs.o
-
-SUBDIRS += stm32_usbh_msc
-
-usb%.o: CFLAGS += -I$(ROOT)/src/gotek/stm32_usbh_msc/inc/ -include usbh_conf.h

bootloader/usb/Makefile

@@ -0,0 +1,8 @@
+RPATH = ../../src/usb
+
+OBJS += usb_bsp.o
+OBJS += usbh_msc_fatfs.o
+
+SUBDIRS += stm32_usbh_msc
+
+usb%.o: CFLAGS += -I$(ROOT)/src/usb/stm32_usbh_msc/inc/ -include usbh_conf.h

bootloader/usb/stm32_usbh_msc/Makefile

@@ -1,4 +1,4 @@
-RPATH = ../../../src/gotek/stm32_usbh_msc
+RPATH = ../../../src/usb/stm32_usbh_msc
 
 OBJS += usb_core.o
 OBJS += usb_hcd.o
@@ -11,4 +11,4 @@ OBJS += usbh_msc_core.o
 OBJS += usbh_msc_scsi.o
 OBJS += usbh_stdreq.o
 
-CFLAGS += -I$(ROOT)/src/gotek/stm32_usbh_msc/inc/ -include usbh_conf.h
+CFLAGS += -I$(ROOT)/src/usb/stm32_usbh_msc/inc/ -include usbh_conf.h

reloader/Makefile

@@ -20,3 +20,4 @@ OBJS-$(debug) += console.o
 
 SUBDIRS += fatfs
 SUBDIRS += gotek
+SUBDIRS += usb

reloader/gotek/Makefile

@@ -4,9 +4,3 @@ OBJS += board.o
 OBJS += lcd.o
 OBJS += oled_font_6x13.o
 OBJS += led_7seg.o
-OBJS += usb_bsp.o
-OBJS += usbh_msc_fatfs.o
-
-SUBDIRS += stm32_usbh_msc
-
-usb%.o: CFLAGS += -I$(ROOT)/src/gotek/stm32_usbh_msc/inc/ -include usbh_conf.h

reloader/usb/Makefile

@@ -0,0 +1,8 @@
+RPATH = ../../src/usb
+
+OBJS += usb_bsp.o
+OBJS += usbh_msc_fatfs.o
+
+SUBDIRS += stm32_usbh_msc
+
+usb%.o: CFLAGS += -I$(ROOT)/src/usb/stm32_usbh_msc/inc/ -include usbh_conf.h

reloader/usb/stm32_usbh_msc/Makefile

@@ -1,4 +1,4 @@
-RPATH = ../../../src/gotek/stm32_usbh_msc
+RPATH = ../../../src/usb/stm32_usbh_msc
 
 OBJS += usb_core.o
 OBJS += usb_hcd.o
@@ -11,4 +11,4 @@ OBJS += usbh_msc_core.o
 OBJS += usbh_msc_scsi.o
 OBJS += usbh_stdreq.o
 
-CFLAGS += -I$(ROOT)/src/gotek/stm32_usbh_msc/inc/ -include usbh_conf.h
+CFLAGS += -I$(ROOT)/src/usb/stm32_usbh_msc/inc/ -include usbh_conf.h

src/Makefile

@@ -21,6 +21,7 @@ OBJS-$(debug) += console.o
 SUBDIRS += fatfs
 SUBDIRS += image
 SUBDIRS += gotek
+SUBDIRS += usb
 
 flash_cfg.o: ff_cfg_defaults.h
 

src/gotek/Makefile

@@ -3,16 +3,10 @@ OBJS += lcd.o
 OBJS += oled_font_6x13.o
 OBJS += led_7seg.o
 OBJS += speaker.o
-OBJS += usb_bsp.o
-OBJS += usbh_msc_fatfs.o
 
 lcd.o: CFLAGS += -Dfont_extra=1
 OBJS += oled_font_8x16.o
 
-SUBDIRS += stm32_usbh_msc
-
-usb%.o: CFLAGS += -Istm32_usbh_msc/inc/ -include usbh_conf.h
-
 oled_font_%.c: $(ROOT)/fonts/%.bdf
 	$(PYTHON) $(ROOT)/scripts/mk_font.py $< oled_font_$*
 

src/usb/Makefile

@@ -0,0 +1,6 @@
+OBJS += usb_bsp.o
+OBJS += usbh_msc_fatfs.o
+
+SUBDIRS += stm32_usbh_msc
+
+usb%.o: CFLAGS += -Istm32_usbh_msc/inc/ -include usbh_conf.h