diff options
| author |  Sebastian Valle | 2017-01-05 12:55:01 -0500 |
|---|---|---|
| committer |  GitHub | 2017-01-05 12:55:01 -0500 |
| commit | f20d872643654c574f73a263f032613046900f07 (patch) | |
| tree | 021284c18034d053c81928fa19d2efb6658451fb /src/core/hle/kernel/timer.h | |
| parent | Merge pull request #2407 from jroweboy/nightly-deploy (diff) | |
| parent | Kernel: Add some asserts to enforce the invariants in the scheduler. (diff) | |
| download | yuzu-f20d872643654c574f73a263f032613046900f07.tar.gz yuzu-f20d872643654c574f73a263f032613046900f07.tar.xz yuzu-f20d872643654c574f73a263f032613046900f07.zip | |
Merge pull request #2393 from Subv/synch
Kernel: Mutex priority inheritance and synchronization improvements.
Diffstat (limited to 'src/core/hle/kernel/timer.h')
| -rw-r--r-- | src/core/hle/kernel/timer.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h index 18ea0236b..2e3b31b23 100644 --- a/src/core/hle/kernel/timer.h +++ b/src/core/hle/kernel/timer.h | |||
| @@ -39,8 +39,8 @@ public: | |||
| 39 | u64 initial_delay; ///< The delay until the timer fires for the first time | 39 | u64 initial_delay; ///< The delay until the timer fires for the first time |
| 40 | u64 interval_delay; ///< The delay until the timer fires after the first time | 40 | u64 interval_delay; ///< The delay until the timer fires after the first time |
| 41 | 41 | ||
| 42 | bool ShouldWait() override; | 42 | bool ShouldWait(Thread* thread) const override; |
| 43 | void Acquire() override; | 43 | void Acquire(Thread* thread) override; |
| 44 | 44 | ||
| 45 | /** | 45 | /** |
| 46 | * Starts the timer, with the specified initial delay and interval. | 46 | * Starts the timer, with the specified initial delay and interval. |