diff options
author | Zach Hilman <zachhilman@gmail.com> | 2018-09-25 15:17:14 +0200 |
---|---|---|
committer | Zach Hilman <zachhilman@gmail.com> | 2018-10-05 14:46:31 +0200 |
commit | e948fbf5d0211d9aed3d4cd9009e5f0224b75021 (patch) | |
tree | ccf549021bd7eaeafa5f6e3a24c7a3f72122679f /src | |
parent | Merge pull request #1415 from DarkLordZach/ips (diff) | |
download | yuzu-e948fbf5d0211d9aed3d4cd9009e5f0224b75021.tar yuzu-e948fbf5d0211d9aed3d4cd9009e5f0224b75021.tar.gz yuzu-e948fbf5d0211d9aed3d4cd9009e5f0224b75021.tar.bz2 yuzu-e948fbf5d0211d9aed3d4cd9009e5f0224b75021.tar.lz yuzu-e948fbf5d0211d9aed3d4cd9009e5f0224b75021.tar.xz yuzu-e948fbf5d0211d9aed3d4cd9009e5f0224b75021.tar.zst yuzu-e948fbf5d0211d9aed3d4cd9009e5f0224b75021.zip |
Diffstat (limited to 'src')
-rw-r--r-- | src/core/loader/nax.cpp | 4 | ||||
-rw-r--r-- | src/core/loader/nax.h | 1 | ||||
-rw-r--r-- | src/core/loader/nsp.cpp | 8 | ||||
-rw-r--r-- | src/core/loader/nsp.h | 3 | ||||
-rw-r--r-- | src/core/loader/xci.cpp | 7 | ||||
-rw-r--r-- | src/core/loader/xci.h | 3 |
6 files changed, 20 insertions, 6 deletions
diff --git a/src/core/loader/nax.cpp b/src/core/loader/nax.cpp index 073fb9d2f..42f4a777b 100644 --- a/src/core/loader/nax.cpp +++ b/src/core/loader/nax.cpp @@ -72,6 +72,10 @@ ResultStatus AppLoader_NAX::ReadRomFS(FileSys::VirtualFile& dir) { return nca_loader->ReadRomFS(dir); } +u64 AppLoader_NAX::ReadRomFSIVFCOffset() const { + return nca_loader->ReadRomFSIVFCOffset(); +} + ResultStatus AppLoader_NAX::ReadProgramId(u64& out_program_id) { return nca_loader->ReadProgramId(out_program_id); } diff --git a/src/core/loader/nax.h b/src/core/loader/nax.h index fc3c01876..b4d93bd01 100644 --- a/src/core/loader/nax.h +++ b/src/core/loader/nax.h @@ -36,6 +36,7 @@ public: ResultStatus Load(Kernel::Process& process) override; ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; + u64 ReadRomFSIVFCOffset() const override; ResultStatus ReadProgramId(u64& out_program_id) override; private: diff --git a/src/core/loader/nsp.cpp b/src/core/loader/nsp.cpp index b7ba77ef4..ae1edf9ca 100644 --- a/src/core/loader/nsp.cpp +++ b/src/core/loader/nsp.cpp @@ -96,8 +96,12 @@ ResultStatus AppLoader_NSP::Load(Kernel::Process& process) { return ResultStatus::Success; } -ResultStatus AppLoader_NSP::ReadRomFS(FileSys::VirtualFile& dir) { - return secondary_loader->ReadRomFS(dir); +ResultStatus AppLoader_NSP::ReadRomFS(FileSys::VirtualFile& file) { + return secondary_loader->ReadRomFS(file); +} + +u64 AppLoader_NSP::ReadRomFSIVFCOffset() const { + return secondary_loader->ReadRomFSIVFCOffset(); } ResultStatus AppLoader_NSP::ReadProgramId(u64& out_program_id) { diff --git a/src/core/loader/nsp.h b/src/core/loader/nsp.h index eac9b819a..351bbf128 100644 --- a/src/core/loader/nsp.h +++ b/src/core/loader/nsp.h @@ -37,7 +37,8 @@ public: ResultStatus Load(Kernel::Process& process) override; - ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; + ResultStatus ReadRomFS(FileSys::VirtualFile& file) override; + u64 ReadRomFSIVFCOffset() const override; ResultStatus ReadProgramId(u64& out_program_id) override; ResultStatus ReadIcon(std::vector<u8>& buffer) override; ResultStatus ReadTitle(std::string& title) override; diff --git a/src/core/loader/xci.cpp b/src/core/loader/xci.cpp index eda67a8c8..12d589fab 100644 --- a/src/core/loader/xci.cpp +++ b/src/core/loader/xci.cpp @@ -68,10 +68,13 @@ ResultStatus AppLoader_XCI::Load(Kernel::Process& process) { return ResultStatus::Success; } -ResultStatus AppLoader_XCI::ReadRomFS(FileSys::VirtualFile& dir) { - return nca_loader->ReadRomFS(dir); +ResultStatus AppLoader_XCI::ReadRomFS(FileSys::VirtualFile& file) { + return nca_loader->ReadRomFS(file); } +u64 AppLoader_XCI::ReadRomFSIVFCOffset() const { + return nca_loader->ReadRomFSIVFCOffset(); +} ResultStatus AppLoader_XCI::ReadProgramId(u64& out_program_id) { return nca_loader->ReadProgramId(out_program_id); } diff --git a/src/core/loader/xci.h b/src/core/loader/xci.h index 17e47b658..4f9a9da48 100644 --- a/src/core/loader/xci.h +++ b/src/core/loader/xci.h @@ -37,7 +37,8 @@ public: ResultStatus Load(Kernel::Process& process) override; - ResultStatus ReadRomFS(FileSys::VirtualFile& dir) override; + ResultStatus ReadRomFS(FileSys::VirtualFile& file) override; + u64 ReadRomFSIVFCOffset() const override; ResultStatus ReadProgramId(u64& out_program_id) override; ResultStatus ReadIcon(std::vector<u8>& buffer) override; ResultStatus ReadTitle(std::string& title) override; |