summaryrefslogtreecommitdiff
path: root/src/core/hle/kernel/init
diff options
context:
space:
mode:
authorGravatar bunnei2021-04-23 22:04:28 -0700
committerGravatar bunnei2021-05-05 16:40:52 -0700
commit2a7eff57a8048933a89c1a8f8d6dced7b5d604f2 (patch)
tree757a2207ab4d29b39ee8d9ddfa79966283d4d24a /src/core/hle/kernel/init
parenthle: kernel: Remove deprecated Object class. (diff)
downloadyuzu-2a7eff57a8048933a89c1a8f8d6dced7b5d604f2.tar.gz
yuzu-2a7eff57a8048933a89c1a8f8d6dced7b5d604f2.tar.xz
yuzu-2a7eff57a8048933a89c1a8f8d6dced7b5d604f2.zip
hle: kernel: Rename Process to KProcess.
Diffstat (limited to 'src/core/hle/kernel/init')
-rw-r--r--src/core/hle/kernel/init/init_slab_setup.cpp8
-rw-r--r--src/core/hle/kernel/init/init_slab_setup.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/hle/kernel/init/init_slab_setup.cpp b/src/core/hle/kernel/init/init_slab_setup.cpp
index f8c255732..04e481a0a 100644
--- a/src/core/hle/kernel/init/init_slab_setup.cpp
+++ b/src/core/hle/kernel/init/init_slab_setup.cpp
@@ -13,6 +13,7 @@
13#include "core/hle/kernel/k_memory_layout.h" 13#include "core/hle/kernel/k_memory_layout.h"
14#include "core/hle/kernel/k_memory_manager.h" 14#include "core/hle/kernel/k_memory_manager.h"
15#include "core/hle/kernel/k_port.h" 15#include "core/hle/kernel/k_port.h"
16#include "core/hle/kernel/k_process.h"
16#include "core/hle/kernel/k_resource_limit.h" 17#include "core/hle/kernel/k_resource_limit.h"
17#include "core/hle/kernel/k_session.h" 18#include "core/hle/kernel/k_session.h"
18#include "core/hle/kernel/k_shared_memory.h" 19#include "core/hle/kernel/k_shared_memory.h"
@@ -20,7 +21,6 @@
20#include "core/hle/kernel/k_thread.h" 21#include "core/hle/kernel/k_thread.h"
21#include "core/hle/kernel/k_transfer_memory.h" 22#include "core/hle/kernel/k_transfer_memory.h"
22#include "core/hle/kernel/memory_types.h" 23#include "core/hle/kernel/memory_types.h"
23#include "core/hle/kernel/process.h"
24#include "core/memory.h" 24#include "core/memory.h"
25 25
26namespace Kernel::Init { 26namespace Kernel::Init {
@@ -28,7 +28,7 @@ namespace Kernel::Init {
28#define SLAB_COUNT(CLASS) g_slab_resource_counts.num_##CLASS 28#define SLAB_COUNT(CLASS) g_slab_resource_counts.num_##CLASS
29 29
30#define FOREACH_SLAB_TYPE(HANDLER, ...) \ 30#define FOREACH_SLAB_TYPE(HANDLER, ...) \
31 HANDLER(Process, (SLAB_COUNT(Process)), ##__VA_ARGS__) \ 31 HANDLER(KProcess, (SLAB_COUNT(KProcess)), ##__VA_ARGS__) \
32 HANDLER(KThread, (SLAB_COUNT(KThread)), ##__VA_ARGS__) \ 32 HANDLER(KThread, (SLAB_COUNT(KThread)), ##__VA_ARGS__) \
33 HANDLER(KEvent, (SLAB_COUNT(KEvent)), ##__VA_ARGS__) \ 33 HANDLER(KEvent, (SLAB_COUNT(KEvent)), ##__VA_ARGS__) \
34 HANDLER(KPort, (SLAB_COUNT(KPort)), ##__VA_ARGS__) \ 34 HANDLER(KPort, (SLAB_COUNT(KPort)), ##__VA_ARGS__) \
@@ -48,7 +48,7 @@ enum KSlabType : u32 {
48#undef DEFINE_SLAB_TYPE_ENUM_MEMBER 48#undef DEFINE_SLAB_TYPE_ENUM_MEMBER
49 49
50// Constexpr counts. 50// Constexpr counts.
51constexpr size_t SlabCountProcess = 80; 51constexpr size_t SlabCountKProcess = 80;
52constexpr size_t SlabCountKThread = 800; 52constexpr size_t SlabCountKThread = 800;
53constexpr size_t SlabCountKEvent = 700; 53constexpr size_t SlabCountKEvent = 700;
54constexpr size_t SlabCountKInterruptEvent = 100; 54constexpr size_t SlabCountKInterruptEvent = 100;
@@ -69,7 +69,7 @@ constexpr size_t SlabCountExtraKThread = 160;
69 69
70// Global to hold our resource counts. 70// Global to hold our resource counts.
71KSlabResourceCounts g_slab_resource_counts = { 71KSlabResourceCounts g_slab_resource_counts = {
72 .num_Process = SlabCountProcess, 72 .num_KProcess = SlabCountKProcess,
73 .num_KThread = SlabCountKThread, 73 .num_KThread = SlabCountKThread,
74 .num_KEvent = SlabCountKEvent, 74 .num_KEvent = SlabCountKEvent,
75 .num_KInterruptEvent = SlabCountKInterruptEvent, 75 .num_KInterruptEvent = SlabCountKInterruptEvent,
diff --git a/src/core/hle/kernel/init/init_slab_setup.h b/src/core/hle/kernel/init/init_slab_setup.h
index 8876678b3..6418b97ac 100644
--- a/src/core/hle/kernel/init/init_slab_setup.h
+++ b/src/core/hle/kernel/init/init_slab_setup.h
@@ -15,7 +15,7 @@ class KMemoryLayout;
15namespace Kernel::Init { 15namespace Kernel::Init {
16 16
17struct KSlabResourceCounts { 17struct KSlabResourceCounts {
18 size_t num_Process; 18 size_t num_KProcess;
19 size_t num_KThread; 19 size_t num_KThread;
20 size_t num_KEvent; 20 size_t num_KEvent;
21 size_t num_KInterruptEvent; 21 size_t num_KInterruptEvent;