summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRodrigo Locatti <reinuseslisp@airmail.cc>2020-04-24 02:46:35 +0200
committerGitHub <noreply@github.com>2020-04-24 02:46:35 +0200
commit8aa92491d5c145368d4a16175cd78209f3f2bb58 (patch)
tree3fefd1e33abb79cc1cc4731ee6bf12d871772520
parentMerge pull request #3768 from H27CK/cmd-title-fmt (diff)
parentshared_memory: Amend doxygen reference (diff)
downloadyuzu-8aa92491d5c145368d4a16175cd78209f3f2bb58.tar
yuzu-8aa92491d5c145368d4a16175cd78209f3f2bb58.tar.gz
yuzu-8aa92491d5c145368d4a16175cd78209f3f2bb58.tar.bz2
yuzu-8aa92491d5c145368d4a16175cd78209f3f2bb58.tar.lz
yuzu-8aa92491d5c145368d4a16175cd78209f3f2bb58.tar.xz
yuzu-8aa92491d5c145368d4a16175cd78209f3f2bb58.tar.zst
yuzu-8aa92491d5c145368d4a16175cd78209f3f2bb58.zip
-rw-r--r--src/core/hle/kernel/shared_memory.cpp8
-rw-r--r--src/core/hle/kernel/shared_memory.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/shared_memory.cpp
index c67696757..0cd467110 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/shared_memory.cpp
@@ -36,22 +36,22 @@ std::shared_ptr<SharedMemory> SharedMemory::Create(
}
ResultCode SharedMemory::Map(Process& target_process, VAddr address, std::size_t size,
- Memory::MemoryPermission permission) {
+ Memory::MemoryPermission permissions) {
const u64 page_count{(size + Memory::PageSize - 1) / Memory::PageSize};
if (page_list.GetNumPages() != page_count) {
UNIMPLEMENTED_MSG("Page count does not match");
}
- Memory::MemoryPermission expected =
+ const Memory::MemoryPermission expected =
&target_process == owner_process ? owner_permission : user_permission;
- if (permission != expected) {
+ if (permissions != expected) {
UNIMPLEMENTED_MSG("Permission does not match");
}
return target_process.PageTable().MapPages(address, page_list, Memory::MemoryState::Shared,
- permission);
+ permissions);
}
} // namespace Kernel
diff --git a/src/core/hle/kernel/shared_memory.h b/src/core/hle/kernel/shared_memory.h
index cd16d6412..0ef87235c 100644
--- a/src/core/hle/kernel/shared_memory.h
+++ b/src/core/hle/kernel/shared_memory.h
@@ -51,7 +51,7 @@ public:
* @param permissions Memory block map permissions (specified by SVC field)
*/
ResultCode Map(Process& target_process, VAddr address, std::size_t size,
- Memory::MemoryPermission permission);
+ Memory::MemoryPermission permissions);
/**
* Gets a pointer to the shared memory block