summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/init
diff options
context:
space:
mode:
authorGravatar bunnei2022-09-05 17:42:24 -0700
committerGravatar bunnei2022-10-18 19:13:34 -0700
commit47b8160666da8dcb679bb7cabe35a615a1786155 (patch)
treec22fd04d12cc19f0155feb98157dc90874e6456b /src/core/hle/kernel/init
parentcore: hle: result: Add GetInnerValue and Includes methods. (diff)
downloadyuzu-47b8160666da8dcb679bb7cabe35a615a1786155.tar.gz
yuzu-47b8160666da8dcb679bb7cabe35a615a1786155.tar.xz
yuzu-47b8160666da8dcb679bb7cabe35a615a1786155.zip
core: device_memory: Templatize GetPointer(..).
Diffstat (limited to 'src/core/hle/kernel/init')
-rw-r--r--src/core/hle/kernel/init/init_slab_setup.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/core/hle/kernel/init/init_slab_setup.cpp
index 9b6b284d0..c84d36c8c 100644
--- a/src/core/hle/kernel/init/init_slab_setup.cpp
+++ b/src/core/hle/kernel/init/init_slab_setup.cpp
@@ -94,8 +94,8 @@ VAddr InitializeSlabHeap(Core::System& system, KMemoryLayout& memory_layout, VAd
94 // TODO(bunnei): Fix this once we support the kernel virtual memory layout. 94 // TODO(bunnei): Fix this once we support the kernel virtual memory layout.
95 95
96 if (size > 0) { 96 if (size > 0) {
97 void* backing_kernel_memory{ 97 void* backing_kernel_memory{system.DeviceMemory().GetPointer<void>(
98 system.DeviceMemory().GetPointer(TranslateSlabAddrToPhysical(memory_layout, start))}; 98 TranslateSlabAddrToPhysical(memory_layout, start))};
99 99
100 const KMemoryRegion* region = memory_layout.FindVirtual(start + size - 1); 100 const KMemoryRegion* region = memory_layout.FindVirtual(start + size - 1);
101 ASSERT(region != nullptr); 101 ASSERT(region != nullptr);
@@ -181,7 +181,7 @@ void InitializeKPageBufferSlabHeap(Core::System& system) {
181 ASSERT(slab_address != 0); 181 ASSERT(slab_address != 0);
182 182
183 // Initialize the slabheap. 183 // Initialize the slabheap.
184 KPageBuffer::InitializeSlabHeap(kernel, system.DeviceMemory().GetPointer(slab_address), 184 KPageBuffer::InitializeSlabHeap(kernel, system.DeviceMemory().GetPointer<void>(slab_address),
185 slab_size); 185 slab_size);
186} 186}
187 187