diff options
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/object.h | 4 | ||||
| -rw-r--r-- | src/core/hle/kernel/readable_event.cpp | 3 | ||||
| -rw-r--r-- | src/core/hle/kernel/svc.cpp | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/core/hle/kernel/hle_ipc.cpp b/src/core/hle/kernel/hle_ipc.cpp index fe710eb6e..42d9dd844 100644 --- a/src/core/hle/kernel/hle_ipc.cpp +++ b/src/core/hle/kernel/hle_ipc.cpp | |||
| @@ -58,7 +58,7 @@ SharedPtr<WritableEvent> HLERequestContext::SleepClientThread( | |||
| 58 | auto& kernel = Core::System::GetInstance().Kernel(); | 58 | auto& kernel = Core::System::GetInstance().Kernel(); |
| 59 | if (!writable_event) { | 59 | if (!writable_event) { |
| 60 | // Create event if not provided | 60 | // Create event if not provided |
| 61 | const auto pair = WritableEvent::CreateEventPair(kernel, Kernel::ResetType::OneShot, | 61 | const auto pair = WritableEvent::CreateEventPair(kernel, ResetType::Automatic, |
| 62 | "HLE Pause Event: " + reason); | 62 | "HLE Pause Event: " + reason); |
| 63 | writable_event = pair.writable; | 63 | writable_event = pair.writable; |
| 64 | } | 64 | } |
diff --git a/src/core/hle/kernel/object.h b/src/core/hle/kernel/object.h index 332876c27..2821176a7 100644 --- a/src/core/hle/kernel/object.h +++ b/src/core/hle/kernel/object.h | |||
| @@ -33,8 +33,8 @@ enum class HandleType : u32 { | |||
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | enum class ResetType { | 35 | enum class ResetType { |
| 36 | OneShot, ///< Reset automatically on object acquisition | 36 | Automatic, ///< Reset automatically on object acquisition |
| 37 | Sticky, ///< Never reset automatically | 37 | Manual, ///< Never reset automatically |
| 38 | }; | 38 | }; |
| 39 | 39 | ||
| 40 | class Object : NonCopyable { | 40 | class Object : NonCopyable { |
diff --git a/src/core/hle/kernel/readable_event.cpp b/src/core/hle/kernel/readable_event.cpp index c2b798a4e..06463cd26 100644 --- a/src/core/hle/kernel/readable_event.cpp +++ b/src/core/hle/kernel/readable_event.cpp | |||
| @@ -21,8 +21,9 @@ bool ReadableEvent::ShouldWait(const Thread* thread) const { | |||
| 21 | void ReadableEvent::Acquire(Thread* thread) { | 21 | void ReadableEvent::Acquire(Thread* thread) { |
| 22 | ASSERT_MSG(!ShouldWait(thread), "object unavailable!"); | 22 | ASSERT_MSG(!ShouldWait(thread), "object unavailable!"); |
| 23 | 23 | ||
| 24 | if (reset_type == ResetType::OneShot) | 24 | if (reset_type == ResetType::Automatic) { |
| 25 | signaled = false; | 25 | signaled = false; |
| 26 | } | ||
| 26 | } | 27 | } |
| 27 | 28 | ||
| 28 | void ReadableEvent::Signal() { | 29 | void ReadableEvent::Signal() { |
diff --git a/src/core/hle/kernel/svc.cpp b/src/core/hle/kernel/svc.cpp index 2dcf174c5..a8801ca6d 100644 --- a/src/core/hle/kernel/svc.cpp +++ b/src/core/hle/kernel/svc.cpp | |||
| @@ -1980,7 +1980,7 @@ static ResultCode CreateEvent(Core::System& system, Handle* write_handle, Handle | |||
| 1980 | 1980 | ||
| 1981 | auto& kernel = system.Kernel(); | 1981 | auto& kernel = system.Kernel(); |
| 1982 | const auto [readable_event, writable_event] = | 1982 | const auto [readable_event, writable_event] = |
| 1983 | WritableEvent::CreateEventPair(kernel, ResetType::Sticky, "CreateEvent"); | 1983 | WritableEvent::CreateEventPair(kernel, ResetType::Manual, "CreateEvent"); |
| 1984 | 1984 | ||
| 1985 | HandleTable& handle_table = kernel.CurrentProcess()->GetHandleTable(); | 1985 | HandleTable& handle_table = kernel.CurrentProcess()->GetHandleTable(); |
| 1986 | 1986 | ||