diff options
| author | 2021-01-29 22:48:06 -0800 | |
|---|---|---|
| committer | 2021-02-05 14:00:36 -0800 | |
| commit | e86a7e36912b6f3fc64a594338d3c1ac768e3bb8 (patch) | |
| tree | 28c2d60179f1f4f798b5a572af2f8c6685fa4940 /src/core/hle/kernel | |
| parent | Merge pull request #5867 from Morph1984/am-GetHealthWarningDisappearedSystemE... (diff) | |
| download | yuzu-e86a7e36912b6f3fc64a594338d3c1ac768e3bb8.tar.gz yuzu-e86a7e36912b6f3fc64a594338d3c1ac768e3bb8.tar.xz yuzu-e86a7e36912b6f3fc64a594338d3c1ac768e3bb8.zip | |
hle: kernel: Rename ReadableEvent to KReadableEvent.
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/hle_ipc.h | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_readable_event.cpp (renamed from src/core/hle/kernel/readable_event.cpp) | 14 | ||||
| -rw-r--r-- | src/core/hle/kernel/k_readable_event.h (renamed from src/core/hle/kernel/readable_event.h) | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/writable_event.cpp | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/writable_event.h | 10 |
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 @@ | |||
| 17 | #include "core/hle/kernel/errors.h" | 17 | #include "core/hle/kernel/errors.h" |
| 18 | #include "core/hle/kernel/handle_table.h" | 18 | #include "core/hle/kernel/handle_table.h" |
| 19 | #include "core/hle/kernel/hle_ipc.h" | 19 | #include "core/hle/kernel/hle_ipc.h" |
| 20 | #include "core/hle/kernel/k_readable_event.h" | ||
| 20 | #include "core/hle/kernel/k_scheduler.h" | 21 | #include "core/hle/kernel/k_scheduler.h" |
| 21 | #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" | 22 | #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" |
| 22 | #include "core/hle/kernel/k_thread.h" | 23 | #include "core/hle/kernel/k_thread.h" |
| 23 | #include "core/hle/kernel/kernel.h" | 24 | #include "core/hle/kernel/kernel.h" |
| 24 | #include "core/hle/kernel/object.h" | 25 | #include "core/hle/kernel/object.h" |
| 25 | #include "core/hle/kernel/process.h" | 26 | #include "core/hle/kernel/process.h" |
| 26 | #include "core/hle/kernel/readable_event.h" | ||
| 27 | #include "core/hle/kernel/server_session.h" | 27 | #include "core/hle/kernel/server_session.h" |
| 28 | #include "core/hle/kernel/time_manager.h" | 28 | #include "core/hle/kernel/time_manager.h" |
| 29 | #include "core/hle/kernel/writable_event.h" | 29 | #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; | |||
| 41 | class Process; | 41 | class Process; |
| 42 | class ServerSession; | 42 | class ServerSession; |
| 43 | class KThread; | 43 | class KThread; |
| 44 | class ReadableEvent; | 44 | class KReadableEvent; |
| 45 | class WritableEvent; | 45 | class WritableEvent; |
| 46 | 46 | ||
| 47 | enum class ThreadWakeupReason; | 47 | 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 @@ | |||
| 6 | #include "common/assert.h" | 6 | #include "common/assert.h" |
| 7 | #include "common/logging/log.h" | 7 | #include "common/logging/log.h" |
| 8 | #include "core/hle/kernel/errors.h" | 8 | #include "core/hle/kernel/errors.h" |
| 9 | #include "core/hle/kernel/k_readable_event.h" | ||
| 9 | #include "core/hle/kernel/k_scheduler.h" | 10 | #include "core/hle/kernel/k_scheduler.h" |
| 10 | #include "core/hle/kernel/k_thread.h" | 11 | #include "core/hle/kernel/k_thread.h" |
| 11 | #include "core/hle/kernel/kernel.h" | 12 | #include "core/hle/kernel/kernel.h" |
| 12 | #include "core/hle/kernel/object.h" | 13 | #include "core/hle/kernel/object.h" |
| 13 | #include "core/hle/kernel/readable_event.h" | ||
| 14 | 14 | ||
| 15 | namespace Kernel { | 15 | namespace Kernel { |
| 16 | 16 | ||
| 17 | ReadableEvent::ReadableEvent(KernelCore& kernel) : KSynchronizationObject{kernel} {} | 17 | KReadableEvent::KReadableEvent(KernelCore& kernel) : KSynchronizationObject{kernel} {} |
| 18 | ReadableEvent::~ReadableEvent() = default; | 18 | KReadableEvent::~KReadableEvent() = default; |
| 19 | 19 | ||
| 20 | void ReadableEvent::Signal() { | 20 | void KReadableEvent::Signal() { |
| 21 | if (is_signaled) { | 21 | if (is_signaled) { |
| 22 | return; | 22 | return; |
| 23 | } | 23 | } |
| @@ -26,17 +26,17 @@ void ReadableEvent::Signal() { | |||
| 26 | NotifyAvailable(); | 26 | NotifyAvailable(); |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | bool ReadableEvent::IsSignaled() const { | 29 | bool KReadableEvent::IsSignaled() const { |
| 30 | ASSERT(kernel.GlobalSchedulerContext().IsLocked()); | 30 | ASSERT(kernel.GlobalSchedulerContext().IsLocked()); |
| 31 | 31 | ||
| 32 | return is_signaled; | 32 | return is_signaled; |
| 33 | } | 33 | } |
| 34 | 34 | ||
| 35 | void ReadableEvent::Clear() { | 35 | void KReadableEvent::Clear() { |
| 36 | is_signaled = false; | 36 | is_signaled = false; |
| 37 | } | 37 | } |
| 38 | 38 | ||
| 39 | ResultCode ReadableEvent::Reset() { | 39 | ResultCode KReadableEvent::Reset() { |
| 40 | KScopedSchedulerLock lock(kernel); | 40 | KScopedSchedulerLock lock(kernel); |
| 41 | if (!is_signaled) { | 41 | if (!is_signaled) { |
| 42 | LOG_TRACE(Kernel, "Handle is not signaled! object_id={}, object_type={}, object_name={}", | 42 | 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 { | |||
| 14 | class KernelCore; | 14 | class KernelCore; |
| 15 | class WritableEvent; | 15 | class WritableEvent; |
| 16 | 16 | ||
| 17 | class ReadableEvent final : public KSynchronizationObject { | 17 | class KReadableEvent final : public KSynchronizationObject { |
| 18 | friend class WritableEvent; | 18 | friend class WritableEvent; |
| 19 | 19 | ||
| 20 | public: | 20 | public: |
| 21 | ~ReadableEvent() override; | 21 | ~KReadableEvent() override; |
| 22 | 22 | ||
| 23 | std::string GetTypeName() const override { | 23 | std::string GetTypeName() const override { |
| 24 | return "ReadableEvent"; | 24 | return "ReadableEvent"; |
| @@ -50,7 +50,7 @@ public: | |||
| 50 | void Finalize() override {} | 50 | void Finalize() override {} |
| 51 | 51 | ||
| 52 | private: | 52 | private: |
| 53 | explicit ReadableEvent(KernelCore& kernel); | 53 | explicit KReadableEvent(KernelCore& kernel); |
| 54 | 54 | ||
| 55 | bool is_signaled{}; | 55 | bool is_signaled{}; |
| 56 | std::string name; ///< Name of event (optional) | 56 | 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 @@ | |||
| 26 | #include "core/hle/kernel/handle_table.h" | 26 | #include "core/hle/kernel/handle_table.h" |
| 27 | #include "core/hle/kernel/k_address_arbiter.h" | 27 | #include "core/hle/kernel/k_address_arbiter.h" |
| 28 | #include "core/hle/kernel/k_condition_variable.h" | 28 | #include "core/hle/kernel/k_condition_variable.h" |
| 29 | #include "core/hle/kernel/k_readable_event.h" | ||
| 29 | #include "core/hle/kernel/k_resource_limit.h" | 30 | #include "core/hle/kernel/k_resource_limit.h" |
| 30 | #include "core/hle/kernel/k_scheduler.h" | 31 | #include "core/hle/kernel/k_scheduler.h" |
| 31 | #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" | 32 | #include "core/hle/kernel/k_scoped_scheduler_lock_and_sleep.h" |
| @@ -37,7 +38,6 @@ | |||
| 37 | #include "core/hle/kernel/memory/page_table.h" | 38 | #include "core/hle/kernel/memory/page_table.h" |
| 38 | #include "core/hle/kernel/physical_core.h" | 39 | #include "core/hle/kernel/physical_core.h" |
| 39 | #include "core/hle/kernel/process.h" | 40 | #include "core/hle/kernel/process.h" |
| 40 | #include "core/hle/kernel/readable_event.h" | ||
| 41 | #include "core/hle/kernel/shared_memory.h" | 41 | #include "core/hle/kernel/shared_memory.h" |
| 42 | #include "core/hle/kernel/svc.h" | 42 | #include "core/hle/kernel/svc.h" |
| 43 | #include "core/hle/kernel/svc_results.h" | 43 | #include "core/hle/kernel/svc_results.h" |
| @@ -1727,7 +1727,7 @@ static ResultCode ResetSignal(Core::System& system, Handle handle) { | |||
| 1727 | 1727 | ||
| 1728 | const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); | 1728 | const auto& handle_table = system.Kernel().CurrentProcess()->GetHandleTable(); |
| 1729 | 1729 | ||
| 1730 | auto event = handle_table.Get<ReadableEvent>(handle); | 1730 | auto event = handle_table.Get<KReadableEvent>(handle); |
| 1731 | if (event) { | 1731 | if (event) { |
| 1732 | return event->Reset(); | 1732 | return event->Reset(); |
| 1733 | } | 1733 | } |
| @@ -1909,7 +1909,7 @@ static ResultCode ClearEvent(Core::System& system, Handle handle) { | |||
| 1909 | return RESULT_SUCCESS; | 1909 | return RESULT_SUCCESS; |
| 1910 | } | 1910 | } |
| 1911 | 1911 | ||
| 1912 | auto readable_event = handle_table.Get<ReadableEvent>(handle); | 1912 | auto readable_event = handle_table.Get<KReadableEvent>(handle); |
| 1913 | if (readable_event) { | 1913 | if (readable_event) { |
| 1914 | readable_event->Clear(); | 1914 | readable_event->Clear(); |
| 1915 | return RESULT_SUCCESS; | 1915 | 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 @@ | |||
| 4 | 4 | ||
| 5 | #include <algorithm> | 5 | #include <algorithm> |
| 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_thread.h" | 8 | #include "core/hle/kernel/k_thread.h" |
| 8 | #include "core/hle/kernel/kernel.h" | 9 | #include "core/hle/kernel/kernel.h" |
| 9 | #include "core/hle/kernel/object.h" | 10 | #include "core/hle/kernel/object.h" |
| 10 | #include "core/hle/kernel/readable_event.h" | ||
| 11 | #include "core/hle/kernel/writable_event.h" | 11 | #include "core/hle/kernel/writable_event.h" |
| 12 | 12 | ||
| 13 | namespace Kernel { | 13 | namespace Kernel { |
| @@ -17,7 +17,7 @@ WritableEvent::~WritableEvent() = default; | |||
| 17 | 17 | ||
| 18 | EventPair WritableEvent::CreateEventPair(KernelCore& kernel, std::string name) { | 18 | EventPair WritableEvent::CreateEventPair(KernelCore& kernel, std::string name) { |
| 19 | std::shared_ptr<WritableEvent> writable_event(new WritableEvent(kernel)); | 19 | std::shared_ptr<WritableEvent> writable_event(new WritableEvent(kernel)); |
| 20 | std::shared_ptr<ReadableEvent> readable_event(new ReadableEvent(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"; |
| 23 | writable_event->readable = readable_event; | 23 | writable_event->readable = readable_event; |
| @@ -26,7 +26,7 @@ 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 | ||
| 29 | std::shared_ptr<ReadableEvent> WritableEvent::GetReadableEvent() const { | 29 | std::shared_ptr<KReadableEvent> WritableEvent::GetReadableEvent() const { |
| 30 | return readable; | 30 | return readable; |
| 31 | } | 31 | } |
| 32 | 32 | ||
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 @@ | |||
| 1 | // Copyright 2014 Citra Emulator Project | 1 | // Copyright 2021 yuzu Emulator Project |
| 2 | // Licensed under GPLv2 or any later version | 2 | // Licensed under GPLv2 or any later version |
| 3 | // Refer to the license.txt file included. | 3 | // Refer to the license.txt file included. |
| 4 | 4 | ||
| @@ -11,11 +11,11 @@ | |||
| 11 | namespace Kernel { | 11 | namespace Kernel { |
| 12 | 12 | ||
| 13 | class KernelCore; | 13 | class KernelCore; |
| 14 | class ReadableEvent; | 14 | class KReadableEvent; |
| 15 | class WritableEvent; | 15 | class WritableEvent; |
| 16 | 16 | ||
| 17 | struct EventPair { | 17 | struct EventPair { |
| 18 | std::shared_ptr<ReadableEvent> readable; | 18 | std::shared_ptr<KReadableEvent> readable; |
| 19 | std::shared_ptr<WritableEvent> writable; | 19 | std::shared_ptr<WritableEvent> writable; |
| 20 | }; | 20 | }; |
| 21 | 21 | ||
| @@ -42,7 +42,7 @@ public: | |||
| 42 | return HANDLE_TYPE; | 42 | return HANDLE_TYPE; |
| 43 | } | 43 | } |
| 44 | 44 | ||
| 45 | std::shared_ptr<ReadableEvent> GetReadableEvent() const; | 45 | std::shared_ptr<KReadableEvent> GetReadableEvent() const; |
| 46 | 46 | ||
| 47 | void Signal(); | 47 | void Signal(); |
| 48 | void Clear(); | 48 | void Clear(); |
| @@ -52,7 +52,7 @@ public: | |||
| 52 | private: | 52 | private: |
| 53 | explicit WritableEvent(KernelCore& kernel); | 53 | explicit WritableEvent(KernelCore& kernel); |
| 54 | 54 | ||
| 55 | std::shared_ptr<ReadableEvent> readable; | 55 | std::shared_ptr<KReadableEvent> readable; |
| 56 | 56 | ||
| 57 | std::string name; ///< Name of event (optional) | 57 | std::string name; ///< Name of event (optional) |
| 58 | }; | 58 | }; |