summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/timer.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2017-01-10 16:45:00 +0100
committerGitHub <noreply@github.com>2017-01-10 16:45:00 +0100
commit84d72fd92fcd737566efde0cb324c48dcd689997 (patch)
tree7b52cc1949f9dc89aaf8f338a4d29624ff82868e /src/core/hle/kernel/timer.cpp
parentMerge pull request #2418 from jroweboy/appveyor_master (diff)
parentKernel: Implemented Pulse event and timers. (diff)
downloadyuzu-84d72fd92fcd737566efde0cb324c48dcd689997.tar
yuzu-84d72fd92fcd737566efde0cb324c48dcd689997.tar.gz
yuzu-84d72fd92fcd737566efde0cb324c48dcd689997.tar.bz2
yuzu-84d72fd92fcd737566efde0cb324c48dcd689997.tar.lz
yuzu-84d72fd92fcd737566efde0cb324c48dcd689997.tar.xz
yuzu-84d72fd92fcd737566efde0cb324c48dcd689997.tar.zst
yuzu-84d72fd92fcd737566efde0cb324c48dcd689997.zip
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
-rw-r--r--src/core/hle/kernel/timer.cpp12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index 8f2bc4c7f..60537f355 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 =