diff options
author | Lioncash <mathew1800@gmail.com> | 2019-05-18 21:39:03 +0200 |
---|---|---|
committer | Lioncash <mathew1800@gmail.com> | 2019-05-18 21:52:51 +0200 |
commit | a47aaa7f1ba690196ebde1a6eb543b3f9895f4d9 (patch) | |
tree | b523ccbd6756b99060cf041c83590994b6d3126d /src/core/hle/kernel | |
parent | Merge pull request #2462 from lioncash/video-mm (diff) | |
download | yuzu-a47aaa7f1ba690196ebde1a6eb543b3f9895f4d9.tar yuzu-a47aaa7f1ba690196ebde1a6eb543b3f9895f4d9.tar.gz yuzu-a47aaa7f1ba690196ebde1a6eb543b3f9895f4d9.tar.bz2 yuzu-a47aaa7f1ba690196ebde1a6eb543b3f9895f4d9.tar.lz yuzu-a47aaa7f1ba690196ebde1a6eb543b3f9895f4d9.tar.xz yuzu-a47aaa7f1ba690196ebde1a6eb543b3f9895f4d9.tar.zst yuzu-a47aaa7f1ba690196ebde1a6eb543b3f9895f4d9.zip |
Diffstat (limited to '')
-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( auto& kernel = Core::System::GetInstance().Kernel(); if (!writable_event) { // Create event if not provided - const auto pair = WritableEvent::CreateEventPair(kernel, Kernel::ResetType::OneShot, + const auto pair = WritableEvent::CreateEventPair(kernel, ResetType::Automatic, "HLE Pause Event: " + reason); writable_event = pair.writable; } 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 { }; enum class ResetType { - OneShot, ///< Reset automatically on object acquisition - Sticky, ///< Never reset automatically + Automatic, ///< Reset automatically on object acquisition + Manual, ///< Never reset automatically }; 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 { void ReadableEvent::Acquire(Thread* thread) { ASSERT_MSG(!ShouldWait(thread), "object unavailable!"); - if (reset_type == ResetType::OneShot) + if (reset_type == ResetType::Automatic) { signaled = false; + } } 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 auto& kernel = system.Kernel(); const auto [readable_event, writable_event] = - WritableEvent::CreateEventPair(kernel, ResetType::Sticky, "CreateEvent"); + WritableEvent::CreateEventPair(kernel, ResetType::Manual, "CreateEvent"); HandleTable& handle_table = kernel.CurrentProcess()->GetHandleTable(); |