summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/k_shared_memory.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-02-06 08:14:31 +0100
committerbunnei <bunneidev@gmail.com>2021-02-19 01:16:12 +0100
commit0d62f30b00fbfe598573ea8fd433bd64d7be3e5f (patch)
tree1645351165042095d108a5e43df263db604bbe1c /src/core/hle/kernel/k_shared_memory.cpp
parentMerge pull request #5957 from lat9nq/update-dynarmic (diff)
downloadyuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar
yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar.gz
yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar.bz2
yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar.lz
yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar.xz
yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar.zst
yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/k_shared_memory.cpp (renamed from src/core/hle/kernel/shared_memory.cpp)16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/core/hle/kernel/shared_memory.cpp b/src/core/hle/kernel/k_shared_memory.cpp
index 2eadd51d7..dd82e0217 100644
--- a/src/core/hle/kernel/shared_memory.cpp
+++ b/src/core/hle/kernel/k_shared_memory.cpp
@@ -5,20 +5,20 @@
#include "common/assert.h"
#include "core/core.h"
#include "core/hle/kernel/k_scoped_resource_reservation.h"
+#include "core/hle/kernel/k_shared_memory.h"
#include "core/hle/kernel/kernel.h"
#include "core/hle/kernel/memory/page_table.h"
-#include "core/hle/kernel/shared_memory.h"
namespace Kernel {
-SharedMemory::SharedMemory(KernelCore& kernel, Core::DeviceMemory& device_memory)
+KSharedMemory::KSharedMemory(KernelCore& kernel, Core::DeviceMemory& device_memory)
: Object{kernel}, device_memory{device_memory} {}
-SharedMemory::~SharedMemory() {
+KSharedMemory::~KSharedMemory() {
kernel.GetSystemResourceLimit()->Release(LimitableResource::PhysicalMemory, size);
}
-std::shared_ptr<SharedMemory> SharedMemory::Create(
+std::shared_ptr<KSharedMemory> KSharedMemory::Create(
KernelCore& kernel, Core::DeviceMemory& device_memory, Process* owner_process,
Memory::PageLinkedList&& page_list, Memory::MemoryPermission owner_permission,
Memory::MemoryPermission user_permission, PAddr physical_address, std::size_t size,
@@ -29,8 +29,8 @@ std::shared_ptr<SharedMemory> SharedMemory::Create(
size);
ASSERT(memory_reservation.Succeeded());
- std::shared_ptr<SharedMemory> shared_memory{
- std::make_shared<SharedMemory>(kernel, device_memory)};
+ std::shared_ptr<KSharedMemory> shared_memory{
+ std::make_shared<KSharedMemory>(kernel, device_memory)};
shared_memory->owner_process = owner_process;
shared_memory->page_list = std::move(page_list);
@@ -44,8 +44,8 @@ std::shared_ptr<SharedMemory> SharedMemory::Create(
return shared_memory;
}
-ResultCode SharedMemory::Map(Process& target_process, VAddr address, std::size_t size,
- Memory::MemoryPermission permissions) {
+ResultCode KSharedMemory::Map(Process& target_process, VAddr address, std::size_t size,
+ Memory::MemoryPermission permissions) {
const u64 page_count{(size + Memory::PageSize - 1) / Memory::PageSize};
if (page_list.GetNumPages() != page_count) {