diff options
| author | Subv <subv2112@gmail.com> | 2017-01-01 16:53:22 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2017-01-04 15:58:45 -0500 |
| commit | e6a7723f2f4b62279cd4f6d4b48eb02a9b60ffb6 (patch) | |
| tree | b56862bb64fcf57727149de90318671ffd8afe4d /src/core/hle/kernel/timer.cpp | |
| parent | 38a90882a4230bb797ae3f6857e986d70f3bd265 (diff) | |
Kernel: Object ShouldWait and Acquire calls now take a thread as a parameter.
This will be useful when implementing mutex priority inheritance.
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 b50cf520df..8f2bc4c7f1 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) { return timer; } -bool Timer::ShouldWait() { +bool Timer::ShouldWait(Thread* thread) const { return !signaled; } -void Timer::Acquire() { - ASSERT_MSG(!ShouldWait(), "object unavailable!"); +void Timer::Acquire(Thread* thread) { + ASSERT_MSG(!ShouldWait(thread), "object unavailable!"); if (reset_type == ResetType::OneShot) signaled = false; |