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.cpp | |
| 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.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 b50cf520d..8f2bc4c7f 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp | |||
| @@ -39,12 +39,12 @@ SharedPtr<Timer> Timer::Create(ResetType reset_type, std::string name) { | |||
| 39 | return timer; | 39 | return timer; |
| 40 | } | 40 | } |
| 41 | 41 | ||
| 42 | bool Timer::ShouldWait() { | 42 | bool Timer::ShouldWait(Thread* thread) const { |
| 43 | return !signaled; | 43 | return !signaled; |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | void Timer::Acquire() { | 46 | void Timer::Acquire(Thread* thread) { |
| 47 | ASSERT_MSG(!ShouldWait(), "object unavailable!"); | 47 | ASSERT_MSG(!ShouldWait(thread), "object unavailable!"); |
| 48 | 48 | ||
| 49 | if (reset_type == ResetType::OneShot) | 49 | if (reset_type == ResetType::OneShot) |
| 50 | signaled = false; | 50 | signaled = false; |