summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/kernel.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/hle/kernel/kernel.h')
-rw-r--r--src/core/hle/kernel/kernel.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/core/hle/kernel/kernel.h b/src/core/hle/kernel/kernel.h
index de7f83423..0dd9deaeb 100644
--- a/src/core/hle/kernel/kernel.h
+++ b/src/core/hle/kernel/kernel.h
@@ -37,7 +37,7 @@ class KEvent;
37class KLinkedListNode; 37class KLinkedListNode;
38class KMemoryManager; 38class KMemoryManager;
39class KPort; 39class KPort;
40class Process; 40class KProcess;
41class KResourceLimit; 41class KResourceLimit;
42class KScheduler; 42class KScheduler;
43class KSession; 43class KSession;
@@ -101,19 +101,19 @@ public:
101 KScopedAutoObject<KThread> RetrieveThreadFromGlobalHandleTable(Handle handle) const; 101 KScopedAutoObject<KThread> RetrieveThreadFromGlobalHandleTable(Handle handle) const;
102 102
103 /// Adds the given shared pointer to an internal list of active processes. 103 /// Adds the given shared pointer to an internal list of active processes.
104 void AppendNewProcess(Process* process); 104 void AppendNewProcess(KProcess* process);
105 105
106 /// Makes the given process the new current process. 106 /// Makes the given process the new current process.
107 void MakeCurrentProcess(Process* process); 107 void MakeCurrentProcess(KProcess* process);
108 108
109 /// Retrieves a pointer to the current process. 109 /// Retrieves a pointer to the current process.
110 Process* CurrentProcess(); 110 KProcess* CurrentProcess();
111 111
112 /// Retrieves a const pointer to the current process. 112 /// Retrieves a const pointer to the current process.
113 const Process* CurrentProcess() const; 113 const KProcess* CurrentProcess() const;
114 114
115 /// Retrieves the list of processes. 115 /// Retrieves the list of processes.
116 const std::vector<Process*>& GetProcessList() const; 116 const std::vector<KProcess*>& GetProcessList() const;
117 117
118 /// Gets the sole instance of the global scheduler 118 /// Gets the sole instance of the global scheduler
119 Kernel::GlobalSchedulerContext& GlobalSchedulerContext(); 119 Kernel::GlobalSchedulerContext& GlobalSchedulerContext();
@@ -274,7 +274,7 @@ public:
274 return slab_heap_container->linked_list_node; 274 return slab_heap_container->linked_list_node;
275 } else if constexpr (std::is_same_v<T, KPort>) { 275 } else if constexpr (std::is_same_v<T, KPort>) {
276 return slab_heap_container->port; 276 return slab_heap_container->port;
277 } else if constexpr (std::is_same_v<T, Process>) { 277 } else if constexpr (std::is_same_v<T, KProcess>) {
278 return slab_heap_container->process; 278 return slab_heap_container->process;
279 } else if constexpr (std::is_same_v<T, KResourceLimit>) { 279 } else if constexpr (std::is_same_v<T, KResourceLimit>) {
280 return slab_heap_container->resource_limit; 280 return slab_heap_container->resource_limit;
@@ -292,7 +292,7 @@ public:
292 } 292 }
293 293
294private: 294private:
295 friend class Process; 295 friend class KProcess;
296 friend class KThread; 296 friend class KThread;
297 297
298 /// Creates a new object ID, incrementing the internal object ID counter. 298 /// Creates a new object ID, incrementing the internal object ID counter.
@@ -325,7 +325,7 @@ private:
325 KSlabHeap<KEvent> event; 325 KSlabHeap<KEvent> event;
326 KSlabHeap<KLinkedListNode> linked_list_node; 326 KSlabHeap<KLinkedListNode> linked_list_node;
327 KSlabHeap<KPort> port; 327 KSlabHeap<KPort> port;
328 KSlabHeap<Process> process; 328 KSlabHeap<KProcess> process;
329 KSlabHeap<KResourceLimit> resource_limit; 329 KSlabHeap<KResourceLimit> resource_limit;
330 KSlabHeap<KSession> session; 330 KSlabHeap<KSession> session;
331 KSlabHeap<KSharedMemory> shared_memory; 331 KSlabHeap<KSharedMemory> shared_memory;