diff options
| author | 2015-01-17 02:03:44 -0500 | |
|---|---|---|
| committer | 2015-01-21 19:09:03 -0500 | |
| commit | 7faf2d8e06e705d1866fa0d7848ff43541a4b172 (patch) | |
| tree | 7cca6433c6b06a1299af1193df2cedac7ad522c5 /src/core/hle/kernel/timer.cpp | |
| parent | Event: Fixed some bugs and cleanup (Subv) (diff) | |
| download | yuzu-7faf2d8e06e705d1866fa0d7848ff43541a4b172.tar.gz yuzu-7faf2d8e06e705d1866fa0d7848ff43541a4b172.tar.xz yuzu-7faf2d8e06e705d1866fa0d7848ff43541a4b172.zip | |
WaitSynchronizationN: Implement return values
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 6 |
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: | |||
| 29 | u64 initial_delay; ///< The delay until the timer fires for the first time | 29 | u64 initial_delay; ///< The delay until the timer fires for the first time |
| 30 | u64 interval_delay; ///< The delay until the timer fires after the first time | 30 | u64 interval_delay; ///< The delay until the timer fires after the first time |
| 31 | 31 | ||
| 32 | ResultVal<bool> WaitSynchronization() override { | 32 | ResultVal<bool> WaitSynchronization(unsigned index) override { |
| 33 | bool wait = !signaled; | 33 | bool wait = !signaled; |
| 34 | if (wait) { | 34 | if (wait) { |
| 35 | AddWaitingThread(GetCurrentThread()); | 35 | AddWaitingThread(GetCurrentThread()); |
| 36 | Kernel::WaitCurrentThread(WAITTYPE_TIMER, this); | 36 | Kernel::WaitCurrentThread_WaitSynchronization(WAITTYPE_TIMER, this, index); |
| 37 | } | 37 | } |
| 38 | return MakeResult<bool>(wait); | 38 | return MakeResult<bool>(wait); |
| 39 | } | 39 | } |
| @@ -91,7 +91,7 @@ static void TimerCallback(u64 timer_handle, int cycles_late) { | |||
| 91 | timer->signaled = true; | 91 | timer->signaled = true; |
| 92 | 92 | ||
| 93 | // Resume all waiting threads | 93 | // Resume all waiting threads |
| 94 | timer->ResumeAllWaitingThreads(); | 94 | timer->ReleaseAllWaitingThreads(); |
| 95 | 95 | ||
| 96 | if (timer->reset_type == RESETTYPE_ONESHOT) | 96 | if (timer->reset_type == RESETTYPE_ONESHOT) |
| 97 | timer->signaled = false; | 97 | timer->signaled = false; |