summaryrefslogtreecommitdiff
path: root/src/core/loader/ncch.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2016-05-25 16:40:36 -0400
committerGravatar bunnei2016-05-25 16:40:36 -0400
commitf50a32bfce099eeff510e5e314b91dcf65d317ac (patch)
tree5bc0347199d722861ba09897e6c6e9015cf026bc /src/core/loader/ncch.cpp
parentNew3DS: Minor style cleanup to #1520. (diff)
parentLoader: Split SMDH into its own header and import helpers from QGameList (diff)
downloadyuzu-f50a32bfce099eeff510e5e314b91dcf65d317ac.tar.gz
yuzu-f50a32bfce099eeff510e5e314b91dcf65d317ac.tar.xz
yuzu-f50a32bfce099eeff510e5e314b91dcf65d317ac.zip
Merge pull request #1817 from linkmauve/smdh-stuff
Improve SMDH support in loaders and frontends
Diffstat (limited to 'src/core/loader/ncch.cpp')
-rw-r--r--src/core/loader/ncch.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core/loader/ncch.cpp b/src/core/loader/ncch.cpp
index 7391bdb26..fca091ff9 100644
--- a/src/core/loader/ncch.cpp
+++ b/src/core/loader/ncch.cpp
@@ -10,8 +10,10 @@
10#include "common/string_util.h" 10#include "common/string_util.h"
11#include "common/swap.h" 11#include "common/swap.h"
12 12
13#include "core/file_sys/archive_romfs.h"
13#include "core/hle/kernel/process.h" 14#include "core/hle/kernel/process.h"
14#include "core/hle/kernel/resource_limit.h" 15#include "core/hle/kernel/resource_limit.h"
16#include "core/hle/service/fs/archive.h"
15#include "core/loader/ncch.h" 17#include "core/loader/ncch.h"
16#include "core/memory.h" 18#include "core/memory.h"
17 19
@@ -303,7 +305,12 @@ ResultStatus AppLoader_NCCH::Load() {
303 305
304 is_loaded = true; // Set state to loaded 306 is_loaded = true; // Set state to loaded
305 307
306 return LoadExec(); // Load the executable into memory for booting 308 result = LoadExec(); // Load the executable into memory for booting
309 if (ResultStatus::Success != result)
310 return result;
311
312 Service::FS::RegisterArchiveType(std::make_unique<FileSys::ArchiveFactory_RomFS>(*this), Service::FS::ArchiveIdCode::RomFS);
313 return ResultStatus::Success;
307} 314}
308 315
309ResultStatus AppLoader_NCCH::ReadCode(std::vector<u8>& buffer) { 316ResultStatus AppLoader_NCCH::ReadCode(std::vector<u8>& buffer) {