diff options
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 409bcfaa0..718525c4c 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -31,6 +31,7 @@ | |||
| 31 | #include "core/hle/kernel/k_client_port.h" | 31 | #include "core/hle/kernel/k_client_port.h" |
| 32 | #include "core/hle/kernel/k_memory_layout.h" | 32 | #include "core/hle/kernel/k_memory_layout.h" |
| 33 | #include "core/hle/kernel/k_memory_manager.h" | 33 | #include "core/hle/kernel/k_memory_manager.h" |
| 34 | #include "core/hle/kernel/k_process.h" | ||
| 34 | #include "core/hle/kernel/k_resource_limit.h" | 35 | #include "core/hle/kernel/k_resource_limit.h" |
| 35 | #include "core/hle/kernel/k_scheduler.h" | 36 | #include "core/hle/kernel/k_scheduler.h" |
| 36 | #include "core/hle/kernel/k_shared_memory.h" | 37 | #include "core/hle/kernel/k_shared_memory.h" |
| @@ -38,7 +39,6 @@ | |||
| 38 | #include "core/hle/kernel/k_thread.h" | 39 | #include "core/hle/kernel/k_thread.h" |
| 39 | #include "core/hle/kernel/kernel.h" | 40 | #include "core/hle/kernel/kernel.h" |
| 40 | #include "core/hle/kernel/physical_core.h" | 41 | #include "core/hle/kernel/physical_core.h" |
| 41 | #include "core/hle/kernel/process.h" | ||
| 42 | #include "core/hle/kernel/service_thread.h" | 42 | #include "core/hle/kernel/service_thread.h" |
| 43 | #include "core/hle/kernel/svc_results.h" | 43 | #include "core/hle/kernel/svc_results.h" |
| 44 | #include "core/hle/kernel/time_manager.h" | 44 | #include "core/hle/kernel/time_manager.h" |
| @@ -98,8 +98,8 @@ struct KernelCore::Impl { | |||
| 98 | service_threads.clear(); | 98 | service_threads.clear(); |
| 99 | 99 | ||
| 100 | next_object_id = 0; | 100 | next_object_id = 0; |
| 101 | next_kernel_process_id = Process::InitialKIPIDMin; | 101 | next_kernel_process_id = KProcess::InitialKIPIDMin; |
| 102 | next_user_process_id = Process::ProcessIDMin; | 102 | next_user_process_id = KProcess::ProcessIDMin; |
| 103 | next_thread_id = 1; | 103 | next_thread_id = 1; |
| 104 | 104 | ||
| 105 | for (s32 core_id = 0; core_id < Core::Hardware::NUM_CPU_CORES; core_id++) { | 105 | for (s32 core_id = 0; core_id < Core::Hardware::NUM_CPU_CORES; core_id++) { |
| @@ -220,7 +220,7 @@ struct KernelCore::Impl { | |||
| 220 | } | 220 | } |
| 221 | } | 221 | } |
| 222 | 222 | ||
| 223 | void MakeCurrentProcess(Process* process) { | 223 | void MakeCurrentProcess(KProcess* process) { |
| 224 | current_process = process; | 224 | current_process = process; |
| 225 | if (process == nullptr) { | 225 | if (process == nullptr) { |
| 226 | return; | 226 | return; |
| @@ -632,13 +632,13 @@ struct KernelCore::Impl { | |||
| 632 | } | 632 | } |
| 633 | 633 | ||
| 634 | std::atomic<u32> next_object_id{0}; | 634 | std::atomic<u32> next_object_id{0}; |
| 635 | std::atomic<u64> next_kernel_process_id{Process::InitialKIPIDMin}; | 635 | std::atomic<u64> next_kernel_process_id{KProcess::InitialKIPIDMin}; |
| 636 | std::atomic<u64> next_user_process_id{Process::ProcessIDMin}; | 636 | std::atomic<u64> next_user_process_id{KProcess::ProcessIDMin}; |
| 637 | std::atomic<u64> next_thread_id{1}; | 637 | std::atomic<u64> next_thread_id{1}; |
| 638 | 638 | ||
| 639 | // Lists all processes that exist in the current session. | 639 | // Lists all processes that exist in the current session. |
| 640 | std::vector<Process*> process_list; | 640 | std::vector<KProcess*> process_list; |
| 641 | Process* current_process{}; | 641 | KProcess* current_process{}; |
| 642 | std::unique_ptr<Kernel::GlobalSchedulerContext> global_scheduler_context; | 642 | std::unique_ptr<Kernel::GlobalSchedulerContext> global_scheduler_context; |
| 643 | Kernel::TimeManager time_manager; | 643 | Kernel::TimeManager time_manager; |
| 644 | 644 | ||
| @@ -725,23 +725,23 @@ KScopedAutoObject<KThread> KernelCore::RetrieveThreadFromGlobalHandleTable(Handl | |||
| 725 | return impl->global_handle_table.GetObject<KThread>(handle); | 725 | return impl->global_handle_table.GetObject<KThread>(handle); |
| 726 | } | 726 | } |
| 727 | 727 | ||
| 728 | void KernelCore::AppendNewProcess(Process* process) { | 728 | void KernelCore::AppendNewProcess(KProcess* process) { |
| 729 | impl->process_list.push_back(process); | 729 | impl->process_list.push_back(process); |
| 730 | } | 730 | } |
| 731 | 731 | ||
| 732 | void KernelCore::MakeCurrentProcess(Process* process) { | 732 | void KernelCore::MakeCurrentProcess(KProcess* process) { |
| 733 | impl->MakeCurrentProcess(process); | 733 | impl->MakeCurrentProcess(process); |
| 734 | } | 734 | } |
| 735 | 735 | ||
| 736 | Process* KernelCore::CurrentProcess() { | 736 | KProcess* KernelCore::CurrentProcess() { |
| 737 | return impl->current_process; | 737 | return impl->current_process; |
| 738 | } | 738 | } |
| 739 | 739 | ||
| 740 | const Process* KernelCore::CurrentProcess() const { | 740 | const KProcess* KernelCore::CurrentProcess() const { |
| 741 | return impl->current_process; | 741 | return impl->current_process; |
| 742 | } | 742 | } |
| 743 | 743 | ||
| 744 | const std::vector<Process*>& KernelCore::GetProcessList() const { | 744 | const std::vector<KProcess*>& KernelCore::GetProcessList() const { |
| 745 | return impl->process_list; | 745 | return impl->process_list; |
| 746 | } | 746 | } |
| 747 | 747 | ||