summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel
diff options
context:
space:
mode:
authorGravatar bunnei2021-01-29 23:51:40 -0800
committerGravatar bunnei2021-02-05 14:00:36 -0800
commit3f942c01f0d8c42837c49a164ed78f6410d62bda (patch)
treec060645e1c90727ef7cb4c26334e8ed32ff7f577 /src/core/hle/kernel
parenthle: kernel: Rename ReadableEvent to KReadableEvent. (diff)
downloadyuzu-3f942c01f0d8c42837c49a164ed78f6410d62bda.tar.gz
yuzu-3f942c01f0d8c42837c49a164ed78f6410d62bda.tar.xz
yuzu-3f942c01f0d8c42837c49a164ed78f6410d62bda.zip
hle: kernel: Rename WritableEvent to KWritableEvent.
Diffstat (limited to 'src/core/hle/kernel')
-rw-r--r--src/core/hle/kernel/hle_ipc.cpp2
-rw-r--r--src/core/hle/kernel/hle_ipc.h2
-rw-r--r--src/core/hle/kernel/k_readable_event.h4
-rw-r--r--src/core/hle/kernel/k_writable_event.cpp (renamed from src/core/hle/kernel/writable_event.cpp)16
-rw-r--r--src/core/hle/kernel/k_writable_event.h (renamed from src/core/hle/kernel/writable_event.h)10
-rw-r--r--src/core/hle/kernel/svc.cpp8
6 files changed, 21 insertions, 21 deletions
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index 93b9f793e..7ec62cf18 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -21,12 +21,12 @@
21#include "core/hle/kernel/k_scheduler.h" 21#include "core/hle/kernel/k_scheduler.h"
22#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" 22#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"
23#include "core/hle/kernel/k_thread.h" 23#include "core/hle/kernel/k_thread.h"
24#include "core/hle/kernel/k_writable_event.h"
24#include "core/hle/kernel/kernel.h" 25#include "core/hle/kernel/kernel.h"
25#include "core/hle/kernel/object.h" 26#include "core/hle/kernel/object.h"
26#include "core/hle/kernel/process.h" 27#include "core/hle/kernel/process.h"
27#include "core/hle/kernel/server_session.h" 28#include "core/hle/kernel/server_session.h"
28#include "core/hle/kernel/time_manager.h" 29#include "core/hle/kernel/time_manager.h"
29#include "core/hle/kernel/writable_event.h"
30#include "core/memory.h" 30#include "core/memory.h"
31 31
32namespace Kernel { 32namespace Kernel {
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index 89ae2a329..9a769781b 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -42,7 +42,7 @@ class Process;
42class ServerSession; 42class ServerSession;
43class KThread; 43class KThread;
44class KReadableEvent; 44class KReadableEvent;
45class WritableEvent; 45class KWritableEvent;
46 46
47enum class ThreadWakeupReason; 47enum class ThreadWakeupReason;
48 48
diff --git a/src/core/hle/kernel/k_readable_event.h b/src/core/hle/kernel/k_readable_event.h
index 50dfc60d3..39eedc411 100644
--- a/src/core/hle/kernel/k_readable_event.h
+++ b/src/core/hle/kernel/k_readable_event.h
@@ -12,10 +12,10 @@ union ResultCode;
12namespace Kernel { 12namespace Kernel {
13 13
14class KernelCore; 14class KernelCore;
15class WritableEvent; 15class KWritableEvent;
16 16
17class KReadableEvent final : public KSynchronizationObject { 17class KReadableEvent final : public KSynchronizationObject {
18 friend class WritableEvent; 18 friend class KWritableEvent;
19 19
20public: 20public:
21 ~KReadableEvent() override; 21 ~KReadableEvent() override;
diff --git a/src/core/hle/kernel/writable_event.cpp b/src/core/hle/kernel/k_writable_event.cpp
index 0d261e6e8..d2857b4c3 100644
--- a/src/core/hle/kernel/writable_event.cpp
+++ b/src/core/hle/kernel/k_writable_event.cpp
@@ -6,17 +6,17 @@
6#include "common/assert.h" 6#include "common/assert.h"
7#include "core/hle/kernel/k_readable_event.h" 7#include "core/hle/kernel/k_readable_event.h"
8#include "core/hle/kernel/k_thread.h" 8#include "core/hle/kernel/k_thread.h"
9#include "core/hle/kernel/k_writable_event.h"
9#include "core/hle/kernel/kernel.h" 10#include "core/hle/kernel/kernel.h"
10#include "core/hle/kernel/object.h" 11#include "core/hle/kernel/object.h"
11#include "core/hle/kernel/writable_event.h"
12 12
13namespace Kernel { 13namespace Kernel {
14 14
15WritableEvent::WritableEvent(KernelCore& kernel) : Object{kernel} {} 15KWritableEvent::KWritableEvent(KernelCore& kernel) : Object{kernel} {}
16WritableEvent::~WritableEvent() = default; 16KWritableEvent::~KWritableEvent() = default;
17 17
18EventPair WritableEvent::CreateEventPair(KernelCore& kernel, std::string name) { 18EventPair KWritableEvent::CreateEventPair(KernelCore& kernel, std::string name) {
19 std::shared_ptr<WritableEvent> writable_event(new WritableEvent(kernel)); 19 std::shared_ptr<KWritableEvent> writable_event(new KWritableEvent(kernel));
20 std::shared_ptr<KReadableEvent> readable_event(new KReadableEvent(kernel)); 20 std::shared_ptr<KReadableEvent> readable_event(new KReadableEvent(kernel));
21 21
22 writable_event->name = name + ":Writable"; 22 writable_event->name = name + ":Writable";
@@ -26,15 +26,15 @@ EventPair WritableEvent::CreateEventPair(KernelCore& kernel, std::string name) {
26 return {std::move(readable_event), std::move(writable_event)}; 26 return {std::move(readable_event), std::move(writable_event)};
27} 27}
28 28
29std::shared_ptr<KReadableEvent> WritableEvent::GetReadableEvent() const { 29std::shared_ptr<KReadableEvent> KWritableEvent::GetReadableEvent() const {
30 return readable; 30 return readable;
31} 31}
32 32
33void WritableEvent::Signal() { 33void KWritableEvent::Signal() {
34 readable->Signal(); 34 readable->Signal();
35} 35}
36 36
37void WritableEvent::Clear() { 37void KWritableEvent::Clear() {
38 readable->Clear(); 38 readable->Clear();
39} 39}
40 40
diff --git a/src/core/hle/kernel/writable_event.h b/src/core/hle/kernel/k_writable_event.h
index b288267c5..ad5514b52 100644
--- a/src/core/hle/kernel/writable_event.h
+++ b/src/core/hle/kernel/k_writable_event.h
@@ -12,16 +12,16 @@ namespace Kernel {
12 12
13class KernelCore; 13class KernelCore;
14class KReadableEvent; 14class KReadableEvent;
15class WritableEvent; 15class KWritableEvent;
16 16
17struct EventPair { 17struct EventPair {
18 std::shared_ptr<KReadableEvent> readable; 18 std::shared_ptr<KReadableEvent> readable;
19 std::shared_ptr<WritableEvent> writable; 19 std::shared_ptr<KWritableEvent> writable;
20}; 20};
21 21
22class WritableEvent final : public Object { 22class KWritableEvent final : public Object {
23public: 23public:
24 ~WritableEvent() override; 24 ~KWritableEvent() override;
25 25
26 /** 26 /**
27 * Creates an event 27 * Creates an event
@@ -50,7 +50,7 @@ public:
50 void Finalize() override {} 50 void Finalize() override {}
51 51
52private: 52private:
53 explicit WritableEvent(KernelCore& kernel); 53 explicit KWritableEvent(KernelCore& kernel);
54 54
55 std::shared_ptr<KReadableEvent> readable; 55 std::shared_ptr<KReadableEvent> readable;
56 56
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 1d2a2c321..f94eecbb8 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -32,6 +32,7 @@
32#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" 32#include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"
33#include "core/hle/kernel/k_synchronization_object.h" 33#include "core/hle/kernel/k_synchronization_object.h"
34#include "core/hle/kernel/k_thread.h" 34#include "core/hle/kernel/k_thread.h"
35#include "core/hle/kernel/k_writable_event.h"
35#include "core/hle/kernel/kernel.h" 36#include "core/hle/kernel/kernel.h"
36#include "core/hle/kernel/memory/memory_block.h" 37#include "core/hle/kernel/memory/memory_block.h"
37#include "core/hle/kernel/memory/memory_layout.h" 38#include "core/hle/kernel/memory/memory_layout.h"
@@ -45,7 +46,6 @@
45#include "core/hle/kernel/svc_wrap.h" 46#include "core/hle/kernel/svc_wrap.h"
46#include "core/hle/kernel/time_manager.h" 47#include "core/hle/kernel/time_manager.h"
47#include "core/hle/kernel/transfer_memory.h" 48#include "core/hle/kernel/transfer_memory.h"
48#include "core/hle/kernel/writable_event.h"
49#include "core/hle/lock.h" 49#include "core/hle/lock.h"
50#include "core/hle/result.h" 50#include "core/hle/result.h"
51#include "core/hle/service/service.h" 51#include "core/hle/service/service.h"
@@ -1871,7 +1871,7 @@ static ResultCode CreateEvent(Core::System& system, Handle* write_handle, Handle
1871 1871
1872 auto& kernel = system.Kernel(); 1872 auto& kernel = system.Kernel();
1873 const auto [readable_event, writable_event] = 1873 const auto [readable_event, writable_event] =
1874 WritableEvent::CreateEventPair(kernel, "CreateEvent"); 1874 KWritableEvent::CreateEventPair(kernel, "CreateEvent");
1875 1875
1876 HandleTable& handle_table = kernel.CurrentProcess()->GetHandleTable(); 1876 HandleTable& handle_table = kernel.CurrentProcess()->GetHandleTable();
1877 1877
@@ -1903,7 +1903,7 @@ static ResultCode ClearEvent(Core::System& system, Handle handle) {
1903 1903
1904 const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); 1904 const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();
1905 1905
1906 auto writable_event = handle_table.Get<WritableEvent>(handle); 1906 auto writable_event = handle_table.Get<KWritableEvent>(handle);
1907 if (writable_event) { 1907 if (writable_event) {
1908 writable_event->Clear(); 1908 writable_event->Clear();
1909 return RESULT_SUCCESS; 1909 return RESULT_SUCCESS;
@@ -1927,7 +1927,7 @@ static ResultCode SignalEvent(Core::System& system, Handle handle) {
1927 LOG_DEBUG(Kernel_SVC, "called. Handle=0x{:08X}", handle); 1927 LOG_DEBUG(Kernel_SVC, "called. Handle=0x{:08X}", handle);
1928 1928
1929 HandleTable& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); 1929 HandleTable& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();
1930 auto writable_event = handle_table.Get<WritableEvent>(handle); 1930 auto writable_event = handle_table.Get<KWritableEvent>(handle);
1931 1931
1932 if (!writable_event) { 1932 if (!writable_event) {
1933 LOG_ERROR(Kernel_SVC, "Non-existent writable event handle used (0x{:08X})", handle); 1933 LOG_ERROR(Kernel_SVC, "Non-existent writable event handle used (0x{:08X})", handle);