summaryrefslogtreecommitdiff
path: root/src/core/hle/service
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
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')
-rw-r--r--src/core/hle/service/hid/hid.cpp2
-rw-r--r--src/core/hle/service/hid/hid.h4
-rw-r--r--src/core/hle/service/hid/irs.cpp2
-rw-r--r--src/core/hle/service/hid/irs.h4
-rw-r--r--src/core/hle/service/ns/pl_u.cpp4
-rw-r--r--src/core/hle/service/time/time_sharedmemory.cpp2
-rw-r--r--src/core/hle/service/time/time_sharedmemory.h6
7 files changed, 12 insertions, 12 deletions
diff --git a/src/core/hle/service/hid/hid.cpp b/src/core/hle/service/hid/hid.cpp
index 1e2677320..ffc3dfdc3 100644
--- a/src/core/hle/service/hid/hid.cpp
+++ b/src/core/hle/service/hid/hid.cpp
@@ -15,9 +15,9 @@
15#include "core/hle/kernel/client_port.h" 15#include "core/hle/kernel/client_port.h"
16#include "core/hle/kernel/client_session.h" 16#include "core/hle/kernel/client_session.h"
17#include "core/hle/kernel/k_readable_event.h" 17#include "core/hle/kernel/k_readable_event.h"
18#include "core/hle/kernel/k_shared_memory.h"
18#include "core/hle/kernel/k_writable_event.h" 19#include "core/hle/kernel/k_writable_event.h"
19#include "core/hle/kernel/kernel.h" 20#include "core/hle/kernel/kernel.h"
20#include "core/hle/kernel/shared_memory.h"
21#include "core/hle/service/hid/errors.h" 21#include "core/hle/service/hid/errors.h"
22#include "core/hle/service/hid/hid.h" 22#include "core/hle/service/hid/hid.h"
23#include "core/hle/service/hid/irs.h" 23#include "core/hle/service/hid/irs.h"
diff --git a/src/core/hle/service/hid/hid.h b/src/core/hle/service/hid/hid.h
index 7cc0433e2..06ddcf3e4 100644
--- a/src/core/hle/service/hid/hid.h
+++ b/src/core/hle/service/hid/hid.h
@@ -14,7 +14,7 @@ struct EventType;
14} 14}
15 15
16namespace Kernel { 16namespace Kernel {
17class SharedMemory; 17class KSharedMemory;
18} 18}
19 19
20namespace Service::SM { 20namespace Service::SM {
@@ -69,7 +69,7 @@ private:
69 void UpdateControllers(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); 69 void UpdateControllers(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
70 void UpdateMotion(std::uintptr_t user_data, std::chrono::nanoseconds ns_late); 70 void UpdateMotion(std::uintptr_t user_data, std::chrono::nanoseconds ns_late);
71 71
72 std::shared_ptr<Kernel::SharedMemory> shared_mem; 72 std::shared_ptr<Kernel::KSharedMemory> shared_mem;
73 73
74 std::shared_ptr<Core::Timing::EventType> pad_update_event; 74 std::shared_ptr<Core::Timing::EventType> pad_update_event;
75 std::shared_ptr<Core::Timing::EventType> motion_update_event; 75 std::shared_ptr<Core::Timing::EventType> motion_update_event;
diff --git a/src/core/hle/service/hid/irs.cpp b/src/core/hle/service/hid/irs.cpp
index c8413099f..2dfa936fb 100644
--- a/src/core/hle/service/hid/irs.cpp
+++ b/src/core/hle/service/hid/irs.cpp
@@ -6,8 +6,8 @@
6#include "core/core.h" 6#include "core/core.h"
7#include "core/core_timing.h" 7#include "core/core_timing.h"
8#include "core/hle/ipc_helpers.h" 8#include "core/hle/ipc_helpers.h"
9#include "core/hle/kernel/k_shared_memory.h"
9#include "core/hle/kernel/kernel.h" 10#include "core/hle/kernel/kernel.h"
10#include "core/hle/kernel/shared_memory.h"
11#include "core/hle/service/hid/irs.h" 11#include "core/hle/service/hid/irs.h"
12 12
13namespace Service::HID { 13namespace Service::HID {
diff --git a/src/core/hle/service/hid/irs.h b/src/core/hle/service/hid/irs.h
index be0c486ba..b0c8c7168 100644
--- a/src/core/hle/service/hid/irs.h
+++ b/src/core/hle/service/hid/irs.h
@@ -12,7 +12,7 @@ class System;
12} 12}
13 13
14namespace Kernel { 14namespace Kernel {
15class SharedMemory; 15class KSharedMemory;
16} 16}
17 17
18namespace Service::HID { 18namespace Service::HID {
@@ -42,7 +42,7 @@ private:
42 void StopImageProcessorAsync(Kernel::HLERequestContext& ctx); 42 void StopImageProcessorAsync(Kernel::HLERequestContext& ctx);
43 void ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx); 43 void ActivateIrsensorWithFunctionLevel(Kernel::HLERequestContext& ctx);
44 44
45 std::shared_ptr<Kernel::SharedMemory> shared_mem; 45 std::shared_ptr<Kernel::KSharedMemory> shared_mem;
46 const u32 device_handle{0xABCD}; 46 const u32 device_handle{0xABCD};
47}; 47};
48 48
diff --git a/src/core/hle/service/ns/pl_u.cpp b/src/core/hle/service/ns/pl_u.cpp
index b6ac0a81a..fcd15d81f 100644
--- a/src/core/hle/service/ns/pl_u.cpp
+++ b/src/core/hle/service/ns/pl_u.cpp
@@ -19,9 +19,9 @@
19#include "core/file_sys/romfs.h" 19#include "core/file_sys/romfs.h"
20#include "core/file_sys/system_archive/system_archive.h" 20#include "core/file_sys/system_archive/system_archive.h"
21#include "core/hle/ipc_helpers.h" 21#include "core/hle/ipc_helpers.h"
22#include "core/hle/kernel/k_shared_memory.h"
22#include "core/hle/kernel/kernel.h" 23#include "core/hle/kernel/kernel.h"
23#include "core/hle/kernel/physical_memory.h" 24#include "core/hle/kernel/physical_memory.h"
24#include "core/hle/kernel/shared_memory.h"
25#include "core/hle/service/filesystem/filesystem.h" 25#include "core/hle/service/filesystem/filesystem.h"
26#include "core/hle/service/ns/pl_u.h" 26#include "core/hle/service/ns/pl_u.h"
27 27
@@ -131,7 +131,7 @@ struct PL_U::Impl {
131 } 131 }
132 132
133 /// Handle to shared memory region designated for a shared font 133 /// Handle to shared memory region designated for a shared font
134 std::shared_ptr<Kernel::SharedMemory> shared_font_mem; 134 std::shared_ptr<Kernel::KSharedMemory> shared_font_mem;
135 135
136 /// Backing memory for the shared font data 136 /// Backing memory for the shared font data
137 std::shared_ptr<Kernel::PhysicalMemory> shared_font; 137 std::shared_ptr<Kernel::PhysicalMemory> shared_font;
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};