Browse Source
Merge pull request #3781 from lioncash/docs
shared_memory: Amend doxygen reference
pull/15/merge
Rodrigo Locatti
6 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
5 deletions
-
src/core/hle/kernel/shared_memory.cpp
-
src/core/hle/kernel/shared_memory.h
|
|
|
@ -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
|
|
|
|
@ -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 |
|
|
|
|