summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/memory/memory_manager.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-02-13 02:38:40 +0100
committerbunnei <bunneidev@gmail.com>2021-02-19 01:16:25 +0100
commitb1e27890e8728c19ceef404aa6352cd6f2913ded (patch)
tree6579ee15eeea8f2ce339a264bef80e5adc5a4dc8 /src/core/hle/kernel/memory/memory_manager.h
parenthle: kernel: Migrate PageLinkedList to KPageLinkedList. (diff)
downloadyuzu-b1e27890e8728c19ceef404aa6352cd6f2913ded.tar
yuzu-b1e27890e8728c19ceef404aa6352cd6f2913ded.tar.gz
yuzu-b1e27890e8728c19ceef404aa6352cd6f2913ded.tar.bz2
yuzu-b1e27890e8728c19ceef404aa6352cd6f2913ded.tar.lz
yuzu-b1e27890e8728c19ceef404aa6352cd6f2913ded.tar.xz
yuzu-b1e27890e8728c19ceef404aa6352cd6f2913ded.tar.zst
yuzu-b1e27890e8728c19ceef404aa6352cd6f2913ded.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/k_memory_manager.h (renamed from src/core/hle/kernel/memory/memory_manager.h)10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/memory/memory_manager.h b/src/core/hle/kernel/k_memory_manager.h
index d090979bd..377f642d8 100644
--- a/src/core/hle/kernel/memory/memory_manager.h
+++ b/src/core/hle/kernel/k_memory_manager.h
@@ -17,9 +17,9 @@ namespace Kernel {
class KPageLinkedList;
}
-namespace Kernel::Memory {
+namespace Kernel {
-class MemoryManager final : NonCopyable {
+class KMemoryManager final : NonCopyable {
public:
enum class Pool : u32 {
Application = 0,
@@ -41,7 +41,7 @@ public:
Mask = (0xF << Shift),
};
- MemoryManager() = default;
+ KMemoryManager() = default;
constexpr std::size_t GetSize(Pool pool) const {
return managers[static_cast<std::size_t>(pool)].GetSize();
@@ -84,7 +84,7 @@ private:
using RefCount = u16;
private:
- PageHeap heap;
+ Memory::PageHeap heap;
Pool pool{};
public:
@@ -118,4 +118,4 @@ private:
std::array<Impl, MaxManagerCount> managers;
};
-} // namespace Kernel::Memory
+} // namespace Kernel