From f817ec50096222444938d4543f596a1670697f03 Mon Sep 17 00:00:00 2001 From: Pablo Curiel Date: Fri, 1 Nov 2024 16:31:00 +0100 Subject: [PATCH] nxdt_devoptab: update file layout --- Makefile | 2 +- include/core/{ => devoptab}/fatfs/diskio.h | 0 include/core/{ => devoptab}/fatfs/ff.h | 0 include/core/{ => devoptab}/fatfs/ffconf.h | 2 +- include/core/devoptab/nxdt_devoptab.h | 2 +- source/core/bis_storage.c | 2 +- source/core/devoptab/fat_dev.c | 1 - source/core/{ => devoptab}/fatfs/diskio.c | 4 ++-- source/core/{ => devoptab}/fatfs/ff.c | 4 ++-- source/core/{ => devoptab}/fatfs/ffsystem.c | 2 +- source/core/{ => devoptab}/fatfs/ffunicode.c | 2 +- todo.txt | 1 - 12 files changed, 10 insertions(+), 12 deletions(-) rename include/core/{ => devoptab}/fatfs/diskio.h (100%) rename include/core/{ => devoptab}/fatfs/ff.h (100%) rename include/core/{ => devoptab}/fatfs/ffconf.h (99%) rename source/core/{ => devoptab}/fatfs/diskio.c (96%) rename source/core/{ => devoptab}/fatfs/ff.c (99%) rename source/core/{ => devoptab}/fatfs/ffsystem.c (99%) rename source/core/{ => devoptab}/fatfs/ffunicode.c (99%) diff --git a/Makefile b/Makefile index 934216f..28bb19b 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,7 @@ BUILD_TIMESTAMP := $(strip $(shell date --utc '+%Y-%m-%d %T UTC')) TARGET := ${APP_TITLE} BUILD := build -SOURCES := source source/core source/core/fatfs source/core/devoptab source/tasks source/utils source/views +SOURCES := source source/core source/core/devoptab source/core/devoptab/fatfs source/tasks source/utils source/views DATA := data ICON := romfs/icon/${APP_TITLE}.jpg INCLUDES := include diff --git a/include/core/fatfs/diskio.h b/include/core/devoptab/fatfs/diskio.h similarity index 100% rename from include/core/fatfs/diskio.h rename to include/core/devoptab/fatfs/diskio.h diff --git a/include/core/fatfs/ff.h b/include/core/devoptab/fatfs/ff.h similarity index 100% rename from include/core/fatfs/ff.h rename to include/core/devoptab/fatfs/ff.h diff --git a/include/core/fatfs/ffconf.h b/include/core/devoptab/fatfs/ffconf.h similarity index 99% rename from include/core/fatfs/ffconf.h rename to include/core/devoptab/fatfs/ffconf.h index 4b7210a..7e2cd0c 100644 --- a/include/core/fatfs/ffconf.h +++ b/include/core/devoptab/fatfs/ffconf.h @@ -1,4 +1,4 @@ -#include "../../defines.h" +#include "../../../defines.h" /*---------------------------------------------------------------------------/ / Configurations of FatFs Module diff --git a/include/core/devoptab/nxdt_devoptab.h b/include/core/devoptab/nxdt_devoptab.h index 8b8d2dc..034a1ce 100644 --- a/include/core/devoptab/nxdt_devoptab.h +++ b/include/core/devoptab/nxdt_devoptab.h @@ -27,7 +27,7 @@ #include "../pfs.h" #include "../hfs.h" #include "../romfs.h" -#include "../fatfs/ff.h" +#include "fatfs/ff.h" #ifdef __cplusplus extern "C" { diff --git a/source/core/bis_storage.c b/source/core/bis_storage.c index 355160d..c617e75 100644 --- a/source/core/bis_storage.c +++ b/source/core/bis_storage.c @@ -46,7 +46,7 @@ const char *bisStorageGet##property##ByBisPartitionId(u8 bis_partition_id) { \ /* Type definitions. */ typedef struct { - u8 bis_partition_id; ///< FsBisPartitionId. + u8 bis_partition_id; ///< FsBisPartitionId. const char *gpt_name; const char *sysinit_name; const char *devoptab_mount_name; diff --git a/source/core/devoptab/fat_dev.c b/source/core/devoptab/fat_dev.c index 3f90cd6..17b4e73 100644 --- a/source/core/devoptab/fat_dev.c +++ b/source/core/devoptab/fat_dev.c @@ -24,7 +24,6 @@ #include #include #include -#include /* Helper macros. */ diff --git a/source/core/fatfs/diskio.c b/source/core/devoptab/fatfs/diskio.c similarity index 96% rename from source/core/fatfs/diskio.c rename to source/core/devoptab/fatfs/diskio.c index 79bb54e..3cfbcd4 100644 --- a/source/core/fatfs/diskio.c +++ b/source/core/devoptab/fatfs/diskio.c @@ -10,8 +10,8 @@ #include #include -#include /* Obtains integer types */ -#include /* Declarations of disk functions */ +#include /* Obtains integer types */ +#include /* Declarations of disk functions */ /*-----------------------------------------------------------------------*/ /* Get Drive Status */ diff --git a/source/core/fatfs/ff.c b/source/core/devoptab/fatfs/ff.c similarity index 99% rename from source/core/fatfs/ff.c rename to source/core/devoptab/fatfs/ff.c index dc957c6..3fc5c61 100644 --- a/source/core/fatfs/ff.c +++ b/source/core/devoptab/fatfs/ff.c @@ -20,8 +20,8 @@ #include -#include /* Declarations of FatFs API */ -#include /* Declarations of device I/O functions */ +#include /* Declarations of FatFs API */ +#include /* Declarations of device I/O functions */ /*-------------------------------------------------------------------------- diff --git a/source/core/fatfs/ffsystem.c b/source/core/devoptab/fatfs/ffsystem.c similarity index 99% rename from source/core/fatfs/ffsystem.c rename to source/core/devoptab/fatfs/ffsystem.c index fbd7bb0..0d8262b 100644 --- a/source/core/fatfs/ffsystem.c +++ b/source/core/devoptab/fatfs/ffsystem.c @@ -2,7 +2,7 @@ /* A Sample Code of User Provided OS Dependent Functions for FatFs */ /*------------------------------------------------------------------------*/ -#include +#include #if FF_USE_LFN == 3 /* Use dynamic memory allocation */ diff --git a/source/core/fatfs/ffunicode.c b/source/core/devoptab/fatfs/ffunicode.c similarity index 99% rename from source/core/fatfs/ffunicode.c rename to source/core/devoptab/fatfs/ffunicode.c index 181c233..058d090 100644 --- a/source/core/fatfs/ffunicode.c +++ b/source/core/devoptab/fatfs/ffunicode.c @@ -23,7 +23,7 @@ */ -#include +#include #if FF_USE_LFN != 0 /* This module will be blanked if in non-LFN configuration */ diff --git a/todo.txt b/todo.txt index 7e7b83b..57c600f 100644 --- a/todo.txt +++ b/todo.txt @@ -13,7 +13,6 @@ todo: others: check todo with grep others: dump verification via no-intro - others: fatfs browser for emmc partitions reminder: