yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #1306 from Subv/sync 

HLE/Timers: Reset OneShot timers when they are acquired instead of when they're triggered
This commit is contained in:
bunnei 2015-12-29 22:36:29 -05:00
parent 8a24214b46 6cccc36505
commit 4bc961d5fd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/hle/kernel/timer.cpp
View File

@ -42,6 +42,9 @@ bool Timer::ShouldWait() {
void Timer::Acquire() { void Timer::Acquire() {
ASSERT_MSG( !ShouldWait(), "object unavailable!"); ASSERT_MSG( !ShouldWait(), "object unavailable!");
if (reset_type == RESETTYPE_ONESHOT)
signaled = false;
} }
void Timer::Set(s64 initial, s64 interval) { void Timer::Set(s64 initial, s64 interval) {
@ -84,9 +87,6 @@ static void TimerCallback(u64 timer_handle, int cycles_late) {
// Resume all waiting threads // Resume all waiting threads
timer->WakeupAllWaitingThreads(); timer->WakeupAllWaitingThreads();
if (timer->reset_type == RESETTYPE_ONESHOT)
timer->signaled = false;
if (timer->interval_delay != 0) { if (timer->interval_delay != 0) {
// Reschedule the timer with the interval delay // Reschedule the timer with the interval delay
u64 interval_microseconds = timer->interval_delay / 1000; u64 interval_microseconds = timer->interval_delay / 1000;