diff options
| author | 2016-03-12 21:47:41 -0500 | |
|---|---|---|
| committer | 2016-03-12 21:47:41 -0500 | |
| commit | 856a1d0386099f6311e4fb9cca345142fc22330a (patch) | |
| tree | 5c06aa00ad880a09ff1c227e0ed5da0901d3ef63 /src/core/hle/kernel | |
| parent | svc: Remove unused ArbitrationType enum (diff) | |
| download | yuzu-856a1d0386099f6311e4fb9cca345142fc22330a.tar.gz yuzu-856a1d0386099f6311e4fb9cca345142fc22330a.tar.xz yuzu-856a1d0386099f6311e4fb9cca345142fc22330a.zip | |
svc: Move ResetType enum to the kernel event header
Diffstat (limited to 'src/core/hle/kernel')
| -rw-r--r-- | src/core/hle/kernel/event.h | 8 | ||||
| -rw-r--r-- | src/core/hle/kernel/timer.h | 2 |
2 files changed, 8 insertions, 2 deletions
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 @@ | |||
| 7 | #include "common/common_types.h" | 7 | #include "common/common_types.h" |
| 8 | 8 | ||
| 9 | #include "core/hle/kernel/kernel.h" | 9 | #include "core/hle/kernel/kernel.h" |
| 10 | #include "core/hle/svc.h" | ||
| 11 | 10 | ||
| 12 | namespace Kernel { | 11 | namespace Kernel { |
| 13 | 12 | ||
| 13 | enum class ResetType { | ||
| 14 | OneShot, | ||
| 15 | Sticky, | ||
| 16 | Pulse, | ||
| 17 | }; | ||
| 18 | |||
| 19 | |||
| 14 | class Event final : public WaitObject { | 20 | class Event final : public WaitObject { |
| 15 | public: | 21 | public: |
| 16 | /** | 22 | /** |
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 @@ | |||
| 6 | 6 | ||
| 7 | #include "common/common_types.h" | 7 | #include "common/common_types.h" |
| 8 | 8 | ||
| 9 | #include "core/hle/kernel/event.h" | ||
| 9 | #include "core/hle/kernel/kernel.h" | 10 | #include "core/hle/kernel/kernel.h" |
| 10 | #include "core/hle/svc.h" | ||
| 11 | 11 | ||
| 12 | namespace Kernel { | 12 | namespace Kernel { |
| 13 | 13 | ||