summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
-rw-r--r--src/core/hle/kernel/kernel.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp
index 1c26fb388..f7145ddd8 100644
--- a/src/core/hle/kernel/kernel.cpp
+++ b/src/core/hle/kernel/kernel.cpp
@@ -27,7 +27,7 @@ KernelObjectPool::KernelObjectPool() {
27 next_id = INITIAL_NEXT_ID; 27 next_id = INITIAL_NEXT_ID;
28} 28}
29 29
30UID KernelObjectPool::Create(KernelObject *obj, int range_bottom, int range_top) { 30Handle KernelObjectPool::Create(KernelObject *obj, int range_bottom, int range_top) {
31 if (range_top > MAX_COUNT) { 31 if (range_top > MAX_COUNT) {
32 range_top = MAX_COUNT; 32 range_top = MAX_COUNT;
33 } 33 }
@@ -38,7 +38,7 @@ UID KernelObjectPool::Create(KernelObject *obj, int range_bottom, int range_top)
38 if (!occupied[i]) { 38 if (!occupied[i]) {
39 occupied[i] = true; 39 occupied[i] = true;
40 pool[i] = obj; 40 pool[i] = obj;
41 pool[i]->uid = i + HANDLE_OFFSET; 41 pool[i]->handle = i + HANDLE_OFFSET;
42 return i + HANDLE_OFFSET; 42 return i + HANDLE_OFFSET;
43 } 43 }
44 } 44 }
@@ -46,7 +46,7 @@ UID KernelObjectPool::Create(KernelObject *obj, int range_bottom, int range_top)
46 return 0; 46 return 0;
47} 47}
48 48
49bool KernelObjectPool::IsValid(UID handle) 49bool KernelObjectPool::IsValid(Handle handle)
50{ 50{
51 int index = handle - HANDLE_OFFSET; 51 int index = handle - HANDLE_OFFSET;
52 if (index < 0) 52 if (index < 0)
@@ -70,7 +70,7 @@ void KernelObjectPool::Clear()
70 next_id = INITIAL_NEXT_ID; 70 next_id = INITIAL_NEXT_ID;
71} 71}
72 72
73KernelObject *&KernelObjectPool::operator [](UID handle) 73KernelObject *&KernelObjectPool::operator [](Handle handle)
74{ 74{
75 _dbg_assert_msg_(KERNEL, IsValid(handle), "GRABBING UNALLOCED KERNEL OBJ"); 75 _dbg_assert_msg_(KERNEL, IsValid(handle), "GRABBING UNALLOCED KERNEL OBJ");
76 return pool[handle - HANDLE_OFFSET]; 76 return pool[handle - HANDLE_OFFSET];
@@ -148,7 +148,7 @@ bool __KernelLoadExec(u32 entry_point) {
148 Core::g_app_core->SetPC(entry_point); 148 Core::g_app_core->SetPC(entry_point);
149 149
150 // 0x30 is the typical main thread priority I've seen used so far 150 // 0x30 is the typical main thread priority I've seen used so far
151 UID thread_id = __KernelSetupRootThread(0xDEADBEEF, 0, 0x30); 151 Handle thread_id = __KernelSetupMainThread(0x30);
152 152
153 return true; 153 return true;
154} 154}