From 3bc9f5509b9f36e934d1a16eeda31be9bb22ac10 Mon Sep 17 00:00:00 2001 From: Subv Date: Wed, 31 Dec 2014 21:43:31 -0500 Subject: [PATCH 1/8] 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 + src/core/file_sys/archive_extsavedata.cpp | 3 +- src/core/hle/service/fs/archive.cpp | 2 +- src/core/hle/service/ptm_u.cpp | 2 +- 6 files changed, 27 insertions(+), 24 deletions(-) diff --git a/src/common/common_paths.h b/src/common/common_paths.h index e692e54924..f019944f51 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 0a6cd80c87..f8d140d84f 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 c83ecd87db..4d6155f1f6 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, diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index 4759ef3aea..2f00bf067d 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -19,10 +19,9 @@ namespace FileSys { static std::string GetExtSaveDataPath(const std::string& mount_point, const Path& path) { std::vector vec_data = path.AsBinary(); const u32* data = reinterpret_cast(vec_data.data()); - u32 media_type = data[0]; u32 save_low = data[1]; u32 save_high = data[2]; - return Common::StringFromFormat("%s%s/%08X/%08X/", mount_point.c_str(), media_type == 0 ? "nand" : "sdmc", save_high, save_low); + return Common::StringFromFormat("%s%08X/%08X/", mount_point.c_str(), save_high, save_low); } Archive_ExtSaveData::Archive_ExtSaveData(const std::string& mount_point) diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index f761c6ab9d..56d53402f6 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -455,7 +455,7 @@ void ArchiveInit() { else LOG_ERROR(Service_FS, "Can't instantiate ExtSaveData archive with path %s", extsavedata_directory.c_str()); - std::string sharedextsavedata_directory = FileUtil::GetUserPath(D_EXTSAVEDATA); + std::string sharedextsavedata_directory = FileUtil::GetUserPath(D_SHAREDEXTSAVEDATA); auto sharedextsavedata_archive = Common::make_unique(sharedextsavedata_directory); if (sharedextsavedata_archive->Initialize()) CreateArchive(std::move(sharedextsavedata_archive), ArchiveIdCode::SharedExtSaveData); diff --git a/src/core/hle/service/ptm_u.cpp b/src/core/hle/service/ptm_u.cpp index 9cc700c46d..c900c90f81 100644 --- a/src/core/hle/service/ptm_u.cpp +++ b/src/core/hle/service/ptm_u.cpp @@ -142,7 +142,7 @@ Interface::Interface() { Register(FunctionTable, ARRAY_SIZE(FunctionTable)); // Create the SharedExtSaveData archive 0xF000000B and the gamecoin.dat file // TODO(Subv): In the future we should use the FS service to query this archive - std::string extsavedata_directory = FileUtil::GetUserPath(D_EXTSAVEDATA); + std::string extsavedata_directory = FileUtil::GetUserPath(D_SHAREDEXTSAVEDATA); ptm_shared_extsavedata = Common::make_unique(extsavedata_directory); if (!ptm_shared_extsavedata->Initialize()) { LOG_CRITICAL(Service_PTM, "Could not initialize ExtSaveData archive for the PTM:U service"); From cfd7b219f6ad9116057fbe64bbb5dfd0afbbe29c Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 3 Jan 2015 19:01:46 -0500 Subject: [PATCH 2/8] SaveDataCheck: Move the files to nand/title under /nand/title/high/low/content/00000000.app.romfs --- src/common/common_paths.h | 2 +- src/core/file_sys/archive_savedatacheck.cpp | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/common_paths.h b/src/common/common_paths.h index f019944f51..e307ca9f37 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" diff --git a/src/core/file_sys/archive_savedatacheck.cpp b/src/core/file_sys/archive_savedatacheck.cpp index 233158a0ca..1b1e01c6ec 100644 --- a/src/core/file_sys/archive_savedatacheck.cpp +++ b/src/core/file_sys/archive_savedatacheck.cpp @@ -23,7 +23,8 @@ ResultCode Archive_SaveDataCheck::Open(const Path& path) { // this archive again with a different path, will corrupt the previously open file. auto vec = path.AsBinary(); const u32* data = reinterpret_cast(vec.data()); - std::string file_path = Common::StringFromFormat("%s%08x%08x.bin", mount_point.c_str(), data[1], data[0]); + std::string file_path = Common::StringFromFormat("%s%08x/%08x/content/00000000.app.romfs", + mount_point.c_str(), data[1], data[0]); FileUtil::IOFile file(file_path, "rb"); std::fill(raw_data.begin(), raw_data.end(), 0); From 71a063f45cba961ee07730f4ab79f2bcc3ff9b5b Mon Sep 17 00:00:00 2001 From: Subv Date: Sat, 3 Jan 2015 20:46:05 -0500 Subject: [PATCH 3/8] 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 +----- src/core/file_sys/archive_extsavedata.cpp | 14 +++++++++++--- src/core/file_sys/archive_extsavedata.h | 2 +- src/core/file_sys/archive_savedata.cpp | 15 +++++++++++++-- src/core/file_sys/archive_savedatacheck.cpp | 16 +++++++++++++--- src/core/file_sys/archive_systemsavedata.cpp | 7 ++++++- src/core/file_sys/archive_systemsavedata.h | 2 -- src/core/hle/service/cfg/cfg.cpp | 4 ++-- src/core/hle/service/fs/archive.cpp | 20 ++++++++++---------- src/core/hle/service/fs/archive.h | 5 +++++ src/core/hle/service/ptm_u.cpp | 6 +++--- 13 files changed, 68 insertions(+), 47 deletions(-) diff --git a/src/common/common_paths.h b/src/common/common_paths.h index e307ca9f37..0ecf2d9ded 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 f8d140d84f..706e7c8421 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 4d6155f1f6..86aab2e3dc 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, diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index 2f00bf067d..5de2aae439 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -9,6 +9,7 @@ #include "core/file_sys/archive_extsavedata.h" #include "core/file_sys/disk_archive.h" +#include "core/hle/service/fs/archive.h" #include "core/settings.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -24,9 +25,16 @@ static std::string GetExtSaveDataPath(const std::string& mount_point, const Path return Common::StringFromFormat("%s%08X/%08X/", mount_point.c_str(), save_high, save_low); } -Archive_ExtSaveData::Archive_ExtSaveData(const std::string& mount_point) - : DiskArchive(mount_point), concrete_mount_point(mount_point) { - LOG_INFO(Service_FS, "Directory %s set as base for ExtSaveData.", this->mount_point.c_str()); +static std::string GetExtDataContainerPath(const std::string& mount_point, bool shared) { + if (shared) + return Common::StringFromFormat("%sdata/%32x/extdata/", mount_point.c_str(), ID0); + + return Common::StringFromFormat("%sNintendo 3DS/%32x/%32x/extdata/", mount_point.c_str(), ID0, ID1); +} + +Archive_ExtSaveData::Archive_ExtSaveData(const std::string& mount_location, bool shared) + : DiskArchive(GetExtDataContainerPath(mount_location, shared)), concrete_mount_point(mount_point) { + LOG_INFO(Service_FS, "Directory %s set as base for ExtSaveData.", mount_point.c_str()); } bool Archive_ExtSaveData::Initialize() { diff --git a/src/core/file_sys/archive_extsavedata.h b/src/core/file_sys/archive_extsavedata.h index a3a1447991..fb7f209d2e 100644 --- a/src/core/file_sys/archive_extsavedata.h +++ b/src/core/file_sys/archive_extsavedata.h @@ -17,7 +17,7 @@ namespace FileSys { /// File system interface to the ExtSaveData archive class Archive_ExtSaveData final : public DiskArchive { public: - Archive_ExtSaveData(const std::string& mount_point); + Archive_ExtSaveData(const std::string& mount_point, bool shared); /** * Initialize the archive. diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp index 280d4ff5d3..f189692fa8 100644 --- a/src/core/file_sys/archive_savedata.cpp +++ b/src/core/file_sys/archive_savedata.cpp @@ -9,6 +9,7 @@ #include "core/file_sys/archive_savedata.h" #include "core/file_sys/disk_archive.h" +#include "core/hle/service/fs/archive.h" #include "core/settings.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -16,14 +17,24 @@ namespace FileSys { +static std::string GetSaveDataContainerPath(const std::string& mount_point) { + return Common::StringFromFormat("%sNintendo 3DS/%32x/%32x/title/", mount_point.c_str(), ID0, ID1); +} + +static std::string GetSaveDataPath(const std::string& mount_point, u64 program_id) { + u32 high = program_id >> 32; + u32 low = program_id & 0xFFFFFFFF; + return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_point.c_str(), high, low); +} + Archive_SaveData::Archive_SaveData(const std::string& mount_point) - : DiskArchive(mount_point) { + : DiskArchive(GetSaveDataContainerPath(mount_point)) { LOG_INFO(Service_FS, "Directory %s set as SaveData.", this->mount_point.c_str()); } ResultCode Archive_SaveData::Open(const Path& path) { if (concrete_mount_point.empty()) - concrete_mount_point = Common::StringFromFormat("%s%016X", mount_point.c_str(), Kernel::g_program_id) + DIR_SEP; + concrete_mount_point = GetSaveDataPath(mount_point, Kernel::g_program_id); if (!FileUtil::Exists(concrete_mount_point)) { // When a SaveData archive is created for the first time, it is not yet formatted // and the save file/directory structure expected by the game has not yet been initialized. diff --git a/src/core/file_sys/archive_savedatacheck.cpp b/src/core/file_sys/archive_savedatacheck.cpp index 1b1e01c6ec..dcd563773c 100644 --- a/src/core/file_sys/archive_savedatacheck.cpp +++ b/src/core/file_sys/archive_savedatacheck.cpp @@ -5,13 +5,24 @@ #include "common/file_util.h" #include "core/file_sys/archive_savedatacheck.h" +#include "core/hle/service/fs/archive.h" //////////////////////////////////////////////////////////////////////////////////////////////////// // FileSys namespace namespace FileSys { -Archive_SaveDataCheck::Archive_SaveDataCheck(const std::string& mount_loc) : mount_point(mount_loc) { +static std::string GetSaveDataCheckContainerPath(const std::string& mount_point) { + return Common::StringFromFormat("%stitle/", mount_point.c_str(), ID0); +} + +static std::string GetSaveDataCheckPath(const std::string& mount_point, u32 high, u32 low) { + return Common::StringFromFormat("%s%08x/%08x/content/00000000.app.romfs", + mount_point.c_str(), high, low); +} + +Archive_SaveDataCheck::Archive_SaveDataCheck(const std::string& mount_loc) : +mount_point(GetSaveDataCheckContainerPath(mount_loc)) { } ResultCode Archive_SaveDataCheck::Open(const Path& path) { @@ -23,8 +34,7 @@ ResultCode Archive_SaveDataCheck::Open(const Path& path) { // this archive again with a different path, will corrupt the previously open file. auto vec = path.AsBinary(); const u32* data = reinterpret_cast(vec.data()); - std::string file_path = Common::StringFromFormat("%s%08x/%08x/content/00000000.app.romfs", - mount_point.c_str(), data[1], data[0]); + std::string file_path = GetSaveDataCheckPath(mount_point, data[1], data[0]); FileUtil::IOFile file(file_path, "rb"); std::fill(raw_data.begin(), raw_data.end(), 0); diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp index 0da32d510c..615f50e20d 100644 --- a/src/core/file_sys/archive_systemsavedata.cpp +++ b/src/core/file_sys/archive_systemsavedata.cpp @@ -9,6 +9,7 @@ #include "core/file_sys/archive_systemsavedata.h" #include "core/file_sys/disk_archive.h" +#include "core/hle/service/fs/archive.h" #include "core/settings.h" //////////////////////////////////////////////////////////////////////////////////////////////////// @@ -22,8 +23,12 @@ static std::string GetSystemSaveDataPath(const std::string& mount_point, u64 sav return Common::StringFromFormat("%s%08X/%08X/", mount_point.c_str(), save_low, save_high); } +static std::string GetSystemSaveDataContainerPath(const std::string& mount_point) { + return Common::StringFromFormat("%sdata/%32x/sysdata/", mount_point.c_str(), ID0); +} + Archive_SystemSaveData::Archive_SystemSaveData(const std::string& mount_point, u64 save_id) - : DiskArchive(GetSystemSaveDataPath(mount_point, save_id)) { + : DiskArchive(GetSystemSaveDataPath(GetSystemSaveDataContainerPath(mount_point), save_id)) { LOG_INFO(Service_FS, "Directory %s set as SystemSaveData.", this->mount_point.c_str()); } diff --git a/src/core/file_sys/archive_systemsavedata.h b/src/core/file_sys/archive_systemsavedata.h index 55d85193c4..c8f5845ca7 100644 --- a/src/core/file_sys/archive_systemsavedata.h +++ b/src/core/file_sys/archive_systemsavedata.h @@ -15,8 +15,6 @@ namespace FileSys { /// File system interface to the SystemSaveData archive -/// TODO(Subv): This archive should point to a location in the NAND, -/// specifically nand:/data//sysdata// class Archive_SystemSaveData final : public DiskArchive { public: Archive_SystemSaveData(const std::string& mount_point, u64 save_id); diff --git a/src/core/hle/service/cfg/cfg.cpp b/src/core/hle/service/cfg/cfg.cpp index 161aa8531e..8812c49efb 100644 --- a/src/core/hle/service/cfg/cfg.cpp +++ b/src/core/hle/service/cfg/cfg.cpp @@ -161,9 +161,9 @@ ResultCode FormatConfig() { void CFGInit() { // TODO(Subv): In the future we should use the FS service to query this archive, // currently it is not possible because you can only have one open archive of the same type at any time - std::string syssavedata_directory = FileUtil::GetUserPath(D_SYSSAVEDATA_IDX); + std::string nand_directory = FileUtil::GetUserPath(D_NAND_IDX); cfg_system_save_data = Common::make_unique( - syssavedata_directory, CFG_SAVE_ID); + nand_directory, CFG_SAVE_ID); if (!cfg_system_save_data->Initialize()) { LOG_CRITICAL(Service_CFG, "Could not initialize SystemSaveData archive for the CFG:U service"); return; diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index 56d53402f6..f332d6f1f6 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -36,6 +36,9 @@ namespace std { }; } +const u32 SYSTEM_ID = 0; +const u32 SDCARD_ID = 0; + namespace Service { namespace FS { @@ -437,6 +440,7 @@ void ArchiveInit() { // archive type is SDMC, so it is the only one getting exposed. std::string sdmc_directory = FileUtil::GetUserPath(D_SDMC_IDX); + std::string nand_directory = FileUtil::GetUserPath(D_NAND_IDX); auto sdmc_archive = Common::make_unique(sdmc_directory); if (sdmc_archive->Initialize()) CreateArchive(std::move(sdmc_archive), ArchiveIdCode::SDMC); @@ -444,28 +448,24 @@ void ArchiveInit() { LOG_ERROR(Service_FS, "Can't instantiate SDMC archive with path %s", sdmc_directory.c_str()); // Create the SaveData archive - std::string savedata_directory = FileUtil::GetUserPath(D_SAVEDATA_IDX); - auto savedata_archive = Common::make_unique(savedata_directory); + auto savedata_archive = Common::make_unique(sdmc_directory); CreateArchive(std::move(savedata_archive), ArchiveIdCode::SaveData); - std::string extsavedata_directory = FileUtil::GetUserPath(D_EXTSAVEDATA); - auto extsavedata_archive = Common::make_unique(extsavedata_directory); + auto extsavedata_archive = Common::make_unique(sdmc_directory, false); if (extsavedata_archive->Initialize()) CreateArchive(std::move(extsavedata_archive), ArchiveIdCode::ExtSaveData); else - LOG_ERROR(Service_FS, "Can't instantiate ExtSaveData archive with path %s", extsavedata_directory.c_str()); + LOG_ERROR(Service_FS, "Can't instantiate ExtSaveData archive with path %s", extsavedata_archive->GetMountPoint().c_str()); - std::string sharedextsavedata_directory = FileUtil::GetUserPath(D_SHAREDEXTSAVEDATA); - auto sharedextsavedata_archive = Common::make_unique(sharedextsavedata_directory); + auto sharedextsavedata_archive = Common::make_unique(nand_directory, true); if (sharedextsavedata_archive->Initialize()) CreateArchive(std::move(sharedextsavedata_archive), ArchiveIdCode::SharedExtSaveData); else LOG_ERROR(Service_FS, "Can't instantiate SharedExtSaveData archive with path %s", - sharedextsavedata_directory.c_str()); + sharedextsavedata_archive->GetMountPoint().c_str()); // Create the SaveDataCheck archive, basically a small variation of the RomFS archive - std::string savedatacheck_directory = FileUtil::GetUserPath(D_SAVEDATACHECK_IDX); - auto savedatacheck_archive = Common::make_unique(savedatacheck_directory); + auto savedatacheck_archive = Common::make_unique(nand_directory); CreateArchive(std::move(savedatacheck_archive), ArchiveIdCode::SaveDataCheck); } diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h index 9e9efa019a..f91a3d5f44 100644 --- a/src/core/hle/service/fs/archive.h +++ b/src/core/hle/service/fs/archive.h @@ -10,6 +10,11 @@ #include "core/hle/kernel/kernel.h" #include "core/hle/result.h" +/// The unique system identifier hash, also known as ID0 +extern const u32 SYSTEM_ID; +/// The scrambled SD card CID, also known as ID1 +extern const u32 SDCARD_ID; + namespace Service { namespace FS { diff --git a/src/core/hle/service/ptm_u.cpp b/src/core/hle/service/ptm_u.cpp index c900c90f81..fd79cd8ab3 100644 --- a/src/core/hle/service/ptm_u.cpp +++ b/src/core/hle/service/ptm_u.cpp @@ -142,10 +142,10 @@ Interface::Interface() { Register(FunctionTable, ARRAY_SIZE(FunctionTable)); // Create the SharedExtSaveData archive 0xF000000B and the gamecoin.dat file // TODO(Subv): In the future we should use the FS service to query this archive - std::string extsavedata_directory = FileUtil::GetUserPath(D_SHAREDEXTSAVEDATA); - ptm_shared_extsavedata = Common::make_unique(extsavedata_directory); + std::string nand_directory = FileUtil::GetUserPath(D_NAND_IDX); + ptm_shared_extsavedata = Common::make_unique(nand_directory, true); if (!ptm_shared_extsavedata->Initialize()) { - LOG_CRITICAL(Service_PTM, "Could not initialize ExtSaveData archive for the PTM:U service"); + LOG_CRITICAL(Service_PTM, "Could not initialize SharedExtSaveData archive for the PTM:U service"); return; } FileSys::Path archive_path(ptm_shared_extdata_id); From 90dffe3fc16dd60166c53bafa2b3157737f39225 Mon Sep 17 00:00:00 2001 From: Subv Date: Sun, 4 Jan 2015 09:10:27 -0500 Subject: [PATCH 4/8] Archives: Make SYSTEM_ID and SDCARD_ID strings --- src/core/file_sys/archive_extsavedata.cpp | 5 +++-- src/core/file_sys/archive_savedata.cpp | 3 ++- src/core/file_sys/archive_savedatacheck.cpp | 2 +- src/core/file_sys/archive_systemsavedata.cpp | 2 +- src/core/hle/service/fs/archive.cpp | 4 ++-- src/core/hle/service/fs/archive.h | 4 ++-- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index 5de2aae439..50ca878e29 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -27,9 +27,10 @@ static std::string GetExtSaveDataPath(const std::string& mount_point, const Path static std::string GetExtDataContainerPath(const std::string& mount_point, bool shared) { if (shared) - return Common::StringFromFormat("%sdata/%32x/extdata/", mount_point.c_str(), ID0); + return Common::StringFromFormat("%sdata/%s/extdata/", mount_point.c_str(), SYSTEM_ID.c_str()); - return Common::StringFromFormat("%sNintendo 3DS/%32x/%32x/extdata/", mount_point.c_str(), ID0, ID1); + return Common::StringFromFormat("%sNintendo 3DS/%s/%s/extdata/", mount_point.c_str(), + SYSTEM_ID.c_str(), SDCARD_ID.c_str()); } Archive_ExtSaveData::Archive_ExtSaveData(const std::string& mount_location, bool shared) diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp index f189692fa8..ecce7c1053 100644 --- a/src/core/file_sys/archive_savedata.cpp +++ b/src/core/file_sys/archive_savedata.cpp @@ -18,7 +18,8 @@ namespace FileSys { static std::string GetSaveDataContainerPath(const std::string& mount_point) { - return Common::StringFromFormat("%sNintendo 3DS/%32x/%32x/title/", mount_point.c_str(), ID0, ID1); + return Common::StringFromFormat("%sNintendo 3DS/%s/%s/title/", mount_point.c_str(), + SYSTEM_ID.c_str(), SDCARD_ID.c_str()); } static std::string GetSaveDataPath(const std::string& mount_point, u64 program_id) { diff --git a/src/core/file_sys/archive_savedatacheck.cpp b/src/core/file_sys/archive_savedatacheck.cpp index dcd563773c..6f45d13dd2 100644 --- a/src/core/file_sys/archive_savedatacheck.cpp +++ b/src/core/file_sys/archive_savedatacheck.cpp @@ -13,7 +13,7 @@ namespace FileSys { static std::string GetSaveDataCheckContainerPath(const std::string& mount_point) { - return Common::StringFromFormat("%stitle/", mount_point.c_str(), ID0); + return Common::StringFromFormat("%s%s/title", mount_point.c_str(), SYSTEM_ID.c_str()); } static std::string GetSaveDataCheckPath(const std::string& mount_point, u32 high, u32 low) { diff --git a/src/core/file_sys/archive_systemsavedata.cpp b/src/core/file_sys/archive_systemsavedata.cpp index 615f50e20d..c2a5d641a8 100644 --- a/src/core/file_sys/archive_systemsavedata.cpp +++ b/src/core/file_sys/archive_systemsavedata.cpp @@ -24,7 +24,7 @@ static std::string GetSystemSaveDataPath(const std::string& mount_point, u64 sav } static std::string GetSystemSaveDataContainerPath(const std::string& mount_point) { - return Common::StringFromFormat("%sdata/%32x/sysdata/", mount_point.c_str(), ID0); + return Common::StringFromFormat("%sdata/%s/sysdata/", mount_point.c_str(), SYSTEM_ID.c_str()); } Archive_SystemSaveData::Archive_SystemSaveData(const std::string& mount_point, u64 save_id) diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index f332d6f1f6..e627f1d64e 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -36,8 +36,8 @@ namespace std { }; } -const u32 SYSTEM_ID = 0; -const u32 SDCARD_ID = 0; +const std::string SYSTEM_ID = "00000000000000000000000000000000"; +const std::string SDCARD_ID = "00000000000000000000000000000000"; namespace Service { namespace FS { diff --git a/src/core/hle/service/fs/archive.h b/src/core/hle/service/fs/archive.h index f91a3d5f44..b3f2134f2d 100644 --- a/src/core/hle/service/fs/archive.h +++ b/src/core/hle/service/fs/archive.h @@ -11,9 +11,9 @@ #include "core/hle/result.h" /// The unique system identifier hash, also known as ID0 -extern const u32 SYSTEM_ID; +extern const std::string SYSTEM_ID; /// The scrambled SD card CID, also known as ID1 -extern const u32 SDCARD_ID; +extern const std::string SDCARD_ID; namespace Service { namespace FS { From 123a76c9c8ba56f7f7ce28fed4e8a3302471b215 Mon Sep 17 00:00:00 2001 From: Subv Date: Mon, 5 Jan 2015 16:40:36 -0500 Subject: [PATCH 5/8] SaveDataCheck: Fixed a typo --- src/core/file_sys/archive_savedatacheck.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/file_sys/archive_savedatacheck.cpp b/src/core/file_sys/archive_savedatacheck.cpp index 6f45d13dd2..82449d1b7d 100644 --- a/src/core/file_sys/archive_savedatacheck.cpp +++ b/src/core/file_sys/archive_savedatacheck.cpp @@ -13,7 +13,7 @@ namespace FileSys { static std::string GetSaveDataCheckContainerPath(const std::string& mount_point) { - return Common::StringFromFormat("%s%s/title", mount_point.c_str(), SYSTEM_ID.c_str()); + return Common::StringFromFormat("%s%s/title/", mount_point.c_str(), SYSTEM_ID.c_str()); } static std::string GetSaveDataCheckPath(const std::string& mount_point, u32 high, u32 low) { From 5244ac0e9c784c402946616f913a8b4fe63af88c Mon Sep 17 00:00:00 2001 From: Subv Date: Tue, 6 Jan 2015 15:02:30 -0500 Subject: [PATCH 6/8] Archives: Addressed some comments --- src/core/file_sys/archive_extsavedata.cpp | 2 +- src/core/file_sys/archive_savedata.cpp | 12 ++++++------ src/core/file_sys/archive_savedatacheck.cpp | 8 ++++---- src/core/file_sys/archive_sdmc.cpp | 4 ++-- src/core/hle/service/fs/archive.cpp | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index 50ca878e29..b8f8b2ed24 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -34,7 +34,7 @@ static std::string GetExtDataContainerPath(const std::string& mount_point, bool } Archive_ExtSaveData::Archive_ExtSaveData(const std::string& mount_location, bool shared) - : DiskArchive(GetExtDataContainerPath(mount_location, shared)), concrete_mount_point(mount_point) { + : DiskArchive(GetExtDataContainerPath(mount_location, shared)), concrete_mount_point(mount_point) { LOG_INFO(Service_FS, "Directory %s set as base for ExtSaveData.", mount_point.c_str()); } diff --git a/src/core/file_sys/archive_savedata.cpp b/src/core/file_sys/archive_savedata.cpp index ecce7c1053..3baee52948 100644 --- a/src/core/file_sys/archive_savedata.cpp +++ b/src/core/file_sys/archive_savedata.cpp @@ -17,19 +17,19 @@ namespace FileSys { -static std::string GetSaveDataContainerPath(const std::string& mount_point) { - return Common::StringFromFormat("%sNintendo 3DS/%s/%s/title/", mount_point.c_str(), +static std::string GetSaveDataContainerPath(const std::string& sdmc_directory) { + return Common::StringFromFormat("%sNintendo 3DS/%s/%s/title/", sdmc_directory.c_str(), SYSTEM_ID.c_str(), SDCARD_ID.c_str()); } -static std::string GetSaveDataPath(const std::string& mount_point, u64 program_id) { +static std::string GetSaveDataPath(const std::string& mount_location, u64 program_id) { u32 high = program_id >> 32; u32 low = program_id & 0xFFFFFFFF; - return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_point.c_str(), high, low); + return Common::StringFromFormat("%s%08x/%08x/data/00000001/", mount_location.c_str(), high, low); } -Archive_SaveData::Archive_SaveData(const std::string& mount_point) - : DiskArchive(GetSaveDataContainerPath(mount_point)) { +Archive_SaveData::Archive_SaveData(const std::string& sdmc_directory) + : DiskArchive(GetSaveDataContainerPath(sdmc_directory)) { LOG_INFO(Service_FS, "Directory %s set as SaveData.", this->mount_point.c_str()); } diff --git a/src/core/file_sys/archive_savedatacheck.cpp b/src/core/file_sys/archive_savedatacheck.cpp index 82449d1b7d..a7a507536c 100644 --- a/src/core/file_sys/archive_savedatacheck.cpp +++ b/src/core/file_sys/archive_savedatacheck.cpp @@ -12,8 +12,8 @@ namespace FileSys { -static std::string GetSaveDataCheckContainerPath(const std::string& mount_point) { - return Common::StringFromFormat("%s%s/title/", mount_point.c_str(), SYSTEM_ID.c_str()); +static std::string GetSaveDataCheckContainerPath(const std::string& nand_directory) { + return Common::StringFromFormat("%s%s/title/", nand_directory.c_str(), SYSTEM_ID.c_str()); } static std::string GetSaveDataCheckPath(const std::string& mount_point, u32 high, u32 low) { @@ -21,8 +21,8 @@ static std::string GetSaveDataCheckPath(const std::string& mount_point, u32 high mount_point.c_str(), high, low); } -Archive_SaveDataCheck::Archive_SaveDataCheck(const std::string& mount_loc) : -mount_point(GetSaveDataCheckContainerPath(mount_loc)) { +Archive_SaveDataCheck::Archive_SaveDataCheck(const std::string& nand_directory) : + mount_point(GetSaveDataCheckContainerPath(nand_directory)) { } ResultCode Archive_SaveDataCheck::Open(const Path& path) { diff --git a/src/core/file_sys/archive_sdmc.cpp b/src/core/file_sys/archive_sdmc.cpp index 1c1c170b68..26b03e82fa 100644 --- a/src/core/file_sys/archive_sdmc.cpp +++ b/src/core/file_sys/archive_sdmc.cpp @@ -16,8 +16,8 @@ namespace FileSys { -Archive_SDMC::Archive_SDMC(const std::string& mount_point) : DiskArchive(mount_point) { - LOG_INFO(Service_FS, "Directory %s set as SDMC.", mount_point.c_str()); +Archive_SDMC::Archive_SDMC(const std::string& sdmc_directory) : DiskArchive(sdmc_directory) { + LOG_INFO(Service_FS, "Directory %s set as SDMC.", sdmc_directory.c_str()); } bool Archive_SDMC::Initialize() { diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index e627f1d64e..0834b342a2 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -36,6 +36,7 @@ namespace std { }; } +/// TODO(Subv): Confirm length of these strings const std::string SYSTEM_ID = "00000000000000000000000000000000"; const std::string SDCARD_ID = "00000000000000000000000000000000"; @@ -436,8 +437,7 @@ void ArchiveInit() { next_handle = 1; // TODO(Link Mauve): Add the other archive types (see here for the known types: - // http://3dbrew.org/wiki/FS:OpenArchive#Archive_idcodes). Currently the only half-finished - // archive type is SDMC, so it is the only one getting exposed. + // http://3dbrew.org/wiki/FS:OpenArchive#Archive_idcodes). std::string sdmc_directory = FileUtil::GetUserPath(D_SDMC_IDX); std::string nand_directory = FileUtil::GetUserPath(D_NAND_IDX); From 32dbb76e00684d1d9e6550ede6fd811943cd7610 Mon Sep 17 00:00:00 2001 From: Subv Date: Tue, 6 Jan 2015 15:34:37 -0500 Subject: [PATCH 7/8] Archives: Changed the unimplemented archives comment. It now refers to me as the PoC --- src/core/hle/service/fs/archive.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/hle/service/fs/archive.cpp b/src/core/hle/service/fs/archive.cpp index 0834b342a2..958dd9344f 100644 --- a/src/core/hle/service/fs/archive.cpp +++ b/src/core/hle/service/fs/archive.cpp @@ -436,7 +436,7 @@ ResultCode FormatSaveData() { void ArchiveInit() { next_handle = 1; - // TODO(Link Mauve): Add the other archive types (see here for the known types: + // TODO(Subv): Add the other archive types (see here for the known types: // http://3dbrew.org/wiki/FS:OpenArchive#Archive_idcodes). std::string sdmc_directory = FileUtil::GetUserPath(D_SDMC_IDX); From 8fbe5d2dcaa0f9330120210f5e009cb387cb4a0f Mon Sep 17 00:00:00 2001 From: Subv Date: Tue, 6 Jan 2015 16:12:25 -0500 Subject: [PATCH 8/8] Archives/Exdata: Don't set concrete_mount_point in the ctor --- src/core/file_sys/archive_extsavedata.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/file_sys/archive_extsavedata.cpp b/src/core/file_sys/archive_extsavedata.cpp index b8f8b2ed24..0805f42ae9 100644 --- a/src/core/file_sys/archive_extsavedata.cpp +++ b/src/core/file_sys/archive_extsavedata.cpp @@ -34,7 +34,7 @@ static std::string GetExtDataContainerPath(const std::string& mount_point, bool } Archive_ExtSaveData::Archive_ExtSaveData(const std::string& mount_location, bool shared) - : DiskArchive(GetExtDataContainerPath(mount_location, shared)), concrete_mount_point(mount_point) { + : DiskArchive(GetExtDataContainerPath(mount_location, shared)) { LOG_INFO(Service_FS, "Directory %s set as base for ExtSaveData.", mount_point.c_str()); }