diff options
| author | bunnei <bunneidev@gmail.com> | 2021-02-13 02:26:01 +0100 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2021-02-19 01:16:25 +0100 |
| commit | 93109c870e957d495d24d61d94f7761c72f5624f (patch) | |
| tree | 4fabf70f2f4e11f013007935ba61430640535b86 /src/core/hle/kernel/memory/memory_manager.cpp | |
| parent | hle: kernel: Migrate to KMemoryBlock, KMemoryBlockManager, and others. (diff) | |
| download | yuzu-93109c870e957d495d24d61d94f7761c72f5624f.tar yuzu-93109c870e957d495d24d61d94f7761c72f5624f.tar.gz yuzu-93109c870e957d495d24d61d94f7761c72f5624f.tar.bz2 yuzu-93109c870e957d495d24d61d94f7761c72f5624f.tar.lz yuzu-93109c870e957d495d24d61d94f7761c72f5624f.tar.xz yuzu-93109c870e957d495d24d61d94f7761c72f5624f.tar.zst yuzu-93109c870e957d495d24d61d94f7761c72f5624f.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/memory/memory_manager.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/memory/memory_manager.cpp b/src/core/hle/kernel/memory/memory_manager.cpp index ffda77374..00d5b15f3 100644 --- a/src/core/hle/kernel/memory/memory_manager.cpp +++ b/src/core/hle/kernel/memory/memory_manager.cpp @@ -8,8 +8,8 @@ #include "common/assert.h" #include "common/common_types.h" #include "common/scope_exit.h" +#include "core/hle/kernel/k_page_linked_list.h" #include "core/hle/kernel/memory/memory_manager.h" -#include "core/hle/kernel/memory/page_linked_list.h" #include "core/hle/kernel/svc_results.h" namespace Kernel::Memory { @@ -80,7 +80,7 @@ VAddr MemoryManager::AllocateAndOpenContinuous(std::size_t num_pages, std::size_ return allocated_block; } -ResultCode MemoryManager::Allocate(PageLinkedList& page_list, std::size_t num_pages, Pool pool, +ResultCode MemoryManager::Allocate(KPageLinkedList& page_list, std::size_t num_pages, Pool pool, Direction dir) { ASSERT(page_list.GetNumPages() == 0); @@ -149,7 +149,7 @@ ResultCode MemoryManager::Allocate(PageLinkedList& page_list, std::size_t num_pa return RESULT_SUCCESS; } -ResultCode MemoryManager::Free(PageLinkedList& page_list, std::size_t num_pages, Pool pool, +ResultCode MemoryManager::Free(KPageLinkedList& page_list, std::size_t num_pages, Pool pool, Direction dir) { // Early return if we're freeing no pages if (!num_pages) { |