summaryrefslogtreecommitdiff
path: root/src/core/system.cpp
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2016-11-27 17:04:11 -0800
committerGravatar GitHub2016-11-27 17:04:11 -0800
commit3174bfd50c69dfa523671b96448113996a0bc42c (patch)
tree89575620a506d18c6fea2f8570c09bc0e9864263 /src/core/system.cpp
parentMerge pull request #2222 from linkmauve/die-frameskip-die (diff)
parentKernel/Loader: Grab the system mode from the NCCH ExHeader. (diff)
downloadyuzu-3174bfd50c69dfa523671b96448113996a0bc42c.tar.gz
yuzu-3174bfd50c69dfa523671b96448113996a0bc42c.tar.xz
yuzu-3174bfd50c69dfa523671b96448113996a0bc42c.zip
Merge pull request #2196 from Subv/system_mode
Kernel/Loader: Grab the system mode from the NCCH ExHeader.
Diffstat (limited to 'src/core/system.cpp')
-rw-r--r--src/core/system.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp
index 7d54811a0..a5f763805 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -17,12 +17,12 @@ namespace System {
17 17
18static bool is_powered_on{false}; 18static bool is_powered_on{false};
19 19
20Result Init(EmuWindow* emu_window) { 20Result Init(EmuWindow* emu_window, u32 system_mode) {
21 Core::Init(); 21 Core::Init();
22 CoreTiming::Init(); 22 CoreTiming::Init();
23 Memory::Init(); 23 Memory::Init();
24 HW::Init(); 24 HW::Init();
25 Kernel::Init(); 25 Kernel::Init(system_mode);
26 HLE::Init(); 26 HLE::Init();
27 if (!VideoCore::Init(emu_window)) { 27 if (!VideoCore::Init(emu_window)) {
28 return Result::ErrorInitVideoCore; 28 return Result::ErrorInitVideoCore;