From c32e826feac40e39f66de8f2f3fa92e1c74b27b9 Mon Sep 17 00:00:00 2001 From: rusefi Date: Wed, 24 Aug 2022 13:55:21 -0400 Subject: [PATCH] refactoring: explicit folder for FatFS --- firmware/Makefile | 4 ++-- firmware/ext/{ => FatFS}/diskio.h | 0 firmware/ext/{ => FatFS}/ext.mk | 0 firmware/ext/{ => FatFS}/fatfs.mk | 6 +++--- firmware/ext/{ => FatFS}/ff.c | 0 firmware/ext/{ => FatFS}/ff.h | 0 firmware/ext/{ => FatFS}/ffconf.h | 0 firmware/ext/{ => FatFS}/ffunicode.c | 0 firmware/ext/{ => FatFS}/integer.h | 0 firmware/ext/{ => FatFS}/option/cc932.c | 0 firmware/ext/{ => FatFS}/option/cc936.c | 0 firmware/ext/{ => FatFS}/option/cc949.c | 0 firmware/ext/{ => FatFS}/option/cc950.c | 0 firmware/ext/{ => FatFS}/option/ccsbcs.c | 0 firmware/ext/{ => FatFS}/option/unicode.c | 0 firmware/ext/{ => FatFS}/readme.txt | 0 16 files changed, 5 insertions(+), 5 deletions(-) rename firmware/ext/{ => FatFS}/diskio.h (100%) rename firmware/ext/{ => FatFS}/ext.mk (100%) rename firmware/ext/{ => FatFS}/fatfs.mk (54%) rename firmware/ext/{ => FatFS}/ff.c (100%) rename firmware/ext/{ => FatFS}/ff.h (100%) rename firmware/ext/{ => FatFS}/ffconf.h (100%) rename firmware/ext/{ => FatFS}/ffunicode.c (100%) rename firmware/ext/{ => FatFS}/integer.h (100%) rename firmware/ext/{ => FatFS}/option/cc932.c (100%) rename firmware/ext/{ => FatFS}/option/cc936.c (100%) rename firmware/ext/{ => FatFS}/option/cc949.c (100%) rename firmware/ext/{ => FatFS}/option/cc950.c (100%) rename firmware/ext/{ => FatFS}/option/ccsbcs.c (100%) rename firmware/ext/{ => FatFS}/option/unicode.c (100%) rename firmware/ext/{ => FatFS}/readme.txt (100%) diff --git a/firmware/Makefile b/firmware/Makefile index 83524333f6..fb869ba33d 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -200,7 +200,7 @@ endif #Now include RusEFI mk files include console/binary/tunerstudio.mk ifeq ($(USE_FATFS),yes) -include $(PROJECT_DIR)/ext/fatfs.mk +include $(PROJECT_DIR)/ext/FatFS/fatfs.mk endif include $(PROJECT_DIR)/hw_layer/mass_storage/mass_storage.mk @@ -294,7 +294,7 @@ INCDIR = \ $(CHIBIOS)/os/hal/lib/peripherals/sensors \ $(RUSEFI_LIB_INC) \ $(CONFDIR) \ - ext \ + ext\FatFS \ $(PROJECT_DIR)/hw_layer/mass_storage \ $(PROJECT_DIR)/hw_layer/serial_over_usb \ $(PROJECT_DIR)/hw_layer/lcd \ diff --git a/firmware/ext/diskio.h b/firmware/ext/FatFS/diskio.h similarity index 100% rename from firmware/ext/diskio.h rename to firmware/ext/FatFS/diskio.h diff --git a/firmware/ext/ext.mk b/firmware/ext/FatFS/ext.mk similarity index 100% rename from firmware/ext/ext.mk rename to firmware/ext/FatFS/ext.mk diff --git a/firmware/ext/fatfs.mk b/firmware/ext/FatFS/fatfs.mk similarity index 54% rename from firmware/ext/fatfs.mk rename to firmware/ext/FatFS/fatfs.mk index 7c693f64da..df3d1ee6c1 100644 --- a/firmware/ext/fatfs.mk +++ b/firmware/ext/FatFS/fatfs.mk @@ -1,8 +1,8 @@ # FATFS files. FATFSSRC = ${CHIBIOS}/os/various/fatfs_bindings/fatfs_diskio.c \ ${CHIBIOS}/os/various/fatfs_bindings/fatfs_syscall.c \ - ${PROJECT_DIR}/ext/ff.c \ - ${PROJECT_DIR}/ext/ffunicode.c \ - ${PROJECT_DIR}/ext/option/unicode.c + ${PROJECT_DIR}/ext/FatFS/ff.c \ + ${PROJECT_DIR}/ext/FatFS/ffunicode.c \ + ${PROJECT_DIR}/ext/FatFS/option/unicode.c FATFSINC = ${PROJECT_DIR}/ext diff --git a/firmware/ext/ff.c b/firmware/ext/FatFS/ff.c similarity index 100% rename from firmware/ext/ff.c rename to firmware/ext/FatFS/ff.c diff --git a/firmware/ext/ff.h b/firmware/ext/FatFS/ff.h similarity index 100% rename from firmware/ext/ff.h rename to firmware/ext/FatFS/ff.h diff --git a/firmware/ext/ffconf.h b/firmware/ext/FatFS/ffconf.h similarity index 100% rename from firmware/ext/ffconf.h rename to firmware/ext/FatFS/ffconf.h diff --git a/firmware/ext/ffunicode.c b/firmware/ext/FatFS/ffunicode.c similarity index 100% rename from firmware/ext/ffunicode.c rename to firmware/ext/FatFS/ffunicode.c diff --git a/firmware/ext/integer.h b/firmware/ext/FatFS/integer.h similarity index 100% rename from firmware/ext/integer.h rename to firmware/ext/FatFS/integer.h diff --git a/firmware/ext/option/cc932.c b/firmware/ext/FatFS/option/cc932.c similarity index 100% rename from firmware/ext/option/cc932.c rename to firmware/ext/FatFS/option/cc932.c diff --git a/firmware/ext/option/cc936.c b/firmware/ext/FatFS/option/cc936.c similarity index 100% rename from firmware/ext/option/cc936.c rename to firmware/ext/FatFS/option/cc936.c diff --git a/firmware/ext/option/cc949.c b/firmware/ext/FatFS/option/cc949.c similarity index 100% rename from firmware/ext/option/cc949.c rename to firmware/ext/FatFS/option/cc949.c diff --git a/firmware/ext/option/cc950.c b/firmware/ext/FatFS/option/cc950.c similarity index 100% rename from firmware/ext/option/cc950.c rename to firmware/ext/FatFS/option/cc950.c diff --git a/firmware/ext/option/ccsbcs.c b/firmware/ext/FatFS/option/ccsbcs.c similarity index 100% rename from firmware/ext/option/ccsbcs.c rename to firmware/ext/FatFS/option/ccsbcs.c diff --git a/firmware/ext/option/unicode.c b/firmware/ext/FatFS/option/unicode.c similarity index 100% rename from firmware/ext/option/unicode.c rename to firmware/ext/FatFS/option/unicode.c diff --git a/firmware/ext/readme.txt b/firmware/ext/FatFS/readme.txt similarity index 100% rename from firmware/ext/readme.txt rename to firmware/ext/FatFS/readme.txt