diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-07-23 18:57:32 +0200 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-07-23 18:57:34 +0200 |
| commit | cbe841c9c979752c0cf2e0241cd6e51590e3b90c (patch) | |
| tree | 273505d5f550d9211124cab2006c69bd2741792e /src/core/hle/kernel | |
| parent | hle: Remove shared_page.h/.cpp (diff) | |
| download | yuzu-cbe841c9c979752c0cf2e0241cd6e51590e3b90c.tar yuzu-cbe841c9c979752c0cf2e0241cd6e51590e3b90c.tar.gz yuzu-cbe841c9c979752c0cf2e0241cd6e51590e3b90c.tar.bz2 yuzu-cbe841c9c979752c0cf2e0241cd6e51590e3b90c.tar.lz yuzu-cbe841c9c979752c0cf2e0241cd6e51590e3b90c.tar.xz yuzu-cbe841c9c979752c0cf2e0241cd6e51590e3b90c.tar.zst yuzu-cbe841c9c979752c0cf2e0241cd6e51590e3b90c.zip | |
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 3 | ||||
| -rw-r--r-- | src/core/hle/kernel/memory.cpp | 9 | ||||
| -rw-r--r-- | src/core/hle/kernel/wait_object.cpp | 1 |
3 files changed, 0 insertions, 13 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index fae81e72b..1beb98566 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -2,7 +2,6 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "core/hle/config_mem.h" #include "core/hle/kernel/handle_table.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/memory.h" @@ -18,8 +17,6 @@ unsigned int Object::next_object_id; /// Initialize the kernel void Init(u32 system_mode) { - ConfigMem::Init(); - Kernel::MemoryInit(system_mode); Kernel::ResourceLimitsInit(); diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp index ecbc5daae..94eac677c 100644 --- a/src/core/hle/kernel/memory.cpp +++ b/src/core/hle/kernel/memory.cpp @@ -11,7 +11,6 @@ #include "common/assert.h" #include "common/common_types.h" #include "common/logging/log.h" -#include "core/hle/config_mem.h" #include "core/hle/kernel/memory.h" #include "core/hle/kernel/vm_manager.h" #include "core/hle/result.h" @@ -62,14 +61,6 @@ void MemoryInit(u32 mem_type) { // We must've allocated the entire FCRAM by the end ASSERT(base == Memory::FCRAM_SIZE); - - using ConfigMem::config_mem; - config_mem.app_mem_type = mem_type; - // app_mem_malloc does not always match the configured size for memory_region[0]: in case the - // n3DS type override is in effect it reports the size the game expects, not the real one. - config_mem.app_mem_alloc = memory_region_sizes[mem_type][0]; - config_mem.sys_mem_alloc = static_cast<u32_le>(memory_regions[1].size); - config_mem.base_mem_alloc = static_cast<u32_le>(memory_regions[2].size); } void MemoryShutdown() { diff --git a/src/core/hle/kernel/wait_object.cpp b/src/core/hle/kernel/wait_object.cpp index e279c5df9..23af346d0 100644 --- a/src/core/hle/kernel/wait_object.cpp +++ b/src/core/hle/kernel/wait_object.cpp @@ -5,7 +5,6 @@ #include <algorithm> #include "common/assert.h" #include "common/logging/log.h" -#include "core/hle/config_mem.h" #include "core/hle/kernel/errors.h" #include "core/hle/kernel/kernel.h" #include "core/hle/kernel/memory.h" |