summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/k_memory_manager.cpp
diff options
context:
space:
mode:
authorgerman77 <juangerman-13@hotmail.com>2022-06-26 05:44:19 +0200
committergerman77 <juangerman-13@hotmail.com>2022-06-27 03:21:37 +0200
commita7d9be13840acd65d0d684666390758ede72c826 (patch)
tree37485f63b09576444173d6a765abe0bb95dd45db /src/core/hle/kernel/k_memory_manager.cpp
parentMerge pull request #8475 from liamwhite/x18 (diff)
downloadyuzu-a7d9be13840acd65d0d684666390758ede72c826.tar
yuzu-a7d9be13840acd65d0d684666390758ede72c826.tar.gz
yuzu-a7d9be13840acd65d0d684666390758ede72c826.tar.bz2
yuzu-a7d9be13840acd65d0d684666390758ede72c826.tar.lz
yuzu-a7d9be13840acd65d0d684666390758ede72c826.tar.xz
yuzu-a7d9be13840acd65d0d684666390758ede72c826.tar.zst
yuzu-a7d9be13840acd65d0d684666390758ede72c826.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/k_memory_manager.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/k_memory_manager.cpp b/src/core/hle/kernel/k_memory_manager.cpp
index 58e540f31..0cdb4a050 100644
--- a/src/core/hle/kernel/k_memory_manager.cpp
+++ b/src/core/hle/kernel/k_memory_manager.cpp
@@ -208,8 +208,8 @@ PAddr KMemoryManager::AllocateAndOpenContinuous(size_t num_pages, size_t align_p
return allocated_block;
}
-ResultCode KMemoryManager::AllocatePageGroupImpl(KPageLinkedList* out, size_t num_pages, Pool pool,
- Direction dir, bool random) {
+Result KMemoryManager::AllocatePageGroupImpl(KPageLinkedList* out, size_t num_pages, Pool pool,
+ Direction dir, bool random) {
// Choose a heap based on our page size request.
const s32 heap_index = KPageHeap::GetBlockIndex(num_pages);
R_UNLESS(0 <= heap_index, ResultOutOfMemory);
@@ -257,7 +257,7 @@ ResultCode KMemoryManager::AllocatePageGroupImpl(KPageLinkedList* out, size_t nu
return ResultSuccess;
}
-ResultCode KMemoryManager::AllocateAndOpen(KPageLinkedList* out, size_t num_pages, u32 option) {
+Result KMemoryManager::AllocateAndOpen(KPageLinkedList* out, size_t num_pages, u32 option) {
ASSERT(out != nullptr);
ASSERT(out->GetNumPages() == 0);
@@ -293,8 +293,8 @@ ResultCode KMemoryManager::AllocateAndOpen(KPageLinkedList* out, size_t num_page
return ResultSuccess;
}
-ResultCode KMemoryManager::AllocateAndOpenForProcess(KPageLinkedList* out, size_t num_pages,
- u32 option, u64 process_id, u8 fill_pattern) {
+Result KMemoryManager::AllocateAndOpenForProcess(KPageLinkedList* out, size_t num_pages, u32 option,
+ u64 process_id, u8 fill_pattern) {
ASSERT(out != nullptr);
ASSERT(out->GetNumPages() == 0);