summaryrefslogtreecommitdiff
path: root/src/core/hle/service/time
diff options
context:
space:
mode:
authorGravatar bunnei2021-02-05 23:14:31 -0800
committerGravatar bunnei2021-02-18 16:16:12 -0800
commit0d62f30b00fbfe598573ea8fd433bd64d7be3e5f (patch)
tree1645351165042095d108a5e43df263db604bbe1c /src/core/hle/service/time
parentMerge pull request #5957 from lat9nq/update-dynarmic (diff)
downloadyuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar.gz
yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.tar.xz
yuzu-0d62f30b00fbfe598573ea8fd433bd64d7be3e5f.zip
hle: kernel: Rename SharedMemory to KSharedMemory.
Diffstat (limited to 'src/core/hle/service/time')
-rw-r--r--src/core/hle/service/time/time_sharedmemory.cpp2
-rw-r--r--src/core/hle/service/time/time_sharedmemory.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/core/hle/service/time/time_sharedmemory.cpp b/src/core/hle/service/time/time_sharedmemory.cpp
index e0ae9f874..4d8de81be 100644
--- a/src/core/hle/service/time/time_sharedmemory.cpp
+++ b/src/core/hle/service/time/time_sharedmemory.cpp
@@ -22,7 +22,7 @@ SharedMemory::SharedMemory(Core::System& system) : system(system) {
22 22
23SharedMemory::~SharedMemory() = default; 23SharedMemory::~SharedMemory() = default;
24 24
25std::shared_ptr<Kernel::SharedMemory> SharedMemory::GetSharedMemoryHolder() const { 25std::shared_ptr<Kernel::KSharedMemory> SharedMemory::GetSharedMemoryHolder() const {
26 return shared_memory_holder; 26 return shared_memory_holder;
27} 27}
28 28
diff --git a/src/core/hle/service/time/time_sharedmemory.h b/src/core/hle/service/time/time_sharedmemory.h
index e0c3e63da..299680517 100644
--- a/src/core/hle/service/time/time_sharedmemory.h
+++ b/src/core/hle/service/time/time_sharedmemory.h
@@ -6,8 +6,8 @@
6 6
7#include "common/common_types.h" 7#include "common/common_types.h"
8#include "common/uuid.h" 8#include "common/uuid.h"
9#include "core/hle/kernel/k_shared_memory.h"
9#include "core/hle/kernel/k_thread.h" 10#include "core/hle/kernel/k_thread.h"
10#include "core/hle/kernel/shared_memory.h"
11#include "core/hle/service/time/clock_types.h" 11#include "core/hle/service/time/clock_types.h"
12 12
13namespace Service::Time { 13namespace Service::Time {
@@ -18,7 +18,7 @@ public:
18 ~SharedMemory(); 18 ~SharedMemory();
19 19
20 // Return the shared memory handle 20 // Return the shared memory handle
21 std::shared_ptr<Kernel::SharedMemory> GetSharedMemoryHolder() const; 21 std::shared_ptr<Kernel::KSharedMemory> GetSharedMemoryHolder() const;
22 22
23 // TODO(ogniK): We have to properly simulate memory barriers, how are we going to do this? 23 // TODO(ogniK): We have to properly simulate memory barriers, how are we going to do this?
24 template <typename T, std::size_t Offset> 24 template <typename T, std::size_t Offset>
@@ -63,7 +63,7 @@ public:
63 void SetAutomaticCorrectionEnabled(bool is_enabled); 63 void SetAutomaticCorrectionEnabled(bool is_enabled);
64 64
65private: 65private:
66 std::shared_ptr<Kernel::SharedMemory> shared_memory_holder; 66 std::shared_ptr<Kernel::KSharedMemory> shared_memory_holder;
67 Core::System& system; 67 Core::System& system;
68 Format shared_memory_format{}; 68 Format shared_memory_format{};
69}; 69};