summaryrefslogtreecommitdiffstats
path: root/src/core/hle
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2016-11-28 02:04:11 +0100
committerGitHub <noreply@github.com>2016-11-28 02:04:11 +0100
commit3174bfd50c69dfa523671b96448113996a0bc42c (patch)
tree89575620a506d18c6fea2f8570c09bc0e9864263 /src/core/hle
parentMerge pull request #2222 from linkmauve/die-frameskip-die (diff)
parentKernel/Loader: Grab the system mode from the NCCH ExHeader. (diff)
downloadyuzu-3174bfd50c69dfa523671b96448113996a0bc42c.tar
yuzu-3174bfd50c69dfa523671b96448113996a0bc42c.tar.gz
yuzu-3174bfd50c69dfa523671b96448113996a0bc42c.tar.bz2
yuzu-3174bfd50c69dfa523671b96448113996a0bc42c.tar.lz
yuzu-3174bfd50c69dfa523671b96448113996a0bc42c.tar.xz
yuzu-3174bfd50c69dfa523671b96448113996a0bc42c.tar.zst
yuzu-3174bfd50c69dfa523671b96448113996a0bc42c.zip
Diffstat (limited to 'src/core/hle')
-rw-r--r--src/core/hle/kernel/kernel.cpp6
-rw-r--r--src/core/hle/kernel/kernel.h4
2 files changed, 4 insertions, 6 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() {
}
/// Initialize the kernel
-void Init() {
+void Init(u32 system_mode) {
ConfigMem::Init();
SharedPage::Init();
- // TODO(yuriks): The memory type parameter needs to be determined by the ExHeader field instead
- // For now it defaults to the one with a largest allocation to the app
- Kernel::MemoryInit(2); // Allocates 96MB to the application
+ Kernel::MemoryInit(system_mode);
Kernel::ResourceLimitsInit();
Kernel::ThreadingInit();
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 6b8dbecff..231cf7b75 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -286,8 +286,8 @@ private:
extern HandleTable g_handle_table;
-/// Initialize the kernel
-void Init();
+/// Initialize the kernel with the specified system mode.
+void Init(u32 system_mode);
/// Shutdown the kernel
void Shutdown();