Browse Source
Merge pull request #9739 from liamwhite/old-gcc-fix
kernel: fix compilation with older gcc
pull/15/merge
Mai
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
5 additions and
4 deletions
-
src/core/hle/kernel/k_capabilities.cpp
-
src/core/hle/kernel/physical_core.h
|
|
|
@ -203,23 +203,23 @@ Result KCapabilities::ProcessMapRegionCapability(const u32 cap, F f) { |
|
|
|
|
|
|
|
Result KCapabilities::MapRegion_(const u32 cap, KPageTable* page_table) { |
|
|
|
// Map each region into the process's page table.
|
|
|
|
R_RETURN(ProcessMapRegionCapability( |
|
|
|
return ProcessMapRegionCapability( |
|
|
|
cap, [](KMemoryRegionType region_type, KMemoryPermission perm) -> Result { |
|
|
|
// R_RETURN(page_table->MapRegion(region_type, perm));
|
|
|
|
UNIMPLEMENTED(); |
|
|
|
R_SUCCEED(); |
|
|
|
})); |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
Result KCapabilities::CheckMapRegion(KernelCore& kernel, const u32 cap) { |
|
|
|
// Check that each region has a physical backing store.
|
|
|
|
R_RETURN(ProcessMapRegionCapability( |
|
|
|
return ProcessMapRegionCapability( |
|
|
|
cap, [&](KMemoryRegionType region_type, KMemoryPermission perm) -> Result { |
|
|
|
R_UNLESS(kernel.MemoryLayout().GetPhysicalMemoryRegionTree().FindFirstDerived( |
|
|
|
region_type) != nullptr, |
|
|
|
ResultOutOfRange); |
|
|
|
R_SUCCEED(); |
|
|
|
})); |
|
|
|
}); |
|
|
|
} |
|
|
|
|
|
|
|
Result KCapabilities::SetInterruptPairCapability(const u32 cap) { |
|
|
|
|
|
|
|
@ -3,6 +3,7 @@ |
|
|
|
|
|
|
|
#pragma once |
|
|
|
|
|
|
|
#include <condition_variable> |
|
|
|
#include <cstddef> |
|
|
|
#include <memory> |
|
|
|
#include <mutex> |
|
|
|
|