diff options
author | Subv <subv2112@gmail.com> | 2016-11-20 02:40:04 +0100 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2016-11-20 02:40:04 +0100 |
commit | 1323ab2f5f1627b39e48b6f970ad8208fa7af71e (patch) | |
tree | 6b3257864d76a4cdd3d8bb9847e55a2a51ff7573 /src/core/hle/kernel | |
parent | Merge pull request #2172 from jroweboy/fix-mingw (diff) | |
download | yuzu-1323ab2f5f1627b39e48b6f970ad8208fa7af71e.tar yuzu-1323ab2f5f1627b39e48b6f970ad8208fa7af71e.tar.gz yuzu-1323ab2f5f1627b39e48b6f970ad8208fa7af71e.tar.bz2 yuzu-1323ab2f5f1627b39e48b6f970ad8208fa7af71e.tar.lz yuzu-1323ab2f5f1627b39e48b6f970ad8208fa7af71e.tar.xz yuzu-1323ab2f5f1627b39e48b6f970ad8208fa7af71e.tar.zst yuzu-1323ab2f5f1627b39e48b6f970ad8208fa7af71e.zip |
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r-- | src/core/hle/kernel/kernel.cpp | 6 | ||||
-rw-r--r-- | src/core/hle/kernel/kernel.h | 4 |
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(); |