Fixed the rebase mistakes.

2016-11-30 23:28:31 -05:00 · 2016-11-30 23:28:31 -05:00 · 2eceee3a4c
commit 2eceee3a4c
parent 009b15b3aa
11 changed files with 76 additions and 83 deletions
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@ -31,24 +31,22 @@ enum KernelHandle : Handle {
 };

 enum class HandleType : u32 {
-    Unknown         = 0,
-
-
-    Event           = 3,
-    Mutex           = 4,
-    SharedMemory    = 5,
-    Redirection     = 6,
-    Thread          = 7,
-    Process         = 8,
-    AddressArbiter  = 9,
-    Semaphore       = 10,
-    Timer           = 11,
-    ResourceLimit   = 12,
-    CodeSet         = 13,
-    ClientPort      = 14,
-    ServerPort      = 15,
-    ClientSession   = 16,
-    ServerSession   = 17,
+    Unknown,
+    Event,
+    Mutex,
+    SharedMemory,
+    Redirection,
+    Thread,
+    Process,
+    AddressArbiter,
+    Semaphore,
+    Timer,
+    ResourceLimit,
+    CodeSet,
+    ClientPort,
+    ServerPort,
+    ClientSession,
+    ServerSession,
 };

 enum {