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/event.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/event.cpp')
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index 4173a980b..41e1bd6c5 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp | |||
| @@ -28,7 +28,7 @@ public: | |||
| 28 | bool signaled; ///< Whether the event has already been signaled | 28 | bool signaled; ///< Whether the event has already been signaled |
| 29 | std::string name; ///< Name of event (optional) | 29 | std::string name; ///< Name of event (optional) |
| 30 | 30 | ||
| 31 | ResultVal<bool> WaitSynchronization(unsigned index) override { | 31 | ResultVal<bool> Wait(unsigned index) override { |
| 32 | bool wait = !signaled; | 32 | bool wait = !signaled; |
| 33 | if (wait) { | 33 | if (wait) { |
| 34 | AddWaitingThread(GetCurrentThread()); | 34 | AddWaitingThread(GetCurrentThread()); |
| @@ -36,6 +36,10 @@ public: | |||
| 36 | } | 36 | } |
| 37 | return MakeResult<bool>(wait); | 37 | return MakeResult<bool>(wait); |
| 38 | } | 38 | } |
| 39 | |||
| 40 | ResultVal<bool> Acquire() override { | ||
| 41 | return MakeResult<bool>(true); | ||
| 42 | } | ||
| 39 | }; | 43 | }; |
| 40 | 44 | ||
| 41 | ResultCode SignalEvent(const Handle handle) { | 45 | ResultCode SignalEvent(const Handle handle) { |