From e52ca85711e8df54c8eafe556b6ba0ca683ddea0 Mon Sep 17 00:00:00 2001 From: Subv Date: Sun, 1 Jan 2017 19:23:19 -0500 Subject: Kernel: Implemented Pulse event and timers. Closes #1904 --- src/core/hle/kernel/event.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'src/core/hle/kernel/event.cpp') diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index 3e116e3df..a515f53f9 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp @@ -22,11 +22,6 @@ SharedPtr Event::Create(ResetType reset_type, std::string name) { evt->reset_type = reset_type; evt->name = std::move(name); - if (reset_type == ResetType::Pulse) { - LOG_ERROR(Kernel, "Unimplemented event reset type Pulse"); - UNIMPLEMENTED(); - } - return evt; } @@ -37,8 +32,7 @@ bool Event::ShouldWait() { void Event::Acquire() { ASSERT_MSG(!ShouldWait(), "object unavailable!"); - // Release the event if it's not sticky... - if (reset_type != ResetType::Sticky) + if (reset_type == ResetType::OneShot) signaled = false; } @@ -51,4 +45,11 @@ void Event::Clear() { signaled = false; } +void Event::WakeupAllWaitingThreads() { + WaitObject::WakeupAllWaitingThreads(); + + if (reset_type == ResetType::Pulse) + signaled = false; +} + } // namespace -- cgit v1.2.3