mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-08-24 05:07:29 +02:00
file_sys, loader: add support for reading TMDs to determine app paths
This commit is contained in:
parent
8e10c9bb2e
commit
4887d18591
@ -14,6 +14,7 @@
|
|||||||
#include "core/file_sys/errors.h"
|
#include "core/file_sys/errors.h"
|
||||||
#include "core/file_sys/ivfc_archive.h"
|
#include "core/file_sys/ivfc_archive.h"
|
||||||
#include "core/file_sys/ncch_container.h"
|
#include "core/file_sys/ncch_container.h"
|
||||||
|
#include "core/file_sys/title_metadata.h"
|
||||||
#include "core/hle/service/fs/archive.h"
|
#include "core/hle/service/fs/archive.h"
|
||||||
#include "core/loader/loader.h"
|
#include "core/loader/loader.h"
|
||||||
|
|
||||||
@ -27,8 +28,18 @@ static std::string GetNCCHContainerPath(const std::string& nand_directory) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static std::string GetNCCHPath(const std::string& mount_point, u32 high, u32 low) {
|
static std::string GetNCCHPath(const std::string& mount_point, u32 high, u32 low) {
|
||||||
return Common::StringFromFormat("%s%08x/%08x/content/00000000.app", mount_point.c_str(), high,
|
u32 content_id = 0;
|
||||||
low);
|
|
||||||
|
// TODO(shinyquagsire23): Title database should be doing this path lookup
|
||||||
|
std::string content_path =
|
||||||
|
Common::StringFromFormat("%s%08x/%08x/content/", mount_point.c_str(), high, low);
|
||||||
|
std::string tmd_path = content_path + "00000000.tmd";
|
||||||
|
TitleMetadata tmd(tmd_path);
|
||||||
|
if (tmd.Load() == Loader::ResultStatus::Success) {
|
||||||
|
content_id = tmd.GetBootContentID();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Common::StringFromFormat("%s%08x.app", content_path.c_str(), content_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
ArchiveFactory_NCCH::ArchiveFactory_NCCH(const std::string& nand_directory)
|
ArchiveFactory_NCCH::ArchiveFactory_NCCH(const std::string& nand_directory)
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
#include "core/core.h"
|
#include "core/core.h"
|
||||||
#include "core/file_sys/archive_selfncch.h"
|
#include "core/file_sys/archive_selfncch.h"
|
||||||
#include "core/file_sys/ncch_container.h"
|
#include "core/file_sys/ncch_container.h"
|
||||||
|
#include "core/file_sys/title_metadata.h"
|
||||||
#include "core/hle/kernel/process.h"
|
#include "core/hle/kernel/process.h"
|
||||||
#include "core/hle/kernel/resource_limit.h"
|
#include "core/hle/kernel/resource_limit.h"
|
||||||
#include "core/hle/service/cfg/cfg.h"
|
#include "core/hle/service/cfg/cfg.h"
|
||||||
@ -49,9 +50,19 @@ static std::string GetUpdateNCCHPath(u64_le program_id) {
|
|||||||
u32 high = static_cast<u32>((program_id | UPDATE_MASK) >> 32);
|
u32 high = static_cast<u32>((program_id | UPDATE_MASK) >> 32);
|
||||||
u32 low = static_cast<u32>((program_id | UPDATE_MASK) & 0xFFFFFFFF);
|
u32 low = static_cast<u32>((program_id | UPDATE_MASK) & 0xFFFFFFFF);
|
||||||
|
|
||||||
return Common::StringFromFormat("%sNintendo 3DS/%s/%s/title/%08x/%08x/content/00000000.app",
|
// TODO(shinyquagsire23): Title database should be doing this path lookup
|
||||||
FileUtil::GetUserPath(D_SDMC_IDX).c_str(), SYSTEM_ID, SDCARD_ID,
|
std::string content_path = Common::StringFromFormat(
|
||||||
high, low);
|
"%sNintendo 3DS/%s/%s/title/%08x/%08x/content/", FileUtil::GetUserPath(D_SDMC_IDX).c_str(),
|
||||||
|
SYSTEM_ID, SDCARD_ID, high, low);
|
||||||
|
std::string tmd_path = content_path + "00000000.tmd";
|
||||||
|
|
||||||
|
u32 content_id = 0;
|
||||||
|
FileSys::TitleMetadata tmd(tmd_path);
|
||||||
|
if (tmd.Load() == ResultStatus::Success) {
|
||||||
|
content_id = tmd.GetBootContentID();
|
||||||
|
}
|
||||||
|
|
||||||
|
return Common::StringFromFormat("%s%08x.app", content_path.c_str(), content_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::pair<boost::optional<u32>, ResultStatus> AppLoader_NCCH::LoadKernelSystemMode() {
|
std::pair<boost::optional<u32>, ResultStatus> AppLoader_NCCH::LoadKernelSystemMode() {
|
||||||
|
Loading…
Reference in New Issue
Block a user