diff options
author | bunnei <bunneidev@gmail.com> | 2021-02-13 00:29:25 +0100 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2021-02-19 01:16:24 +0100 |
commit | 701ef616b265d8914f77a399d9a1f41e68683a72 (patch) | |
tree | 6aeef88a010acd35a15f421fffedbc70605251b7 /src/core/hle/kernel/memory/memory_manager.cpp | |
parent | hle: kernel: KSystemControl does not belong in Memory namespace. (diff) | |
download | yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.tar yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.tar.gz yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.tar.bz2 yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.tar.lz yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.tar.xz yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.tar.zst yuzu-701ef616b265d8914f77a399d9a1f41e68683a72.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/memory/memory_manager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/hle/kernel/memory/memory_manager.cpp b/src/core/hle/kernel/memory/memory_manager.cpp index c373d9947..ffda77374 100644 --- a/src/core/hle/kernel/memory/memory_manager.cpp +++ b/src/core/hle/kernel/memory/memory_manager.cpp @@ -46,14 +46,15 @@ void MemoryManager::InitializeManager(Pool pool, u64 start_address, u64 end_addr managers[static_cast<std::size_t>(pool)].Initialize(pool, start_address, end_address); } -VAddr MemoryManager::AllocateContinuous(std::size_t num_pages, std::size_t align_pages, Pool pool, - Direction dir) { +VAddr MemoryManager::AllocateAndOpenContinuous(std::size_t num_pages, std::size_t align_pages, + u32 option) { // Early return if we're allocating no pages if (num_pages == 0) { return {}; } // Lock the pool that we're allocating from + const auto [pool, dir] = DecodeOption(option); const auto pool_index{static_cast<std::size_t>(pool)}; std::lock_guard lock{pool_locks[pool_index]}; |