diff options
| author | 2017-02-10 17:15:26 +0200 | |
|---|---|---|
| committer | 2017-02-13 13:57:38 +0200 | |
| commit | 20544977dab5b00a86c73572b94e7e75a7499f7a (patch) | |
| tree | 1c5f2e443a8c73d70cfbf52b0e5783f99d831802 /src/core/loader | |
| parent | file_sys: add Self NCCH archive (diff) | |
| download | yuzu-20544977dab5b00a86c73572b94e7e75a7499f7a.tar.gz yuzu-20544977dab5b00a86c73572b94e7e75a7499f7a.tar.xz yuzu-20544977dab5b00a86c73572b94e7e75a7499f7a.zip | |
loader: use self NCCH archive
Diffstat (limited to 'src/core/loader')
| -rw-r--r-- | src/core/loader/3dsx.cpp | 6 | ||||
| -rw-r--r-- | src/core/loader/ncch.cpp | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/core/loader/3dsx.cpp b/src/core/loader/3dsx.cpp index 09266e8b0..74e336487 100644 --- a/src/core/loader/3dsx.cpp +++ b/src/core/loader/3dsx.cpp | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | #include <algorithm> | 5 | #include <algorithm> |
| 6 | #include <vector> | 6 | #include <vector> |
| 7 | #include "common/logging/log.h" | 7 | #include "common/logging/log.h" |
| 8 | #include "core/file_sys/archive_romfs.h" | 8 | #include "core/file_sys/archive_selfncch.h" |
| 9 | #include "core/hle/kernel/process.h" | 9 | #include "core/hle/kernel/process.h" |
| 10 | #include "core/hle/kernel/resource_limit.h" | 10 | #include "core/hle/kernel/resource_limit.h" |
| 11 | #include "core/hle/service/fs/archive.h" | 11 | #include "core/hle/service/fs/archive.h" |
| @@ -277,8 +277,8 @@ ResultStatus AppLoader_THREEDSX::Load() { | |||
| 277 | 277 | ||
| 278 | Kernel::g_current_process->Run(48, Kernel::DEFAULT_STACK_SIZE); | 278 | Kernel::g_current_process->Run(48, Kernel::DEFAULT_STACK_SIZE); |
| 279 | 279 | ||
| 280 | Service::FS::RegisterArchiveType(std::make_unique<FileSys::ArchiveFactory_RomFS>(*this), | 280 | Service::FS::RegisterArchiveType(std::make_unique<FileSys::ArchiveFactory_SelfNCCH>(*this), |
| 281 | Service::FS::ArchiveIdCode::RomFS); | 281 | Service::FS::ArchiveIdCode::SelfNCCH); |
| 282 | 282 | ||
| 283 | is_loaded = true; | 283 | is_loaded = true; |
| 284 | return ResultStatus::Success; | 284 | return ResultStatus::Success; |
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp index 5df33f6d2..98b8259d9 100644 --- a/src/core/loader/ncch.cpp +++ b/src/core/loader/ncch.cpp | |||
| @@ -8,7 +8,7 @@ | |||
| 8 | #include "common/logging/log.h" | 8 | #include "common/logging/log.h" |
| 9 | #include "common/string_util.h" | 9 | #include "common/string_util.h" |
| 10 | #include "common/swap.h" | 10 | #include "common/swap.h" |
| 11 | #include "core/file_sys/archive_romfs.h" | 11 | #include "core/file_sys/archive_selfncch.h" |
| 12 | #include "core/hle/kernel/process.h" | 12 | #include "core/hle/kernel/process.h" |
| 13 | #include "core/hle/kernel/resource_limit.h" | 13 | #include "core/hle/kernel/resource_limit.h" |
| 14 | #include "core/hle/service/cfg/cfg.h" | 14 | #include "core/hle/service/cfg/cfg.h" |
| @@ -342,8 +342,8 @@ ResultStatus AppLoader_NCCH::Load() { | |||
| 342 | if (ResultStatus::Success != result) | 342 | if (ResultStatus::Success != result) |
| 343 | return result; | 343 | return result; |
| 344 | 344 | ||
| 345 | Service::FS::RegisterArchiveType(std::make_unique<FileSys::ArchiveFactory_RomFS>(*this), | 345 | Service::FS::RegisterArchiveType(std::make_unique<FileSys::ArchiveFactory_SelfNCCH>(*this), |
| 346 | Service::FS::ArchiveIdCode::RomFS); | 346 | Service::FS::ArchiveIdCode::SelfNCCH); |
| 347 | 347 | ||
| 348 | ParseRegionLockoutInfo(); | 348 | ParseRegionLockoutInfo(); |
| 349 | 349 | ||