aboutsummaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/readable_event.cpp
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2019-05-18 15:39:03 -0400
committerLioncash <mathew1800@gmail.com>2019-05-18 15:52:51 -0400
commit45d71eed4fa4fe799aee72b859141b4c53334175 (patch)
treeb523ccbd6756b99060cf041c83590994b6d3126d /src/core/hle/kernel/readable_event.cpp
parent9415bf9da58f2c848fa0f1b7704a869462926a52 (diff)
core/kernel/object: Rename ResetType enum members
Renames the members to more accurately indicate what they signify. "OneShot" and "Sticky" are kind of ambiguous identifiers for the reset types, and can be kind of misleading. Automatic and Manual communicate the kind of reset type in a clearer manner. Either the event is automatically reset, or it isn't and must be manually cleared. The "OneShot" and "Sticky" terminology is just a hold-over from Citra where the kernel had a third type of event reset type known as "Pulse". Given the Switch kernel only has two forms of event reset types, we don't need to keep the old terminology around anymore.
Diffstat (limited to 'src/core/hle/kernel/readable_event.cpp')
-rw-r--r--src/core/hle/kernel/readable_event.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/core/hle/kernel/readable_event.cpp b/src/core/hle/kernel/readable_event.cpp
index c2b798a4e7..06463cd264 100644
--- a/src/core/hle/kernel/readable_event.cpp
+++ b/src/core/hle/kernel/readable_event.cpp
@@ -21,8 +21,9 @@ bool ReadableEvent::ShouldWait(const Thread* thread) const {
void ReadableEvent::Acquire(Thread* thread) {
ASSERT_MSG(!ShouldWait(thread), "object unavailable!");
- if (reset_type == ResetType::OneShot)
+ if (reset_type == ResetType::Automatic) {
signaled = false;
+ }
}
void ReadableEvent::Signal() {