summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2018-07-24 03:28:45 +0200
committerGitHub <noreply@github.com>2018-07-24 03:28:45 +0200
commite0b6771e251317ed613ec11d7d2452a25177dffb (patch)
tree66e35c70f8d76ce1976d9ed34d6f415feffdefc3 /src/core/hle/kernel
parentMerge pull request #695 from DarkLordZach/nro-asset (diff)
parenthle: Remove config_mem.h/.cpp (diff)
downloadyuzu-e0b6771e251317ed613ec11d7d2452a25177dffb.tar
yuzu-e0b6771e251317ed613ec11d7d2452a25177dffb.tar.gz
yuzu-e0b6771e251317ed613ec11d7d2452a25177dffb.tar.bz2
yuzu-e0b6771e251317ed613ec11d7d2452a25177dffb.tar.lz
yuzu-e0b6771e251317ed613ec11d7d2452a25177dffb.tar.xz
yuzu-e0b6771e251317ed613ec11d7d2452a25177dffb.tar.zst
yuzu-e0b6771e251317ed613ec11d7d2452a25177dffb.zip
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/kernel.cpp5
-rw-r--r--src/core/hle/kernel/memory.cpp10
-rw-r--r--src/core/hle/kernel/wait_object.cpp2
3 files changed, 0 insertions, 17 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index b325b879b..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"
@@ -11,7 +10,6 @@
#include "core/hle/kernel/resource_limit.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/kernel/timer.h"
-#include "core/hle/shared_page.h"
namespace Kernel {
@@ -19,9 +17,6 @@ unsigned int Object::next_object_id;
/// Initialize the kernel
void Init(u32 system_mode) {
- ConfigMem::Init();
- SharedPage::Init();
-
Kernel::MemoryInit(system_mode);
Kernel::ResourceLimitsInit();
diff --git a/src/core/hle/kernel/memory.cpp b/src/core/hle/kernel/memory.cpp
index d2600cdd7..94eac677c 100644
--- a/src/core/hle/kernel/memory.cpp
+++ b/src/core/hle/kernel/memory.cpp
@@ -11,11 +11,9 @@
#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"
-#include "core/hle/shared_page.h"
#include "core/memory.h"
#include "core/memory_setup.h"
@@ -63,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 eb3c92e66..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"
@@ -13,7 +12,6 @@
#include "core/hle/kernel/resource_limit.h"
#include "core/hle/kernel/thread.h"
#include "core/hle/kernel/timer.h"
-#include "core/hle/shared_page.h"
namespace Kernel {