summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar Lioncash2018-07-23 12:57:32 -0400
committerGravatar Lioncash2018-07-23 12:57:34 -0400
commitcbe841c9c979752c0cf2e0241cd6e51590e3b90c (patch)
tree273505d5f550d9211124cab2006c69bd2741792e /src/core/hle/kernel
parenthle: Remove shared_page.h/.cpp (diff)
downloadyuzu-cbe841c9c979752c0cf2e0241cd6e51590e3b90c.tar.gz
yuzu-cbe841c9c979752c0cf2e0241cd6e51590e3b90c.tar.xz
yuzu-cbe841c9c979752c0cf2e0241cd6e51590e3b90c.zip
hle: Remove config_mem.h/.cpp
This is just an unused hold-over from citra, so we can get rid of this to trim off an exposed global, among other things.
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/kernel.cpp3
-rw-r--r--src/core/hle/kernel/memory.cpp9
-rw-r--r--src/core/hle/kernel/wait_object.cpp1
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 @@
2// Licensed under GPLv2 or any later version 2// Licensed under GPLv2 or any later version
3// Refer to the license.txt file included. 3// Refer to the license.txt file included.
4 4
5#include "core/hle/config_mem.h"
6#include "core/hle/kernel/handle_table.h" 5#include "core/hle/kernel/handle_table.h"
7#include "core/hle/kernel/kernel.h" 6#include "core/hle/kernel/kernel.h"
8#include "core/hle/kernel/memory.h" 7#include "core/hle/kernel/memory.h"
@@ -18,8 +17,6 @@ unsigned int Object::next_object_id;
18 17
19/// Initialize the kernel 18/// Initialize the kernel
20void Init(u32 system_mode) { 19void Init(u32 system_mode) {
21 ConfigMem::Init();
22
23 Kernel::MemoryInit(system_mode); 20 Kernel::MemoryInit(system_mode);
24 21
25 Kernel::ResourceLimitsInit(); 22 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 @@
11#include "common/assert.h" 11#include "common/assert.h"
12#include "common/common_types.h" 12#include "common/common_types.h"
13#include "common/logging/log.h" 13#include "common/logging/log.h"
14#include "core/hle/config_mem.h"
15#include "core/hle/kernel/memory.h" 14#include "core/hle/kernel/memory.h"
16#include "core/hle/kernel/vm_manager.h" 15#include "core/hle/kernel/vm_manager.h"
17#include "core/hle/result.h" 16#include "core/hle/result.h"
@@ -62,14 +61,6 @@ void MemoryInit(u32 mem_type) {
62 61
63 // We must've allocated the entire FCRAM by the end 62 // We must've allocated the entire FCRAM by the end
64 ASSERT(base == Memory::FCRAM_SIZE); 63 ASSERT(base == Memory::FCRAM_SIZE);
65
66 using ConfigMem::config_mem;
67 config_mem.app_mem_type = mem_type;
68 // app_mem_malloc does not always match the configured size for memory_region[0]: in case the
69 // n3DS type override is in effect it reports the size the game expects, not the real one.
70 config_mem.app_mem_alloc = memory_region_sizes[mem_type][0];
71 config_mem.sys_mem_alloc = static_cast<u32_le>(memory_regions[1].size);
72 config_mem.base_mem_alloc = static_cast<u32_le>(memory_regions[2].size);
73} 64}
74 65
75void MemoryShutdown() { 66void 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 @@
5#include <algorithm> 5#include <algorithm>
6#include "common/assert.h" 6#include "common/assert.h"
7#include "common/logging/log.h" 7#include "common/logging/log.h"
8#include "core/hle/config_mem.h"
9#include "core/hle/kernel/errors.h" 8#include "core/hle/kernel/errors.h"
10#include "core/hle/kernel/kernel.h" 9#include "core/hle/kernel/kernel.h"
11#include "core/hle/kernel/memory.h" 10#include "core/hle/kernel/memory.h"