diff options
| author | bunnei <bunneidev@gmail.com> | 2017-01-10 10:45:00 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-10 10:45:00 -0500 |
| commit | 84d72fd92fcd737566efde0cb324c48dcd689997 (patch) | |
| tree | 7b52cc1949f9dc89aaf8f338a4d29624ff82868e /src/core/hle/kernel/timer.cpp | |
| parent | 0ae7092ba4aadd80cfd67111a5635e108f0f943b (diff) | |
| parent | e52ca85711e8df54c8eafe556b6ba0ca683ddea0 (diff) | |
Merge pull request #2397 from Subv/pulse
Kernel: Implemented Pulse event and timers.
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index 8f2bc4c7f1..60537f3550 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -31,11 +31,6 @@ SharedPtr<Timer> Timer::Create(ResetType reset_type, std::string name) { timer->interval_delay = 0; timer->callback_handle = timer_callback_handle_table.Create(timer).MoveFrom(); - if (reset_type == ResetType::Pulse) { - LOG_ERROR(Kernel, "Unimplemented timer reset type Pulse"); - UNIMPLEMENTED(); - } - return timer; } @@ -70,6 +65,13 @@ void Timer::Clear() { signaled = false; } +void Timer::WakeupAllWaitingThreads() { + WaitObject::WakeupAllWaitingThreads(); + + if (reset_type == ResetType::Pulse) + signaled = false; +} + /// The timer callback event, called when a timer is fired static void TimerCallback(u64 timer_handle, int cycles_late) { SharedPtr<Timer> timer = |