summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwwylele <wwylele@gmail.com>2016-05-25 12:36:15 +0200
committerwwylele <wwylele@gmail.com>2016-09-22 07:52:52 +0200
commit85a83158fbee48f9281f7e3c60c461d7f73c3a1b (patch)
tree9be0daadc33b15c4a2558f8ce16f5636e8390ed8
parentname objects (diff)
downloadyuzu-85a83158fbee48f9281f7e3c60c461d7f73c3a1b.tar
yuzu-85a83158fbee48f9281f7e3c60c461d7f73c3a1b.tar.gz
yuzu-85a83158fbee48f9281f7e3c60c461d7f73c3a1b.tar.bz2
yuzu-85a83158fbee48f9281f7e3c60c461d7f73c3a1b.tar.lz
yuzu-85a83158fbee48f9281f7e3c60c461d7f73c3a1b.tar.xz
yuzu-85a83158fbee48f9281f7e3c60c461d7f73c3a1b.tar.zst
yuzu-85a83158fbee48f9281f7e3c60c461d7f73c3a1b.zip
-rw-r--r--src/core/hle/kernel/event.h6
-rw-r--r--src/core/hle/kernel/kernel.h6
-rw-r--r--src/core/hle/kernel/timer.h1
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 @@
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 {