Browse Source

Adjust some things

pull/395/head
MaranBr 6 months ago
parent
commit
0522fe79ff
  1. 7
      src/core/file_sys/content_archive.cpp
  2. 2
      src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp

7
src/core/file_sys/content_archive.cpp

@ -84,14 +84,13 @@ NCA::NCA(VirtualFile file_, const NCA* base_nca)
std::vector<VirtualFile> filesystems(fs_count); std::vector<VirtualFile> filesystems(fs_count);
for (s32 i = 0; i < fs_count; i++) { for (s32 i = 0; i < fs_count; i++) {
NcaFsHeaderReader header_reader; NcaFsHeaderReader header_reader;
fs.OpenStorage(&filesystems[i], &header_reader, i);
/*const Result rc = fs.OpenStorage(&filesystems[i], &header_reader, i);
const Result rc = fs.OpenStorage(&filesystems[i], &header_reader, i);
if (R_FAILED(rc)) { if (R_FAILED(rc)) {
LOG_ERROR(Loader, "File reader errored out during read of section {}: {:#x}", i,
LOG_DEBUG(Loader, "File reader errored out during read of section {}: {:#x}", i,
rc.GetInnerValue()); rc.GetInnerValue());
status = Loader::ResultStatus::ErrorBadNCAHeader; status = Loader::ResultStatus::ErrorBadNCAHeader;
return; return;
}*/
}
if (header_reader.GetFsType() == NcaFsHeader::FsType::RomFs) { if (header_reader.GetFsType() == NcaFsHeader::FsType::RomFs) {
files.push_back(filesystems[i]); files.push_back(filesystems[i]);

2
src/core/file_sys/fssystem/fssystem_nca_file_system_driver.cpp

@ -1052,7 +1052,7 @@ Result NcaFileSystemDriver::CreatePatchMetaStorage(
ASSERT(out_indirect_meta != nullptr); ASSERT(out_indirect_meta != nullptr);
ASSERT(base_storage != nullptr); ASSERT(base_storage != nullptr);
//ASSERT(patch_info.HasAesCtrExTable()); //ASSERT(patch_info.HasAesCtrExTable());
ASSERT(patch_info.HasIndirectTable());
//ASSERT(patch_info.HasIndirectTable());
ASSERT(Common::IsAligned<s64>(patch_info.aes_ctr_ex_size, NcaHeader::XtsBlockSize)); ASSERT(Common::IsAligned<s64>(patch_info.aes_ctr_ex_size, NcaHeader::XtsBlockSize));
// Validate patch info extents. // Validate patch info extents.

Loading…
Cancel
Save