mika/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-07-14 13:12:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

ncm: Cleanup InitializeContentManager

Browse Source
This commit is contained in:
Adubbz 2020-02-28 22:05:48 +11:00
parent 64109b49f8
commit 45e51da0b2
1 changed files with 61 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

124
stratosphere/ncm/source/impl/ncm_content_manager.cpp
View File

@ -67,6 +67,45 @@ namespace ams::ncm::impl {
static_assert(sizeof(SaveDataMeta) == 0x20, "SaveDataMeta definition!"); static_assert(sizeof(SaveDataMeta) == 0x20, "SaveDataMeta definition!");
constexpr u64 BuiltInSystemSaveDataId = 0x8000000000000120;
constexpr u64 BuiltInSystemSaveDataSize = 0x6c000;
constexpr u64 BuiltInSystemSaveDataJournalSize = 0x6c000;
constexpr u32 BuiltInSystemSaveDataFlags = FsSaveDataFlags_KeepAfterResettingSystemSaveData | FsSaveDataFlags_KeepAfterRefurbishment;
constexpr SaveDataMeta BuiltInSystemSaveDataMeta = {
.id = BuiltInSystemSaveDataId,
.size = BuiltInSystemSaveDataSize,
.journal_size = BuiltInSystemSaveDataJournalSize,
.flags = BuiltInSystemSaveDataFlags,
.space_id = FsSaveDataSpaceId_System
};
constexpr u64 BuiltInUserSaveDataId = 0x8000000000000121;
constexpr u64 BuiltInUserSaveDataSize = 0x29e000;
constexpr u64 BuiltInUserSaveDataJournalSize = 0x29e000;
constexpr u32 BuiltInUserSaveDataFlags = 0;
constexpr SaveDataMeta BuiltInUserSaveDataMeta = {
.id = BuiltInUserSaveDataId,
.size = BuiltInUserSaveDataSize,
.journal_size = BuiltInUserSaveDataJournalSize,
.flags = BuiltInUserSaveDataFlags,
.space_id = FsSaveDataSpaceId_System
};
constexpr u64 SdCardSaveDataId = 0x8000000000000124;
constexpr u64 SdCardSaveDataSize = 0xa08000;
constexpr u64 SdCardSaveDataJournalSize = 0xa08000;
constexpr u32 SdCardSaveDataFlags = 0;
constexpr SaveDataMeta SdCardSaveDataMeta = {
.id = SdCardSaveDataId,
.size = SdCardSaveDataSize,
.journal_size = SdCardSaveDataJournalSize,
.flags = SdCardSaveDataFlags,
.space_id = FsSaveDataSpaceId_SdSystem,
};
struct ContentMetaDatabaseEntry { struct ContentMetaDatabaseEntry {
NON_COPYABLE(ContentMetaDatabaseEntry); NON_COPYABLE(ContentMetaDatabaseEntry);
NON_MOVEABLE(ContentMetaDatabaseEntry); NON_MOVEABLE(ContentMetaDatabaseEntry);
@ -85,7 +124,7 @@ namespace ams::ncm::impl {
meta_path[0] = '\0'; meta_path[0] = '\0';
} }
Result Initialize(StorageId storage_id, SaveDataMeta& save_meta, size_t max_content_metas) { Result Initialize(StorageId storage_id, const SaveDataMeta& save_meta, size_t max_content_metas) {
this->storage_id = storage_id; this->storage_id = storage_id;
this->max_content_metas = max_content_metas; this->max_content_metas = max_content_metas;
this->save_meta = save_meta; this->save_meta = save_meta;
@ -107,6 +146,10 @@ namespace ams::ncm::impl {
} }
}; };
constexpr size_t MaxBuiltInSystemContentMetaCount = 0x800;
constexpr size_t MaxBuiltInUserContentMetaCount = 0x2000;
constexpr size_t MaxSdCardContentMetaCount = 0x2000;
constexpr size_t MaxContentStorageEntries = 8; constexpr size_t MaxContentStorageEntries = 8;
constexpr size_t MaxContentMetaDatabaseEntries = 8; constexpr size_t MaxContentMetaDatabaseEntries = 8;
@ -150,8 +193,6 @@ namespace ams::ncm::impl {
/* Already initialized. */ /* Already initialized. */
R_UNLESS(!g_initialized, ResultSuccess()); R_UNLESS(!g_initialized, ResultSuccess());
size_t cur_storage_index = g_num_content_storage_entries;
for (size_t i = 0; i < MaxContentStorageEntries; i++) { for (size_t i = 0; i < MaxContentStorageEntries; i++) {
ContentStorageEntry* entry = &g_content_storage_entries[i]; ContentStorageEntry* entry = &g_content_storage_entries[i];
entry->storage_id = StorageId::None; entry->storage_id = StorageId::None;
@ -162,11 +203,8 @@ namespace ams::ncm::impl {
entry->storage_id = StorageId::None; entry->storage_id = StorageId::None;
} }
g_num_content_storage_entries++; /* First, setup the BuiltInSystem storage entry. */
auto storage_entry = &g_content_storage_entries[cur_storage_index]; g_content_storage_entries[g_num_content_storage_entries++].Initialize(StorageId::BuiltInSystem, FsContentStorageId_System);
/* First, setup the NandSystem storage entry. */
storage_entry->Initialize(StorageId::BuiltInSystem, FsContentStorageId_System);
if (R_FAILED(VerifyContentStorage(StorageId::BuiltInSystem))) { if (R_FAILED(VerifyContentStorage(StorageId::BuiltInSystem))) {
R_TRY(CreateContentStorage(StorageId::BuiltInSystem)); R_TRY(CreateContentStorage(StorageId::BuiltInSystem));
@ -174,19 +212,8 @@ namespace ams::ncm::impl {
R_TRY(ActivateContentStorage(StorageId::BuiltInSystem)); R_TRY(ActivateContentStorage(StorageId::BuiltInSystem));
/* Next, the NandSystem content meta entry. */ /* Next, the BuiltInSystem content meta entry. */
SaveDataMeta nand_system_save_meta; R_TRY(g_content_meta_entries[g_num_content_meta_entries++].Initialize(StorageId::BuiltInSystem, BuiltInSystemSaveDataMeta, MaxBuiltInSystemContentMetaCount));
nand_system_save_meta.id = 0x8000000000000120;
nand_system_save_meta.size = 0x6c000;
nand_system_save_meta.journal_size = 0x6c000;
nand_system_save_meta.flags = FsSaveDataFlags_KeepAfterResettingSystemSaveData | FsSaveDataFlags_KeepAfterRefurbishment;
nand_system_save_meta.space_id = FsSaveDataSpaceId_System;
size_t cur_meta_index = g_num_content_meta_entries;
g_num_content_meta_entries++;
auto content_meta_entry = &g_content_meta_entries[cur_meta_index];
R_TRY(content_meta_entry->Initialize(StorageId::BuiltInSystem, nand_system_save_meta, 0x800));
if (R_FAILED(VerifyContentMetaDatabase(StorageId::BuiltInSystem))) { if (R_FAILED(VerifyContentMetaDatabase(StorageId::BuiltInSystem))) {
R_TRY(CreateContentMetaDatabase(StorageId::BuiltInSystem)); R_TRY(CreateContentMetaDatabase(StorageId::BuiltInSystem));
@ -195,58 +222,27 @@ namespace ams::ncm::impl {
} }
u32 current_flags = 0; u32 current_flags = 0;
if (hos::GetVersion() >= hos::Version_200 && R_SUCCEEDED(fs::GetSaveDataFlags(&current_flags, 0x8000000000000120)) && current_flags != (FsSaveDataFlags_KeepAfterResettingSystemSaveData | FsSaveDataFlags_KeepAfterRefurbishment)) { if (hos::GetVersion() >= hos::Version_200 && R_SUCCEEDED(fs::GetSaveDataFlags(&current_flags, BuiltInSystemSaveDataId)) && current_flags != (FsSaveDataFlags_KeepAfterResettingSystemSaveData | FsSaveDataFlags_KeepAfterRefurbishment)) {
fs::SetSaveDataFlags(0x8000000000000120, FsSaveDataSpaceId_System, FsSaveDataFlags_KeepAfterResettingSystemSaveData | FsSaveDataFlags_KeepAfterRefurbishment); fs::SetSaveDataFlags(BuiltInSystemSaveDataId, FsSaveDataSpaceId_System, FsSaveDataFlags_KeepAfterResettingSystemSaveData | FsSaveDataFlags_KeepAfterRefurbishment);
} }
R_TRY(ActivateContentMetaDatabase(StorageId::BuiltInSystem)); R_TRY(ActivateContentMetaDatabase(StorageId::BuiltInSystem));
/* Now for NandUser's content storage entry. */ /* Now for BuiltInUser's content storage and content meta entries. */
cur_storage_index = g_num_content_storage_entries; g_content_storage_entries[g_num_content_storage_entries++].Initialize(StorageId::BuiltInUser, FsContentStorageId_User);
g_num_content_storage_entries++; R_TRY(g_content_meta_entries[g_num_content_meta_entries++].Initialize(StorageId::BuiltInUser, BuiltInUserSaveDataMeta, MaxBuiltInUserContentMetaCount));
storage_entry = &g_content_storage_entries[cur_storage_index];
storage_entry->Initialize(StorageId::BuiltInUser, FsContentStorageId_User);
/* And NandUser's content meta entry. */ /* Beyond this point N no longer appears to bother */
SaveDataMeta nand_user_save_meta; /* incrementing the count for content storage entries or content meta entries. */
nand_user_save_meta.id = 0x8000000000000121;
nand_user_save_meta.size = 0x29e000;
nand_user_save_meta.journal_size = 0x29e000;
nand_user_save_meta.flags = 0;
nand_user_save_meta.space_id = FsSaveDataSpaceId_System;
cur_meta_index = g_num_content_meta_entries; /* Next SdCard's content storage and content meta entries. */
g_num_content_meta_entries++;
content_meta_entry = &g_content_meta_entries[cur_meta_index];
R_TRY(content_meta_entry->Initialize(StorageId::BuiltInUser, nand_user_save_meta, 0x2000));
/*
Beyond this point N no longer appears to bother
incrementing the count for content storage entries or content meta entries.
*/
/* Next SdCard's content storage entry. */
g_content_storage_entries[2].Initialize(StorageId::SdCard, FsContentStorageId_SdCard); g_content_storage_entries[2].Initialize(StorageId::SdCard, FsContentStorageId_SdCard);
R_TRY(g_content_meta_entries[2].Initialize(StorageId::SdCard, SdCardSaveDataMeta, MaxSdCardContentMetaCount));
/* And SdCard's content meta entry. */ /* GameCard's content storage and content meta entries. */
SaveDataMeta sd_card_save_meta; /* N doesn't set a content storage id for game cards, so we'll just use 0 (System). */
sd_card_save_meta.id = 0x8000000000000124;
sd_card_save_meta.size = 0xa08000;
sd_card_save_meta.journal_size = 0xa08000;
sd_card_save_meta.flags = 0;
sd_card_save_meta.space_id = FsSaveDataSpaceId_SdSystem;
content_meta_entry = &g_content_meta_entries[2];
R_TRY(content_meta_entry->Initialize(StorageId::SdCard, sd_card_save_meta, 0x2000));
/* GameCard's content storage entry. */
/* N doesn't set a content storage id for game cards, so we'll just use 0 (NandSystem). */
g_content_storage_entries[3].Initialize(StorageId::GameCard, FsContentStorageId_System); g_content_storage_entries[3].Initialize(StorageId::GameCard, FsContentStorageId_System);
R_TRY(g_content_meta_entries[3].InitializeGameCard(0x800));
/* Lasty, GameCard's content meta entry. */
content_meta_entry = &g_content_meta_entries[3];
R_TRY(content_meta_entry->InitializeGameCard(0x800));
g_initialized = true; g_initialized = true;
return ResultSuccess(); return ResultSuccess();