summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.h
diff options
context:
space:
mode:
authorGravatar Subv2016-11-30 23:28:31 -0500
committerGravatar Subv2016-11-30 23:28:31 -0500
commit2eceee3a4cc2786dae4e9b80a8b5f3bb666d3fc6 (patch)
tree4a7069d46afb5655af9f091c09041211653fb75f /src/core/hle/kernel/kernel.h
parentA bit of a redesign. (diff)
downloadyuzu-2eceee3a4cc2786dae4e9b80a8b5f3bb666d3fc6.tar.gz
yuzu-2eceee3a4cc2786dae4e9b80a8b5f3bb666d3fc6.tar.xz
yuzu-2eceee3a4cc2786dae4e9b80a8b5f3bb666d3fc6.zip
Fixed the rebase mistakes.
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
-rw-r--r--src/core/hle/kernel/kernel.h34
1 files changed, 16 insertions, 18 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index 4bd505b5d..9808d375b 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -31,24 +31,22 @@ enum KernelHandle : Handle {
31}; 31};
32 32
33enum class HandleType : u32 { 33enum class HandleType : u32 {
34 Unknown = 0, 34 Unknown,
35 35 Event,
36 36 Mutex,
37 Event = 3, 37 SharedMemory,
38 Mutex = 4, 38 Redirection,
39 SharedMemory = 5, 39 Thread,
40 Redirection = 6, 40 Process,
41 Thread = 7, 41 AddressArbiter,
42 Process = 8, 42 Semaphore,
43 AddressArbiter = 9, 43 Timer,
44 Semaphore = 10, 44 ResourceLimit,
45 Timer = 11, 45 CodeSet,
46 ResourceLimit = 12, 46 ClientPort,
47 CodeSet = 13, 47 ServerPort,
48 ClientPort = 14, 48 ClientSession,
49 ServerPort = 15, 49 ServerSession,
50 ClientSession = 16,
51 ServerSession = 17,
52}; 50};
53 51
54enum { 52enum {