diff options
| author | 2015-05-20 17:51:34 -0700 | |
|---|---|---|
| committer | 2015-05-20 17:51:34 -0700 | |
| commit | 1b7596e779b00f2309a05bf12afc4695dd64e27b (patch) | |
| tree | f796aa2c461375435080c7a4068d68d7ebd60bad /src/core/hle/kernel/timer.cpp | |
| parent | Merge pull request #783 from jroweboy/cond-wait (diff) | |
| parent | y2r_u: Stub StartConversion to prevent moflex games from hanging. (diff) | |
| download | yuzu-1b7596e779b00f2309a05bf12afc4695dd64e27b.tar.gz yuzu-1b7596e779b00f2309a05bf12afc4695dd64e27b.tar.xz yuzu-1b7596e779b00f2309a05bf12afc4695dd64e27b.zip | |
Merge pull request #792 from bunnei/fix-zalbw
Thread reschedule and MOFLEX fixes
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index e69fece65..25d066bf1 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp | |||
| @@ -52,10 +52,14 @@ void Timer::Set(s64 initial, s64 interval) { | |||
| 52 | u64 initial_microseconds = initial / 1000; | 52 | u64 initial_microseconds = initial / 1000; |
| 53 | CoreTiming::ScheduleEvent(usToCycles(initial_microseconds), | 53 | CoreTiming::ScheduleEvent(usToCycles(initial_microseconds), |
| 54 | timer_callback_event_type, callback_handle); | 54 | timer_callback_event_type, callback_handle); |
| 55 | |||
| 56 | HLE::Reschedule(__func__); | ||
| 55 | } | 57 | } |
| 56 | 58 | ||
| 57 | void Timer::Cancel() { | 59 | void Timer::Cancel() { |
| 58 | CoreTiming::UnscheduleEvent(timer_callback_event_type, callback_handle); | 60 | CoreTiming::UnscheduleEvent(timer_callback_event_type, callback_handle); |
| 61 | |||
| 62 | HLE::Reschedule(__func__); | ||
| 59 | } | 63 | } |
| 60 | 64 | ||
| 61 | void Timer::Clear() { | 65 | void Timer::Clear() { |