فهرست منبع

Merge pull request #3781 from lioncash/docs

shared_memory: Amend doxygen reference
Rodrigo Locatti 6 سال پیش
والد
کامیت
8aa92491d5
2فایلهای تغییر یافته به همراه5 افزوده شده و 5 حذف شده
  1. 4 4
      src/core/hle/kernel/shared_memory.cpp
  2. 1 1
      src/core/hle/kernel/shared_memory.h

+ 4 - 4
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,
 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

+ 1 - 1
src/core/hle/kernel/shared_memory.h

@@ -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