From 85a83158fbee48f9281f7e3c60c461d7f73c3a1b Mon Sep 17 00:00:00 2001 From: wwylele Date: Wed, 25 May 2016 13:36:15 +0300 Subject: move ResetType to kernel.h --- src/core/hle/kernel/event.h | 6 ------ src/core/hle/kernel/kernel.h | 6 ++++++ src/core/hle/kernel/timer.h | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) (limited to 'src/core') 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 @@ namespace Kernel { -enum class ResetType { - OneShot, - Sticky, - Pulse, -}; - class Event final : public WaitObject { public: /** 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 { DEFAULT_STACK_SIZE = 0x4000, }; +enum class ResetType { + OneShot, + Sticky, + Pulse, +}; + class Object : NonCopyable { public: 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 @@ #pragma once #include "common/common_types.h" -#include "core/hle/kernel/event.h" #include "core/hle/kernel/kernel.h" namespace Kernel { -- cgit v1.2.3