diff options
| author | 2015-01-17 22:23:49 -0500 | |
|---|---|---|
| committer | 2015-01-21 19:10:24 -0500 | |
| commit | aa01c57ae9d73e41b65d37860ca6fbb91caba33a (patch) | |
| tree | 904936860b1e8319ec5edc3a1e0e6c2c12f01d9f /src/core/hle/kernel/timer.cpp | |
| parent | WaitSynchronizationN: Handle case where handles=nullptr. (diff) | |
| download | yuzu-aa01c57ae9d73e41b65d37860ca6fbb91caba33a.tar.gz yuzu-aa01c57ae9d73e41b65d37860ca6fbb91caba33a.tar.xz yuzu-aa01c57ae9d73e41b65d37860ca6fbb91caba33a.zip | |
Kernel: Separate WaitSynchronization into Wait and Acquire methods.
Diffstat (limited to 'src/core/hle/kernel/timer.cpp')
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index c97ae6c5c..6497bb349 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp | |||
| @@ -29,7 +29,7 @@ public: | |||
| 29 | u64 initial_delay; ///< The delay until the timer fires for the first time | 29 | u64 initial_delay; ///< The delay until the timer fires for the first time |
| 30 | u64 interval_delay; ///< The delay until the timer fires after the first time | 30 | u64 interval_delay; ///< The delay until the timer fires after the first time |
| 31 | 31 | ||
| 32 | ResultVal<bool> WaitSynchronization(unsigned index) override { | 32 | ResultVal<bool> Wait(unsigned index) override { |
| 33 | bool wait = !signaled; | 33 | bool wait = !signaled; |
| 34 | if (wait) { | 34 | if (wait) { |
| 35 | AddWaitingThread(GetCurrentThread()); | 35 | AddWaitingThread(GetCurrentThread()); |
| @@ -37,6 +37,10 @@ public: | |||
| 37 | } | 37 | } |
| 38 | return MakeResult<bool>(wait); | 38 | return MakeResult<bool>(wait); |
| 39 | } | 39 | } |
| 40 | |||
| 41 | ResultVal<bool> Acquire() override { | ||
| 42 | return MakeResult<bool>(true); | ||
| 43 | } | ||
| 40 | }; | 44 | }; |
| 41 | 45 | ||
| 42 | /** | 46 | /** |