diff options
| author | bunnei <bunneidev@gmail.com> | 2020-11-24 15:27:22 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-24 15:27:22 -0800 |
| commit | 0832da3e4054d0b47c39e95553b5f3be5848eae9 (patch) | |
| tree | 1e7688670225c60bbcbc2827cf427a67e1686404 /src/core/file_sys/card_image.cpp | |
| parent | 7791cc8c2e585dcc377e22a26f548db914250a5d (diff) | |
| parent | 4fbe4da911d534e1b4204036de75c320750d84c9 (diff) | |
Merge pull request #4799 from bunnei/execute-program
core: Refactor loader and implement ExecuteProgram
Diffstat (limited to 'src/core/file_sys/card_image.cpp')
| -rw-r--r-- | src/core/file_sys/card_image.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/file_sys/card_image.cpp b/src/core/file_sys/card_image.cpp index 956da68f7..8dee5590b 100644 --- a/src/core/file_sys/card_image.cpp +++ b/src/core/file_sys/card_image.cpp @@ -29,7 +29,7 @@ constexpr std::array partition_names{ "logo", }; -XCI::XCI(VirtualFile file_) +XCI::XCI(VirtualFile file_, std::size_t program_index) : file(std::move(file_)), program_nca_status{Loader::ResultStatus::ErrorXCIMissingProgramNCA}, partitions(partition_names.size()), partitions_raw(partition_names.size()), keys{Core::Crypto::KeyManager::Instance()} { @@ -62,7 +62,8 @@ XCI::XCI(VirtualFile file_) } secure_partition = std::make_shared<NSP>( - main_hfs.GetFile(partition_names[static_cast<std::size_t>(XCIPartition::Secure)])); + main_hfs.GetFile(partition_names[static_cast<std::size_t>(XCIPartition::Secure)]), + program_index); ncas = secure_partition->GetNCAsCollapsed(); program = |