7 files changed, 23 insertions, 23 deletions

diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp
index c7b10ca7a..93b9f793e 100644
--- a/src/core/hle/kernel/hle_ipc.cpp
+++ b/src/core/hle/kernel/hle_ipc.cpp
@@ -17,13 +17,13 @@
 #include "core/hle/kernel/errors.h"
 #include "core/hle/kernel/handle_table.h"
 #include "core/hle/kernel/hle_ipc.h"
+#include "core/hle/kernel/k_readable_event.h"
 #include "core/hle/kernel/k_scheduler.h"
 #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"
 #include "core/hle/kernel/k_thread.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/object.h"
 #include "core/hle/kernel/process.h"
-#include "core/hle/kernel/readable_event.h"
 #include "core/hle/kernel/server_session.h"
 #include "core/hle/kernel/time_manager.h"
 #include "core/hle/kernel/writable_event.h"
diff --git a/src/core/hle/kernel/hle_ipc.h b/src/core/hle/kernel/hle_ipc.h
index 9f764c79a..89ae2a329 100644
--- a/src/core/hle/kernel/hle_ipc.h
+++ b/src/core/hle/kernel/hle_ipc.h
@@ -41,7 +41,7 @@ class KernelCore;
 class Process;
 class ServerSession;
 class KThread;
-class ReadableEvent;
+class KReadableEvent;
 class WritableEvent;
 
 enum class ThreadWakeupReason;
diff --git a/src/core/hle/kernel/readable_event.cpp b/src/core/hle/kernel/k_readable_event.cpp
index 596d01479..e9e191bc6 100644
--- a/src/core/hle/kernel/readable_event.cpp
+++ b/src/core/hle/kernel/k_readable_event.cpp
@@ -6,18 +6,18 @@
 #include "common/assert.h"
 #include "common/logging/log.h"
 #include "core/hle/kernel/errors.h"
+#include "core/hle/kernel/k_readable_event.h"
 #include "core/hle/kernel/k_scheduler.h"
 #include "core/hle/kernel/k_thread.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/object.h"
-#include "core/hle/kernel/readable_event.h"
 
 namespace Kernel {
 
-ReadableEvent::ReadableEvent(KernelCore& kernel) : KSynchronizationObject{kernel} {}
-ReadableEvent::~ReadableEvent() = default;
+KReadableEvent::KReadableEvent(KernelCore& kernel) : KSynchronizationObject{kernel} {}
+KReadableEvent::~KReadableEvent() = default;
 
-void ReadableEvent::Signal() {
+void KReadableEvent::Signal() {
     if (is_signaled) {
         return;
     }
@@ -26,17 +26,17 @@ void ReadableEvent::Signal() {
     NotifyAvailable();
 }
 
-bool ReadableEvent::IsSignaled() const {
+bool KReadableEvent::IsSignaled() const {
     ASSERT(kernel.GlobalSchedulerContext().IsLocked());
 
     return is_signaled;
 }
 
-void ReadableEvent::Clear() {
+void KReadableEvent::Clear() {
     is_signaled = false;
 }
 
-ResultCode ReadableEvent::Reset() {
+ResultCode KReadableEvent::Reset() {
     KScopedSchedulerLock lock(kernel);
     if (!is_signaled) {
         LOG_TRACE(Kernel, "Handle is not signaled! object_id={}, object_type={}, object_name={}",
diff --git a/src/core/hle/kernel/readable_event.h b/src/core/hle/kernel/k_readable_event.h
index 2195710c2..50dfc60d3 100644
--- a/src/core/hle/kernel/readable_event.h
+++ b/src/core/hle/kernel/k_readable_event.h
@@ -14,11 +14,11 @@ namespace Kernel {
 class KernelCore;
 class WritableEvent;
 
-class ReadableEvent final : public KSynchronizationObject {
+class KReadableEvent final : public KSynchronizationObject {
     friend class WritableEvent;
 
 public:
-    ~ReadableEvent() override;
+    ~KReadableEvent() override;
 
     std::string GetTypeName() const override {
         return "ReadableEvent";
@@ -50,7 +50,7 @@ public:
     void Finalize() override {}
 
 private:
-    explicit ReadableEvent(KernelCore& kernel);
+    explicit KReadableEvent(KernelCore& kernel);
 
     bool is_signaled{};
     std::string name; ///< Name of event (optional)
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp
index 74eb90100..1d2a2c321 100644
--- a/src/core/hle/kernel/svc.cpp
+++ b/src/core/hle/kernel/svc.cpp
@@ -26,6 +26,7 @@
 #include "core/hle/kernel/handle_table.h"
 #include "core/hle/kernel/k_address_arbiter.h"
 #include "core/hle/kernel/k_condition_variable.h"
+#include "core/hle/kernel/k_readable_event.h"
 #include "core/hle/kernel/k_resource_limit.h"
 #include "core/hle/kernel/k_scheduler.h"
 #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h"
@@ -37,7 +38,6 @@
 #include "core/hle/kernel/memory/page_table.h"
 #include "core/hle/kernel/physical_core.h"
 #include "core/hle/kernel/process.h"
-#include "core/hle/kernel/readable_event.h"
 #include "core/hle/kernel/shared_memory.h"
 #include "core/hle/kernel/svc.h"
 #include "core/hle/kernel/svc_results.h"
@@ -1727,7 +1727,7 @@ static ResultCode ResetSignal(Core::System& system, Handle handle) {
 
     const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable();
 
-    auto event = handle_table.Get<ReadableEvent>(handle);
+    auto event = handle_table.Get<KReadableEvent>(handle);
     if (event) {
         return event->Reset();
     }
@@ -1909,7 +1909,7 @@ static ResultCode ClearEvent(Core::System& system, Handle handle) {
         return RESULT_SUCCESS;
     }
 
-    auto readable_event = handle_table.Get<ReadableEvent>(handle);
+    auto readable_event = handle_table.Get<KReadableEvent>(handle);
     if (readable_event) {
         readable_event->Clear();
         return RESULT_SUCCESS;
diff --git a/src/core/hle/kernel/writable_event.cpp b/src/core/hle/kernel/writable_event.cpp
index 142212ee4..0d261e6e8 100644
--- a/src/core/hle/kernel/writable_event.cpp
+++ b/src/core/hle/kernel/writable_event.cpp
@@ -4,10 +4,10 @@
 
 #include <algorithm>
 #include "common/assert.h"
+#include "core/hle/kernel/k_readable_event.h"
 #include "core/hle/kernel/k_thread.h"
 #include "core/hle/kernel/kernel.h"
 #include "core/hle/kernel/object.h"
-#include "core/hle/kernel/readable_event.h"
 #include "core/hle/kernel/writable_event.h"
 
 namespace Kernel {
@@ -17,7 +17,7 @@ WritableEvent::~WritableEvent() = default;
 
 EventPair WritableEvent::CreateEventPair(KernelCore& kernel, std::string name) {
     std::shared_ptr<WritableEvent> writable_event(new WritableEvent(kernel));
-    std::shared_ptr<ReadableEvent> readable_event(new ReadableEvent(kernel));
+    std::shared_ptr<KReadableEvent> readable_event(new KReadableEvent(kernel));
 
     writable_event->name = name + ":Writable";
     writable_event->readable = readable_event;
@@ -26,7 +26,7 @@ EventPair WritableEvent::CreateEventPair(KernelCore& kernel, std::string name) {
     return {std::move(readable_event), std::move(writable_event)};
 }
 
-std::shared_ptr<ReadableEvent> WritableEvent::GetReadableEvent() const {
+std::shared_ptr<KReadableEvent> WritableEvent::GetReadableEvent() const {
     return readable;
 }
 
diff --git a/src/core/hle/kernel/writable_event.h b/src/core/hle/kernel/writable_event.h
index 467eb2c21..b288267c5 100644
--- a/src/core/hle/kernel/writable_event.h
+++ b/src/core/hle/kernel/writable_event.h
@@ -1,4 +1,4 @@
-// Copyright 2014 Citra Emulator Project
+// Copyright 2021 yuzu Emulator Project
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
@@ -11,11 +11,11 @@
 namespace Kernel {
 
 class KernelCore;
-class ReadableEvent;
+class KReadableEvent;
 class WritableEvent;
 
 struct EventPair {
-    std::shared_ptr<ReadableEvent> readable;
+    std::shared_ptr<KReadableEvent> readable;
     std::shared_ptr<WritableEvent> writable;
 };
 
@@ -42,7 +42,7 @@ public:
         return HANDLE_TYPE;
     }
 
-    std::shared_ptr<ReadableEvent> GetReadableEvent() const;
+    std::shared_ptr<KReadableEvent> GetReadableEvent() const;
 
     void Signal();
     void Clear();
@@ -52,7 +52,7 @@ public:
 private:
     explicit WritableEvent(KernelCore& kernel);
 
-    std::shared_ptr<ReadableEvent> readable;
+    std::shared_ptr<KReadableEvent> readable;
 
     std::string name; ///< Name of event (optional)
 };