summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.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/hle/kernel/kernel.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/hle/kernel/kernel.cpp')
-rw-r--r--src/core/hle/kernel/kernel.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 9e1795927..0c8752670 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -124,13 +124,11 @@ void HandleTable::Clear() {
124} 124}
125 125
126/// Initialize the kernel 126/// Initialize the kernel
127void Init() { 127void Init(u32 system_mode) {
128 ConfigMem::Init(); 128 ConfigMem::Init();
129 SharedPage::Init(); 129 SharedPage::Init();
130 130
131 // TODO(yuriks): The memory type parameter needs to be determined by the ExHeader field instead 131 Kernel::MemoryInit(system_mode);
132 // For now it defaults to the one with a largest allocation to the app
133 Kernel::MemoryInit(2); // Allocates 96MB to the application
134 132
135 Kernel::ResourceLimitsInit(); 133 Kernel::ResourceLimitsInit();
136 Kernel::ThreadingInit(); 134 Kernel::ThreadingInit();