diff options
| author | 2016-05-25 13:36:15 +0300 | |
|---|---|---|
| committer | 2016-09-22 13:52:52 +0800 | |
| commit | 85a83158fbee48f9281f7e3c60c461d7f73c3a1b (patch) | |
| tree | 9be0daadc33b15c4a2558f8ce16f5636e8390ed8 | |
| parent | name objects (diff) | |
| download | yuzu-85a83158fbee48f9281f7e3c60c461d7f73c3a1b.tar.gz yuzu-85a83158fbee48f9281f7e3c60c461d7f73c3a1b.tar.xz yuzu-85a83158fbee48f9281f7e3c60c461d7f73c3a1b.zip | |
move ResetType to kernel.h
Diffstat (limited to '')
| -rw-r--r-- | src/core/hle/kernel/event.h | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/kernel.h | 6 | ||||
| -rw-r--r-- | src/core/hle/kernel/timer.h | 1 |
3 files changed, 6 insertions, 7 deletions
diff --git a/src/core/hle/kernel/event.h b/src/core/hle/kernel/event.h index 6fe74065d..8dcd23edb 100644 --- a/src/core/hle/kernel/event.h +++ b/src/core/hle/kernel/event.h | |||
| @@ -9,12 +9,6 @@ | |||
| 9 | 9 | ||
| 10 | namespace Kernel { | 10 | namespace Kernel { |
| 11 | 11 | ||
| 12 | enum class ResetType { | ||
| 13 | OneShot, | ||
| 14 | Sticky, | ||
| 15 | Pulse, | ||
| 16 | }; | ||
| 17 | |||
| 18 | class Event final : public WaitObject { | 12 | class Event final : public WaitObject { |
| 19 | public: | 13 | public: |
| 20 | /** | 14 | /** |
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h index 40c78b436..6b8dbecff 100644 --- a/src/core/hle/kernel/kernel.h +++ b/src/core/hle/kernel/kernel.h | |||
| @@ -53,6 +53,12 @@ enum { | |||
| 53 | DEFAULT_STACK_SIZE = 0x4000, | 53 | DEFAULT_STACK_SIZE = 0x4000, |
| 54 | }; | 54 | }; |
| 55 | 55 | ||
| 56 | enum class ResetType { | ||
| 57 | OneShot, | ||
| 58 | Sticky, | ||
| 59 | Pulse, | ||
| 60 | }; | ||
| 61 | |||
| 56 | class Object : NonCopyable { | 62 | class Object : NonCopyable { |
| 57 | public: | 63 | public: |
| 58 | virtual ~Object() {} | 64 | virtual ~Object() {} |
diff --git a/src/core/hle/kernel/timer.h b/src/core/hle/kernel/timer.h index 59a77aad3..18ea0236b 100644 --- a/src/core/hle/kernel/timer.h +++ b/src/core/hle/kernel/timer.h | |||
| @@ -5,7 +5,6 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include "common/common_types.h" | 7 | #include "common/common_types.h" |
| 8 | #include "core/hle/kernel/event.h" | ||
| 9 | #include "core/hle/kernel/kernel.h" | 8 | #include "core/hle/kernel/kernel.h" |
| 10 | 9 | ||
| 11 | namespace Kernel { | 10 | namespace Kernel { |