summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/timer.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2015-01-18 13:25:51 -0500
committerGravatar bunnei2015-01-21 20:47:38 -0500
commite5a9f1c64483e01b7856c581ae5685d0c5ad88dc (patch)
tree6ab483afc7aa00bdcff51f0d6b7015b9edd5e5bf /src/core/hle/kernel/timer.cpp
parentWaitSynchronizationN: Improved comments (diff)
downloadyuzu-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/timer.cpp')
-rw-r--r--src/core/hle/kernel/timer.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index 9f0fbafe2..62bdf07c7 100644
--- a/src/core/hle/kernel/timer.cpp
+++ b/src/core/hle/kernel/timer.cpp
@@ -29,13 +29,8 @@ 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> Wait(bool wait_thread) override { 32 ResultVal<bool> Wait() override {
33 bool wait = !signaled; 33 return MakeResult<bool>(!signaled);
34 if (wait && wait_thread) {
35 AddWaitingThread(GetCurrentThread());
36 Kernel::WaitCurrentThread_WaitSynchronization(WAITTYPE_TIMER, this);
37 }
38 return MakeResult<bool>(wait);
39 } 34 }
40 35
41 ResultVal<bool> Acquire() override { 36 ResultVal<bool> Acquire() override {