summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/k_capabilities.cpp8
-rw-r--r--src/core/hle/kernel/physical_core.h1
2 files changed, 5 insertions, 4 deletions
diff --git a/src/core/hle/kernel/k_capabilities.cpp b/src/core/hle/kernel/k_capabilities.cpp
index 64f1d7371..2907cc6e3 100644
--- a/src/core/hle/kernel/k_capabilities.cpp
+++ b/src/core/hle/kernel/k_capabilities.cpp
@@ -203,23 +203,23 @@ Result KCapabilities::ProcessMapRegionCapability(const u32 cap, F f) {
203 203
204Result KCapabilities::MapRegion_(const u32 cap, KPageTable* page_table) { 204Result KCapabilities::MapRegion_(const u32 cap, KPageTable* page_table) {
205 // Map each region into the process's page table. 205 // Map each region into the process's page table.
206 R_RETURN(ProcessMapRegionCapability( 206 return ProcessMapRegionCapability(
207 cap, [](KMemoryRegionType region_type, KMemoryPermission perm) -> Result { 207 cap, [](KMemoryRegionType region_type, KMemoryPermission perm) -> Result {
208 // R_RETURN(page_table->MapRegion(region_type, perm)); 208 // R_RETURN(page_table->MapRegion(region_type, perm));
209 UNIMPLEMENTED(); 209 UNIMPLEMENTED();
210 R_SUCCEED(); 210 R_SUCCEED();
211 })); 211 });
212} 212}
213 213
214Result KCapabilities::CheckMapRegion(KernelCore& kernel, const u32 cap) { 214Result KCapabilities::CheckMapRegion(KernelCore& kernel, const u32 cap) {
215 // Check that each region has a physical backing store. 215 // Check that each region has a physical backing store.
216 R_RETURN(ProcessMapRegionCapability( 216 return ProcessMapRegionCapability(
217 cap, [&](KMemoryRegionType region_type, KMemoryPermission perm) -> Result { 217 cap, [&](KMemoryRegionType region_type, KMemoryPermission perm) -> Result {
218 R_UNLESS(kernel.MemoryLayout().GetPhysicalMemoryRegionTree().FindFirstDerived( 218 R_UNLESS(kernel.MemoryLayout().GetPhysicalMemoryRegionTree().FindFirstDerived(
219 region_type) != nullptr, 219 region_type) != nullptr,
220 ResultOutOfRange); 220 ResultOutOfRange);
221 R_SUCCEED(); 221 R_SUCCEED();
222 })); 222 });
223} 223}
224 224
225Result KCapabilities::SetInterruptPairCapability(const u32 cap) { 225Result KCapabilities::SetInterruptPairCapability(const u32 cap) {
diff --git a/src/core/hle/kernel/physical_core.h b/src/core/hle/kernel/physical_core.h
index fb2ba4c6b..fb8e7933e 100644
--- a/src/core/hle/kernel/physical_core.h
+++ b/src/core/hle/kernel/physical_core.h
@@ -3,6 +3,7 @@
3 3
4#pragma once 4#pragma once
5 5
6#include <condition_variable>
6#include <cstddef> 7#include <cstddef>
7#include <memory> 8#include <memory>
8#include <mutex> 9#include <mutex>