aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/hle/kernel/timer.cpp
diff options
context:
space:
mode:
authorGravatar bunnei <bunneidev@gmail.com>2015-01-17 22:23:49 -0500
committerGravatar bunnei <bunneidev@gmail.com>2015-01-21 19:10:24 -0500
commitaa01c57ae9d73e41b65d37860ca6fbb91caba33a (patch)
tree904936860b1e8319ec5edc3a1e0e6c2c12f01d9f /src/core/hle/kernel/timer.cpp
parent627e96fc15f99eea0f1c5ccdb46d85cadb3efd69 (diff)
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.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp
index c97ae6c5..6497bb34 100644
--- a/src/core/hle/kernel/timer.cpp
+++ b/src/core/hle/kernel/timer.cpp
@@ -29,7 +29,7 @@ public:
u64 initial_delay; ///< The delay until the timer fires for the first time
u64 interval_delay; ///< The delay until the timer fires after the first time
- ResultVal<bool> WaitSynchronization(unsigned index) override {
+ ResultVal<bool> Wait(unsigned index) override {
bool wait = !signaled;
if (wait) {
AddWaitingThread(GetCurrentThread());
@@ -37,6 +37,10 @@ public:
}
return MakeResult<bool>(wait);
}
+
+ ResultVal<bool> Acquire() override {
+ return MakeResult<bool>(true);
+ }
};
/**