From ac86aa5d17906b69f691d364768253b302f879b5 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 14 Jun 2018 14:59:27 +0100 Subject: [PATCH] usb: Move the USB stack to its own top-level dir --- COPYING | 4 ++-- bootloader/Makefile | 1 + bootloader/gotek/Makefile | 6 ------ bootloader/usb/Makefile | 8 ++++++++ bootloader/{gotek => usb}/stm32_usbh_msc/Makefile | 4 ++-- reloader/Makefile | 1 + reloader/gotek/Makefile | 6 ------ reloader/usb/Makefile | 8 ++++++++ reloader/{gotek => usb}/stm32_usbh_msc/Makefile | 4 ++-- src/Makefile | 1 + src/gotek/Makefile | 6 ------ src/usb/Makefile | 6 ++++++ src/{gotek => usb}/stm32_usbh_msc/Makefile | 0 src/{gotek => usb}/stm32_usbh_msc/inc/core_cm3.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usb_bsp.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usb_conf.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usb_core.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usb_defines.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usb_hcd.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usb_hcd_int.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usb_regs.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usbh_conf.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usbh_core.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usbh_def.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usbh_hcs.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usbh_ioreq.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usbh_msc_bot.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usbh_msc_core.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usbh_msc_scsi.h | 0 src/{gotek => usb}/stm32_usbh_msc/inc/usbh_stdreq.h | 0 src/{gotek => usb}/stm32_usbh_msc/usb_core.c | 0 src/{gotek => usb}/stm32_usbh_msc/usb_hcd.c | 0 src/{gotek => usb}/stm32_usbh_msc/usb_hcd_int.c | 0 src/{gotek => usb}/stm32_usbh_msc/usbh_core.c | 0 src/{gotek => usb}/stm32_usbh_msc/usbh_hcs.c | 0 src/{gotek => usb}/stm32_usbh_msc/usbh_ioreq.c | 0 src/{gotek => usb}/stm32_usbh_msc/usbh_msc_bot.c | 0 src/{gotek => usb}/stm32_usbh_msc/usbh_msc_core.c | 0 src/{gotek => usb}/stm32_usbh_msc/usbh_msc_scsi.c | 0 src/{gotek => usb}/stm32_usbh_msc/usbh_stdreq.c | 0 src/{gotek => usb}/usb_bsp.c | 0 src/{gotek => usb}/usbh_msc_fatfs.c | 0 42 files changed, 31 insertions(+), 24 deletions(-) create mode 100644 bootloader/usb/Makefile rename bootloader/{gotek => usb}/stm32_usbh_msc/Makefile (65%) create mode 100644 reloader/usb/Makefile rename reloader/{gotek => usb}/stm32_usbh_msc/Makefile (65%) create mode 100644 src/usb/Makefile rename src/{gotek => usb}/stm32_usbh_msc/Makefile (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/core_cm3.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usb_bsp.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usb_conf.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usb_core.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usb_defines.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usb_hcd.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usb_hcd_int.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usb_regs.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usbh_conf.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usbh_core.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usbh_def.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usbh_hcs.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usbh_ioreq.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usbh_msc_bot.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usbh_msc_core.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usbh_msc_scsi.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/inc/usbh_stdreq.h (100%) rename src/{gotek => usb}/stm32_usbh_msc/usb_core.c (100%) rename src/{gotek => usb}/stm32_usbh_msc/usb_hcd.c (100%) rename src/{gotek => usb}/stm32_usbh_msc/usb_hcd_int.c (100%) rename src/{gotek => usb}/stm32_usbh_msc/usbh_core.c (100%) rename src/{gotek => usb}/stm32_usbh_msc/usbh_hcs.c (100%) rename src/{gotek => usb}/stm32_usbh_msc/usbh_ioreq.c (100%) rename src/{gotek => usb}/stm32_usbh_msc/usbh_msc_bot.c (100%) rename src/{gotek => usb}/stm32_usbh_msc/usbh_msc_core.c (100%) rename src/{gotek => usb}/stm32_usbh_msc/usbh_msc_scsi.c (100%) rename src/{gotek => usb}/stm32_usbh_msc/usbh_stdreq.c (100%) rename src/{gotek => usb}/usb_bsp.c (100%) rename src/{gotek => usb}/usbh_msc_fatfs.c (100%) diff --git a/COPYING b/COPYING index ade6400..05bbb58 100644 --- a/COPYING +++ b/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. diff --git a/bootloader/Makefile b/bootloader/Makefile index 572b2fe..3d3af3d 100644 --- a/bootloader/Makefile +++ b/bootloader/Makefile @@ -20,3 +20,4 @@ OBJS-$(debug) += console.o SUBDIRS += fatfs SUBDIRS += gotek +SUBDIRS += usb diff --git a/bootloader/gotek/Makefile b/bootloader/gotek/Makefile index 820558e..7f50156 100644 --- a/bootloader/gotek/Makefile +++ b/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 diff --git a/bootloader/usb/Makefile b/bootloader/usb/Makefile new file mode 100644 index 0000000..d9e4f1d --- /dev/null +++ b/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 diff --git a/bootloader/gotek/stm32_usbh_msc/Makefile b/bootloader/usb/stm32_usbh_msc/Makefile similarity index 65% rename from bootloader/gotek/stm32_usbh_msc/Makefile rename to bootloader/usb/stm32_usbh_msc/Makefile index 0a33f60..410c514 100644 --- a/bootloader/gotek/stm32_usbh_msc/Makefile +++ b/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 diff --git a/reloader/Makefile b/reloader/Makefile index 572b2fe..3d3af3d 100644 --- a/reloader/Makefile +++ b/reloader/Makefile @@ -20,3 +20,4 @@ OBJS-$(debug) += console.o SUBDIRS += fatfs SUBDIRS += gotek +SUBDIRS += usb diff --git a/reloader/gotek/Makefile b/reloader/gotek/Makefile index 820558e..7f50156 100644 --- a/reloader/gotek/Makefile +++ b/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 diff --git a/reloader/usb/Makefile b/reloader/usb/Makefile new file mode 100644 index 0000000..d9e4f1d --- /dev/null +++ b/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 diff --git a/reloader/gotek/stm32_usbh_msc/Makefile b/reloader/usb/stm32_usbh_msc/Makefile similarity index 65% rename from reloader/gotek/stm32_usbh_msc/Makefile rename to reloader/usb/stm32_usbh_msc/Makefile index 0a33f60..410c514 100644 --- a/reloader/gotek/stm32_usbh_msc/Makefile +++ b/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 diff --git a/src/Makefile b/src/Makefile index 7dc9c04..9a05741 100644 --- a/src/Makefile +++ b/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 diff --git a/src/gotek/Makefile b/src/gotek/Makefile index 34d95c3..5c2207e 100644 --- a/src/gotek/Makefile +++ b/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_$* diff --git a/src/usb/Makefile b/src/usb/Makefile new file mode 100644 index 0000000..b85b82d --- /dev/null +++ b/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 diff --git a/src/gotek/stm32_usbh_msc/Makefile b/src/usb/stm32_usbh_msc/Makefile similarity index 100% rename from src/gotek/stm32_usbh_msc/Makefile rename to src/usb/stm32_usbh_msc/Makefile diff --git a/src/gotek/stm32_usbh_msc/inc/core_cm3.h b/src/usb/stm32_usbh_msc/inc/core_cm3.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/core_cm3.h rename to src/usb/stm32_usbh_msc/inc/core_cm3.h diff --git a/src/gotek/stm32_usbh_msc/inc/usb_bsp.h b/src/usb/stm32_usbh_msc/inc/usb_bsp.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usb_bsp.h rename to src/usb/stm32_usbh_msc/inc/usb_bsp.h diff --git a/src/gotek/stm32_usbh_msc/inc/usb_conf.h b/src/usb/stm32_usbh_msc/inc/usb_conf.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usb_conf.h rename to src/usb/stm32_usbh_msc/inc/usb_conf.h diff --git a/src/gotek/stm32_usbh_msc/inc/usb_core.h b/src/usb/stm32_usbh_msc/inc/usb_core.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usb_core.h rename to src/usb/stm32_usbh_msc/inc/usb_core.h diff --git a/src/gotek/stm32_usbh_msc/inc/usb_defines.h b/src/usb/stm32_usbh_msc/inc/usb_defines.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usb_defines.h rename to src/usb/stm32_usbh_msc/inc/usb_defines.h diff --git a/src/gotek/stm32_usbh_msc/inc/usb_hcd.h b/src/usb/stm32_usbh_msc/inc/usb_hcd.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usb_hcd.h rename to src/usb/stm32_usbh_msc/inc/usb_hcd.h diff --git a/src/gotek/stm32_usbh_msc/inc/usb_hcd_int.h b/src/usb/stm32_usbh_msc/inc/usb_hcd_int.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usb_hcd_int.h rename to src/usb/stm32_usbh_msc/inc/usb_hcd_int.h diff --git a/src/gotek/stm32_usbh_msc/inc/usb_regs.h b/src/usb/stm32_usbh_msc/inc/usb_regs.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usb_regs.h rename to src/usb/stm32_usbh_msc/inc/usb_regs.h diff --git a/src/gotek/stm32_usbh_msc/inc/usbh_conf.h b/src/usb/stm32_usbh_msc/inc/usbh_conf.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usbh_conf.h rename to src/usb/stm32_usbh_msc/inc/usbh_conf.h diff --git a/src/gotek/stm32_usbh_msc/inc/usbh_core.h b/src/usb/stm32_usbh_msc/inc/usbh_core.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usbh_core.h rename to src/usb/stm32_usbh_msc/inc/usbh_core.h diff --git a/src/gotek/stm32_usbh_msc/inc/usbh_def.h b/src/usb/stm32_usbh_msc/inc/usbh_def.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usbh_def.h rename to src/usb/stm32_usbh_msc/inc/usbh_def.h diff --git a/src/gotek/stm32_usbh_msc/inc/usbh_hcs.h b/src/usb/stm32_usbh_msc/inc/usbh_hcs.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usbh_hcs.h rename to src/usb/stm32_usbh_msc/inc/usbh_hcs.h diff --git a/src/gotek/stm32_usbh_msc/inc/usbh_ioreq.h b/src/usb/stm32_usbh_msc/inc/usbh_ioreq.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usbh_ioreq.h rename to src/usb/stm32_usbh_msc/inc/usbh_ioreq.h diff --git a/src/gotek/stm32_usbh_msc/inc/usbh_msc_bot.h b/src/usb/stm32_usbh_msc/inc/usbh_msc_bot.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usbh_msc_bot.h rename to src/usb/stm32_usbh_msc/inc/usbh_msc_bot.h diff --git a/src/gotek/stm32_usbh_msc/inc/usbh_msc_core.h b/src/usb/stm32_usbh_msc/inc/usbh_msc_core.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usbh_msc_core.h rename to src/usb/stm32_usbh_msc/inc/usbh_msc_core.h diff --git a/src/gotek/stm32_usbh_msc/inc/usbh_msc_scsi.h b/src/usb/stm32_usbh_msc/inc/usbh_msc_scsi.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usbh_msc_scsi.h rename to src/usb/stm32_usbh_msc/inc/usbh_msc_scsi.h diff --git a/src/gotek/stm32_usbh_msc/inc/usbh_stdreq.h b/src/usb/stm32_usbh_msc/inc/usbh_stdreq.h similarity index 100% rename from src/gotek/stm32_usbh_msc/inc/usbh_stdreq.h rename to src/usb/stm32_usbh_msc/inc/usbh_stdreq.h diff --git a/src/gotek/stm32_usbh_msc/usb_core.c b/src/usb/stm32_usbh_msc/usb_core.c similarity index 100% rename from src/gotek/stm32_usbh_msc/usb_core.c rename to src/usb/stm32_usbh_msc/usb_core.c diff --git a/src/gotek/stm32_usbh_msc/usb_hcd.c b/src/usb/stm32_usbh_msc/usb_hcd.c similarity index 100% rename from src/gotek/stm32_usbh_msc/usb_hcd.c rename to src/usb/stm32_usbh_msc/usb_hcd.c diff --git a/src/gotek/stm32_usbh_msc/usb_hcd_int.c b/src/usb/stm32_usbh_msc/usb_hcd_int.c similarity index 100% rename from src/gotek/stm32_usbh_msc/usb_hcd_int.c rename to src/usb/stm32_usbh_msc/usb_hcd_int.c diff --git a/src/gotek/stm32_usbh_msc/usbh_core.c b/src/usb/stm32_usbh_msc/usbh_core.c similarity index 100% rename from src/gotek/stm32_usbh_msc/usbh_core.c rename to src/usb/stm32_usbh_msc/usbh_core.c diff --git a/src/gotek/stm32_usbh_msc/usbh_hcs.c b/src/usb/stm32_usbh_msc/usbh_hcs.c similarity index 100% rename from src/gotek/stm32_usbh_msc/usbh_hcs.c rename to src/usb/stm32_usbh_msc/usbh_hcs.c diff --git a/src/gotek/stm32_usbh_msc/usbh_ioreq.c b/src/usb/stm32_usbh_msc/usbh_ioreq.c similarity index 100% rename from src/gotek/stm32_usbh_msc/usbh_ioreq.c rename to src/usb/stm32_usbh_msc/usbh_ioreq.c diff --git a/src/gotek/stm32_usbh_msc/usbh_msc_bot.c b/src/usb/stm32_usbh_msc/usbh_msc_bot.c similarity index 100% rename from src/gotek/stm32_usbh_msc/usbh_msc_bot.c rename to src/usb/stm32_usbh_msc/usbh_msc_bot.c diff --git a/src/gotek/stm32_usbh_msc/usbh_msc_core.c b/src/usb/stm32_usbh_msc/usbh_msc_core.c similarity index 100% rename from src/gotek/stm32_usbh_msc/usbh_msc_core.c rename to src/usb/stm32_usbh_msc/usbh_msc_core.c diff --git a/src/gotek/stm32_usbh_msc/usbh_msc_scsi.c b/src/usb/stm32_usbh_msc/usbh_msc_scsi.c similarity index 100% rename from src/gotek/stm32_usbh_msc/usbh_msc_scsi.c rename to src/usb/stm32_usbh_msc/usbh_msc_scsi.c diff --git a/src/gotek/stm32_usbh_msc/usbh_stdreq.c b/src/usb/stm32_usbh_msc/usbh_stdreq.c similarity index 100% rename from src/gotek/stm32_usbh_msc/usbh_stdreq.c rename to src/usb/stm32_usbh_msc/usbh_stdreq.c diff --git a/src/gotek/usb_bsp.c b/src/usb/usb_bsp.c similarity index 100% rename from src/gotek/usb_bsp.c rename to src/usb/usb_bsp.c diff --git a/src/gotek/usbh_msc_fatfs.c b/src/usb/usbh_msc_fatfs.c similarity index 100% rename from src/gotek/usbh_msc_fatfs.c rename to src/usb/usbh_msc_fatfs.c