diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-03-13 04:46:05 +0100 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2016-03-13 04:46:05 +0100 |
| commit | 7f8c99899bce49475908c3974433a51044f36e19 (patch) | |
| tree | 5c06aa00ad880a09ff1c227e0ed5da0901d3ef63 /src/core/hle/kernel | |
| parent | Merge pull request #1266 from Subv/miiapplet (diff) | |
| parent | svc: Move ResetType enum to the kernel event header (diff) | |
| download | yuzu-7f8c99899bce49475908c3974433a51044f36e19.tar yuzu-7f8c99899bce49475908c3974433a51044f36e19.tar.gz yuzu-7f8c99899bce49475908c3974433a51044f36e19.tar.bz2 yuzu-7f8c99899bce49475908c3974433a51044f36e19.tar.lz yuzu-7f8c99899bce49475908c3974433a51044f36e19.tar.xz yuzu-7f8c99899bce49475908c3974433a51044f36e19.tar.zst yuzu-7f8c99899bce49475908c3974433a51044f36e19.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/event.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/event.h | 8 | ||||
| -rw-r--r-- | src/core/hle/kernel/timer.cpp | 2 | ||||
| -rw-r--r-- | src/core/hle/kernel/timer.h | 2 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/core/hle/kernel/event.cpp b/src/core/hle/kernel/event.cpp index 53feebbc0..2b7c6992a 100644 --- a/src/core/hle/kernel/event.cpp +++ b/src/core/hle/kernel/event.cpp @@ -35,7 +35,7 @@ void Event::Acquire() { ASSERT_MSG(!ShouldWait(), "object unavailable!"); // Release the event if it's not sticky... - if (reset_type != RESETTYPE_STICKY) + if (reset_type != ResetType::Sticky) signaled = false; } diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h index 89d405236..73d0da419 100644 --- a/src/core/hle/kernel/event.h +++ b/src/core/hle/kernel/event.h @@ -7,10 +7,16 @@ #include "common/common_types.h" #include "core/hle/kernel/kernel.h" -#include "core/hle/svc.h" namespace Kernel { +enum class ResetType { + OneShot, + Sticky, + Pulse, +}; + + class Event final : public WaitObject { public: /** diff --git a/src/core/hle/kernel/timer.cpp b/src/core/hle/kernel/timer.cpp index ce6bbd719..b8daaeede 100644 --- a/src/core/hle/kernel/timer.cpp +++ b/src/core/hle/kernel/timer.cpp @@ -43,7 +43,7 @@ bool Timer::ShouldWait() { void Timer::Acquire() { ASSERT_MSG( !ShouldWait(), "object unavailable!"); - if (reset_type == RESETTYPE_ONESHOT) + if (reset_type == ResetType::OneShot) signaled = false; } diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h index 540e4e187..b1db60e8f 100644 --- a/src/core/hle/kernel/timer.h +++ b/src/core/hle/kernel/timer.h @@ -6,8 +6,8 @@ #include "common/common_types.h" +#include "core/hle/kernel/event.h" #include "core/hle/kernel/kernel.h" -#include "core/hle/svc.h" namespace Kernel { |