summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/timer.cpp
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-01-17 08:03:44 +0100
committerbunnei <bunneidev@gmail.com>2015-01-22 01:09:03 +0100
commit7faf2d8e06e705d1866fa0d7848ff43541a4b172 (patch)
tree7cca6433c6b06a1299af1193df2cedac7ad522c5 /src/core/hle/kernel/timer.cpp
parentEvent: Fixed some bugs and cleanup (Subv) (diff)
downloadyuzu-7faf2d8e06e705d1866fa0d7848ff43541a4b172.tar
yuzu-7faf2d8e06e705d1866fa0d7848ff43541a4b172.tar.gz
yuzu-7faf2d8e06e705d1866fa0d7848ff43541a4b172.tar.bz2
yuzu-7faf2d8e06e705d1866fa0d7848ff43541a4b172.tar.lz
yuzu-7faf2d8e06e705d1866fa0d7848ff43541a4b172.tar.xz
yuzu-7faf2d8e06e705d1866fa0d7848ff43541a4b172.tar.zst
yuzu-7faf2d8e06e705d1866fa0d7848ff43541a4b172.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/timer.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index 2d4fa4c01..c97ae6c5c 100644
--- a/src/core/hle/kernel/timer.cpp
+++ b/src/core/hle/kernel/timer.cpp
@@ -29,11 +29,11 @@ public:
u64 initial_delay; ///< The delay until the timer fires for the first time
u64 interval_delay; ///< The delay until the timer fires after the first time
- ResultVal<bool> WaitSynchronization() override {
+ ResultVal<bool> WaitSynchronization(unsigned index) override {
bool wait = !signaled;
if (wait) {
AddWaitingThread(GetCurrentThread());
- Kernel::WaitCurrentThread(WAITTYPE_TIMER, this);
+ Kernel::WaitCurrentThread_WaitSynchronization(WAITTYPE_TIMER, this, index);
}
return MakeResult<bool>(wait);
}
@@ -91,7 +91,7 @@ static void TimerCallback(u64 timer_handle, int cycles_late) {
timer->signaled = true;
// Resume all waiting threads
- timer->ResumeAllWaitingThreads();
+ timer->ReleaseAllWaitingThreads();
if (timer->reset_type == RESETTYPE_ONESHOT)
timer->signaled = false;