diff options
| author | 2021-02-12 17:02:51 -0800 | |
|---|---|---|
| committer | 2021-02-18 16:16:25 -0800 | |
| commit | 65e0178cc09299550aee949d7b89e211017bddee (patch) | |
| tree | 97abf71a48320fc5628b4946d793191f2fb9dbb0 /src/core/hle/kernel/kernel.h | |
| parent | hle: kernel: Migrate SlabHeap to KSlabHeap. (diff) | |
| download | yuzu-65e0178cc09299550aee949d7b89e211017bddee.tar.gz yuzu-65e0178cc09299550aee949d7b89e211017bddee.tar.xz yuzu-65e0178cc09299550aee949d7b89e211017bddee.zip | |
hle: kernel: Migrate to KMemoryBlock, KMemoryBlockManager, and others.
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 5488c962a..498f94417 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | #include <vector> | 11 | #include <vector> |
| 12 | #include "core/arm/cpu_interrupt_handler.h" | 12 | #include "core/arm/cpu_interrupt_handler.h" |
| 13 | #include "core/hardware_properties.h" | 13 | #include "core/hardware_properties.h" |
| 14 | #include "core/hle/kernel/memory/memory_types.h" | 14 | #include "core/hle/kernel/memory_types.h" |
| 15 | #include "core/hle/kernel/object.h" | 15 | #include "core/hle/kernel/object.h" |
| 16 | 16 | ||
| 17 | namespace Core { | 17 | namespace Core { |
| @@ -186,10 +186,10 @@ public: | |||
| 186 | const Memory::MemoryManager& MemoryManager() const; | 186 | const Memory::MemoryManager& MemoryManager() const; |
| 187 | 187 | ||
| 188 | /// Gets the slab heap allocated for user space pages. | 188 | /// Gets the slab heap allocated for user space pages. |
| 189 | KSlabHeap<Memory::Page>& GetUserSlabHeapPages(); | 189 | KSlabHeap<Page>& GetUserSlabHeapPages(); |
| 190 | 190 | ||
| 191 | /// Gets the slab heap allocated for user space pages. | 191 | /// Gets the slab heap allocated for user space pages. |
| 192 | const KSlabHeap<Memory::Page>& GetUserSlabHeapPages() const; | 192 | const KSlabHeap<Page>& GetUserSlabHeapPages() const; |
| 193 | 193 | ||
| 194 | /// Gets the shared memory object for HID services. | 194 | /// Gets the shared memory object for HID services. |
| 195 | Kernel::KSharedMemory& GetHidSharedMem(); | 195 | Kernel::KSharedMemory& GetHidSharedMem(); |