From 3bc9f5509b9f36e934d1a16eeda31be9bb22ac10 Mon Sep 17 00:00:00 2001 From: Subv Date: Wed, 31 Dec 2014 21:43:31 -0500 Subject: Archives: Change the folder layout of some archives. This is to better represent the hardware layout, they are still aren't quite accurate, but this better and will help a bit when implementing the other archives like NAND-RO and NAND-RW --- src/common/common_paths.h | 41 +++++++++++++++++++++-------------------- src/common/file_util.cpp | 2 ++ src/common/file_util.h | 1 + 3 files changed, 24 insertions(+), 20 deletions(-) (limited to 'src/common') diff --git a/src/common/common_paths.h b/src/common/common_paths.h index e692e5492..f019944f5 100644 --- a/src/common/common_paths.h +++ b/src/common/common_paths.h @@ -35,26 +35,27 @@ #define JAP_DIR "JAP" // Subdirs in the User dir returned by GetUserPath(D_USER_IDX) -#define CONFIG_DIR "config" -#define GAMECONFIG_DIR "game_config" -#define MAPS_DIR "maps" -#define CACHE_DIR "cache" -#define SDMC_DIR "sdmc" -#define EXTSAVEDATA_DIR "extsavedata" -#define SAVEDATA_DIR "savedata" -#define SAVEDATACHECK_DIR "savedatacheck" -#define SYSDATA_DIR "sysdata" -#define SYSSAVEDATA_DIR "syssavedata" -#define SHADERCACHE_DIR "shader_cache" -#define STATESAVES_DIR "state_saves" -#define SCREENSHOTS_DIR "screenShots" -#define DUMP_DIR "dump" -#define DUMP_TEXTURES_DIR "textures" -#define DUMP_FRAMES_DIR "frames" -#define DUMP_AUDIO_DIR "audio" -#define LOGS_DIR "logs" -#define SHADERS_DIR "shaders" -#define SYSCONF_DIR "sysconf" +#define CONFIG_DIR "config" +#define GAMECONFIG_DIR "game_config" +#define MAPS_DIR "maps" +#define CACHE_DIR "cache" +#define SDMC_DIR "sdmc" +#define EXTSAVEDATA_DIR "sdmc/Nintendo 3DS/extdata" +#define SHAREDEXTSAVEDATA_DIR "nand/data/extdata" +#define SAVEDATA_DIR "savedata" +#define SAVEDATACHECK_DIR "savedatacheck" +#define SYSDATA_DIR "sysdata" +#define SYSSAVEDATA_DIR "nand/data/sysdata" +#define SHADERCACHE_DIR "shader_cache" +#define STATESAVES_DIR "state_saves" +#define SCREENSHOTS_DIR "screenShots" +#define DUMP_DIR "dump" +#define DUMP_TEXTURES_DIR "textures" +#define DUMP_FRAMES_DIR "frames" +#define DUMP_AUDIO_DIR "audio" +#define LOGS_DIR "logs" +#define SHADERS_DIR "shaders" +#define SYSCONF_DIR "sysconf" // Filenames // Files in the directory returned by GetUserPath(D_CONFIG_IDX) diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index 0a6cd80c8..f8d140d84 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -677,6 +677,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; paths[D_SDMC_IDX] = paths[D_USER_IDX] + SDMC_DIR DIR_SEP; paths[D_EXTSAVEDATA] = paths[D_USER_IDX] + EXTSAVEDATA_DIR DIR_SEP; + paths[D_SHAREDEXTSAVEDATA] = paths[D_USER_IDX] + SHAREDEXTSAVEDATA_DIR DIR_SEP; paths[D_SAVEDATA_IDX] = paths[D_USER_IDX] + SAVEDATA_DIR DIR_SEP; paths[D_SAVEDATACHECK_IDX] = paths[D_USER_IDX] + SAVEDATACHECK_DIR DIR_SEP; paths[D_SYSDATA_IDX] = paths[D_USER_IDX] + SYSDATA_DIR DIR_SEP; @@ -723,6 +724,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; paths[D_SDMC_IDX] = paths[D_USER_IDX] + SDMC_DIR DIR_SEP; paths[D_EXTSAVEDATA] = paths[D_USER_IDX] + EXTSAVEDATA_DIR DIR_SEP; + paths[D_SHAREDEXTSAVEDATA] = paths[D_USER_IDX] + SHAREDEXTSAVEDATA_DIR DIR_SEP; paths[D_SAVEDATA_IDX] = paths[D_USER_IDX] + SAVEDATA_DIR DIR_SEP; paths[D_SAVEDATACHECK_IDX] = paths[D_USER_IDX] + SAVEDATACHECK_DIR DIR_SEP; paths[D_SYSSAVEDATA_IDX] = paths[D_USER_IDX] + SYSSAVEDATA_DIR DIR_SEP; diff --git a/src/common/file_util.h b/src/common/file_util.h index c83ecd87d..4d6155f1f 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -28,6 +28,7 @@ enum { D_SCREENSHOTS_IDX, D_SDMC_IDX, D_EXTSAVEDATA, + D_SHAREDEXTSAVEDATA, D_SAVEDATA_IDX, D_SAVEDATACHECK_IDX, D_SYSDATA_IDX, -- cgit v1.2.3 From cfd7b219f6ad9116057fbe64bbb5dfd0afbbe29c Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 3 Jan 2015 19:01:46 -0500 Subject: SaveDataCheck: Move the files to nand/title under /nand/title/high/low/content/00000000.app.romfs --- src/common/common_paths.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/common') diff --git a/src/common/common_paths.h b/src/common/common_paths.h index f019944f5..e307ca9f3 100644 --- a/src/common/common_paths.h +++ b/src/common/common_paths.h @@ -43,7 +43,7 @@ #define EXTSAVEDATA_DIR "sdmc/Nintendo 3DS/extdata" #define SHAREDEXTSAVEDATA_DIR "nand/data/extdata" #define SAVEDATA_DIR "savedata" -#define SAVEDATACHECK_DIR "savedatacheck" +#define SAVEDATACHECK_DIR "nand/title" #define SYSDATA_DIR "sysdata" #define SYSSAVEDATA_DIR "nand/data/sysdata" #define SHADERCACHE_DIR "shader_cache" -- cgit v1.2.3 From 71a063f45cba961ee07730f4ab79f2bcc3ff9b5b Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 3 Jan 2015 20:46:05 -0500 Subject: Archives: Changed the way paths are built for the archives. Each archive now takes a mount point of either NAND or SDMC, and builds its own directory structure there, trying to simulate an HLE-friendly hardware layout --- src/common/common_paths.h | 6 +----- src/common/file_util.cpp | 12 ++---------- src/common/file_util.h | 6 +----- 3 files changed, 4 insertions(+), 20 deletions(-) (limited to 'src/common') diff --git a/src/common/common_paths.h b/src/common/common_paths.h index e307ca9f3..0ecf2d9de 100644 --- a/src/common/common_paths.h +++ b/src/common/common_paths.h @@ -40,12 +40,8 @@ #define MAPS_DIR "maps" #define CACHE_DIR "cache" #define SDMC_DIR "sdmc" -#define EXTSAVEDATA_DIR "sdmc/Nintendo 3DS/extdata" -#define SHAREDEXTSAVEDATA_DIR "nand/data/extdata" -#define SAVEDATA_DIR "savedata" -#define SAVEDATACHECK_DIR "nand/title" +#define NAND_DIR "nand" #define SYSDATA_DIR "sysdata" -#define SYSSAVEDATA_DIR "nand/data/sysdata" #define SHADERCACHE_DIR "shader_cache" #define STATESAVES_DIR "state_saves" #define SCREENSHOTS_DIR "screenShots" diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp index f8d140d84..706e7c842 100644 --- a/src/common/file_util.cpp +++ b/src/common/file_util.cpp @@ -676,12 +676,8 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP; paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; paths[D_SDMC_IDX] = paths[D_USER_IDX] + SDMC_DIR DIR_SEP; - paths[D_EXTSAVEDATA] = paths[D_USER_IDX] + EXTSAVEDATA_DIR DIR_SEP; - paths[D_SHAREDEXTSAVEDATA] = paths[D_USER_IDX] + SHAREDEXTSAVEDATA_DIR DIR_SEP; - paths[D_SAVEDATA_IDX] = paths[D_USER_IDX] + SAVEDATA_DIR DIR_SEP; - paths[D_SAVEDATACHECK_IDX] = paths[D_USER_IDX] + SAVEDATACHECK_DIR DIR_SEP; + paths[D_NAND_IDX] = paths[D_USER_IDX] + NAND_DIR DIR_SEP; paths[D_SYSDATA_IDX] = paths[D_USER_IDX] + SYSDATA_DIR DIR_SEP; - paths[D_SYSSAVEDATA_IDX] = paths[D_USER_IDX] + SYSSAVEDATA_DIR DIR_SEP; paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP; paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP; paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP; @@ -723,11 +719,7 @@ const std::string& GetUserPath(const unsigned int DirIDX, const std::string &new paths[D_MAPS_IDX] = paths[D_USER_IDX] + MAPS_DIR DIR_SEP; paths[D_CACHE_IDX] = paths[D_USER_IDX] + CACHE_DIR DIR_SEP; paths[D_SDMC_IDX] = paths[D_USER_IDX] + SDMC_DIR DIR_SEP; - paths[D_EXTSAVEDATA] = paths[D_USER_IDX] + EXTSAVEDATA_DIR DIR_SEP; - paths[D_SHAREDEXTSAVEDATA] = paths[D_USER_IDX] + SHAREDEXTSAVEDATA_DIR DIR_SEP; - paths[D_SAVEDATA_IDX] = paths[D_USER_IDX] + SAVEDATA_DIR DIR_SEP; - paths[D_SAVEDATACHECK_IDX] = paths[D_USER_IDX] + SAVEDATACHECK_DIR DIR_SEP; - paths[D_SYSSAVEDATA_IDX] = paths[D_USER_IDX] + SYSSAVEDATA_DIR DIR_SEP; + paths[D_NAND_IDX] = paths[D_USER_IDX] + NAND_DIR DIR_SEP; paths[D_SHADERCACHE_IDX] = paths[D_USER_IDX] + SHADERCACHE_DIR DIR_SEP; paths[D_SHADERS_IDX] = paths[D_USER_IDX] + SHADERS_DIR DIR_SEP; paths[D_STATESAVES_IDX] = paths[D_USER_IDX] + STATESAVES_DIR DIR_SEP; diff --git a/src/common/file_util.h b/src/common/file_util.h index 4d6155f1f..86aab2e3d 100644 --- a/src/common/file_util.h +++ b/src/common/file_util.h @@ -27,12 +27,8 @@ enum { D_STATESAVES_IDX, D_SCREENSHOTS_IDX, D_SDMC_IDX, - D_EXTSAVEDATA, - D_SHAREDEXTSAVEDATA, - D_SAVEDATA_IDX, - D_SAVEDATACHECK_IDX, + D_NAND_IDX, D_SYSDATA_IDX, - D_SYSSAVEDATA_IDX, D_HIRESTEXTURES_IDX, D_DUMP_IDX, D_DUMPFRAMES_IDX, -- cgit v1.2.3