TechnoHector/suyu
2
1
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Merge pull request #3781 from lioncash/docs

Browse source 
shared_memory: Amend doxygen reference
This commit is contained in:
Rodrigo Locatti 2020-04-23 21:46:35 -03:00 committed by GitHub
commit 8aa92491d5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/hle/kernel/shared_memory.cpp
View file

@ -36,22 +36,22 @@ std::shared_ptr<SharedMemory> SharedMemory::Create(
} }
ResultCode SharedMemory::Map(Process& target_process, VAddr address, std::size_t size, 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}; const u64 page_count{(size + Memory::PageSize - 1) / Memory::PageSize};
if (page_list.GetNumPages() != page_count) { if (page_list.GetNumPages() != page_count) {
UNIMPLEMENTED_MSG("Page count does not match"); UNIMPLEMENTED_MSG("Page count does not match");
} }
Memory::MemoryPermission expected = const Memory::MemoryPermission expected =
&target_process == owner_process ? owner_permission : user_permission; &target_process == owner_process ? owner_permission : user_permission;
if (permission != expected) { if (permissions != expected) {
UNIMPLEMENTED_MSG("Permission does not match"); UNIMPLEMENTED_MSG("Permission does not match");
} }
return target_process.PageTable().MapPages(address, page_list, Memory::MemoryState::Shared, return target_process.PageTable().MapPages(address, page_list, Memory::MemoryState::Shared,
permission); permissions);
} }
} // namespace Kernel } // namespace Kernel

2
src/core/hle/kernel/shared_memory.h
View file

@ -51,7 +51,7 @@ public:
* @param permissions Memory block map permissions (specified by SVC field) * @param permissions Memory block map permissions (specified by SVC field)
*/ */
ResultCode Map(Process& target_process, VAddr address, std::size_t size, 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 * Gets a pointer to the shared memory block