diff options
| author | 2015-01-18 13:25:51 -0500 | |
|---|---|---|
| committer | 2015-01-21 20:47:38 -0500 | |
| commit | e5a9f1c64483e01b7856c581ae5685d0c5ad88dc (patch) | |
| tree | 6ab483afc7aa00bdcff51f0d6b7015b9edd5e5bf /src/core/hle/kernel/event.cpp | |
| parent | WaitSynchronizationN: Improved comments (diff) | |
| download | yuzu-e5a9f1c64483e01b7856c581ae5685d0c5ad88dc.tar.gz yuzu-e5a9f1c64483e01b7856c581ae5685d0c5ad88dc.tar.xz yuzu-e5a9f1c64483e01b7856c581ae5685d0c5ad88dc.zip | |
Kernel: Get rid of WaitTypes and simplify lots of code, removing hacks.
Diffstat (limited to 'src/core/hle/kernel/event.cpp')
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index ae9b06b84..399730cb1 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp | |||
| @@ -28,13 +28,8 @@ 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> Wait(bool wait_thread) override { | 31 | ResultVal<bool> Wait() override { |
| 32 | bool wait = !signaled; | 32 | return MakeResult<bool>(!signaled); |
| 33 | if (wait && wait_thread) { | ||
| 34 | AddWaitingThread(GetCurrentThread()); | ||
| 35 | Kernel::WaitCurrentThread_WaitSynchronization(WAITTYPE_EVENT, this); | ||
| 36 | } | ||
| 37 | return MakeResult<bool>(wait); | ||
| 38 | } | 33 | } |
| 39 | 34 | ||
| 40 | ResultVal<bool> Acquire() override { | 35 | ResultVal<bool> Acquire() override { |