diff options
author | bunnei <bunneidev@gmail.com> | 2021-05-10 05:15:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-10 05:15:00 +0200 |
commit | ec50a9b5b9882940a2e107889d3d909b57603626 (patch) | |
tree | 884bc2b18f440ec3058ac546718d315bf1970ad3 /src/core/hle/kernel/k_shared_memory.h | |
parent | Merge pull request #6294 from german77/kernelCleanup (diff) | |
parent | kernel: Eliminate variable shadowing (diff) | |
download | yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.tar yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.tar.gz yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.tar.bz2 yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.tar.lz yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.tar.xz yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.tar.zst yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/hle/kernel/k_shared_memory.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/core/hle/kernel/k_shared_memory.h b/src/core/hle/kernel/k_shared_memory.h index 28939c93c..553a56327 100644 --- a/src/core/hle/kernel/k_shared_memory.h +++ b/src/core/hle/kernel/k_shared_memory.h @@ -24,12 +24,11 @@ class KSharedMemory final KERNEL_AUTOOBJECT_TRAITS(KSharedMemory, KAutoObject); public: - explicit KSharedMemory(KernelCore& kernel); + explicit KSharedMemory(KernelCore& kernel_); ~KSharedMemory() override; - ResultCode Initialize(KernelCore& kernel_, Core::DeviceMemory& device_memory_, - KProcess* owner_process_, KPageLinkedList&& page_list_, - Svc::MemoryPermission owner_permission_, + ResultCode Initialize(Core::DeviceMemory& device_memory_, KProcess* owner_process_, + KPageLinkedList&& page_list_, Svc::MemoryPermission owner_permission_, Svc::MemoryPermission user_permission_, PAddr physical_address_, std::size_t size_, std::string name_); @@ -37,19 +36,19 @@ public: * Maps a shared memory block to an address in the target process' address space * @param target_process Process on which to map the memory block * @param address Address in system memory to map shared memory block to - * @param size Size of the shared memory block to map + * @param map_size Size of the shared memory block to map * @param permissions Memory block map permissions (specified by SVC field) */ - ResultCode Map(KProcess& target_process, VAddr address, std::size_t size, + ResultCode Map(KProcess& target_process, VAddr address, std::size_t map_size, Svc::MemoryPermission permissions); /** * Unmaps a shared memory block from an address in the target process' address space * @param target_process Process on which to unmap the memory block * @param address Address in system memory to unmap shared memory block - * @param size Size of the shared memory block to unmap + * @param unmap_size Size of the shared memory block to unmap */ - ResultCode Unmap(KProcess& target_process, VAddr address, std::size_t size); + ResultCode Unmap(KProcess& target_process, VAddr address, std::size_t unmap_size); /** * Gets a pointer to the shared memory block |