diff options
| author | 2021-04-23 22:04:28 -0700 | |
|---|---|---|
| committer | 2021-05-05 16:40:52 -0700 | |
| commit | 2a7eff57a8048933a89c1a8f8d6dced7b5d604f2 (patch) | |
| tree | 757a2207ab4d29b39ee8d9ddfa79966283d4d24a /src/core/core.cpp | |
| parent | hle: kernel: Remove deprecated Object class. (diff) | |
| download | yuzu-2a7eff57a8048933a89c1a8f8d6dced7b5d604f2.tar.gz yuzu-2a7eff57a8048933a89c1a8f8d6dced7b5d604f2.tar.xz yuzu-2a7eff57a8048933a89c1a8f8d6dced7b5d604f2.zip | |
hle: kernel: Rename Process to KProcess.
Diffstat (limited to 'src/core/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 4bb96d77d..434bf3262 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -28,11 +28,11 @@ | |||
| 28 | #include "core/file_sys/vfs_real.h" | 28 | #include "core/file_sys/vfs_real.h" |
| 29 | #include "core/hardware_interrupt_manager.h" | 29 | #include "core/hardware_interrupt_manager.h" |
| 30 | #include "core/hle/kernel/k_client_port.h" | 30 | #include "core/hle/kernel/k_client_port.h" |
| 31 | #include "core/hle/kernel/k_process.h" | ||
| 31 | #include "core/hle/kernel/k_scheduler.h" | 32 | #include "core/hle/kernel/k_scheduler.h" |
| 32 | #include "core/hle/kernel/k_thread.h" | 33 | #include "core/hle/kernel/k_thread.h" |
| 33 | #include "core/hle/kernel/kernel.h" | 34 | #include "core/hle/kernel/kernel.h" |
| 34 | #include "core/hle/kernel/physical_core.h" | 35 | #include "core/hle/kernel/physical_core.h" |
| 35 | #include "core/hle/kernel/process.h" | ||
| 36 | #include "core/hle/service/am/applets/applets.h" | 36 | #include "core/hle/service/am/applets/applets.h" |
| 37 | #include "core/hle/service/apm/controller.h" | 37 | #include "core/hle/service/apm/controller.h" |
| 38 | #include "core/hle/service/filesystem/filesystem.h" | 38 | #include "core/hle/service/filesystem/filesystem.h" |
| @@ -233,9 +233,9 @@ struct System::Impl { | |||
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | telemetry_session->AddInitialInfo(*app_loader, fs_controller, *content_provider); | 235 | telemetry_session->AddInitialInfo(*app_loader, fs_controller, *content_provider); |
| 236 | auto main_process = Kernel::Process::Create(system.Kernel()); | 236 | auto main_process = Kernel::KProcess::Create(system.Kernel()); |
| 237 | ASSERT(Kernel::Process::Initialize(main_process, system, "main", | 237 | ASSERT(Kernel::KProcess::Initialize(main_process, system, "main", |
| 238 | Kernel::Process::ProcessType::Userland) | 238 | Kernel::KProcess::ProcessType::Userland) |
| 239 | .IsSuccess()); | 239 | .IsSuccess()); |
| 240 | main_process->Open(); | 240 | main_process->Open(); |
| 241 | const auto [load_result, load_parameters] = app_loader->Load(*main_process, system); | 241 | const auto [load_result, load_parameters] = app_loader->Load(*main_process, system); |
| @@ -326,7 +326,7 @@ struct System::Impl { | |||
| 326 | return app_loader->ReadTitle(out); | 326 | return app_loader->ReadTitle(out); |
| 327 | } | 327 | } |
| 328 | 328 | ||
| 329 | void AddGlueRegistrationForProcess(Loader::AppLoader& loader, Kernel::Process& process) { | 329 | void AddGlueRegistrationForProcess(Loader::AppLoader& loader, Kernel::KProcess& process) { |
| 330 | std::vector<u8> nacp_data; | 330 | std::vector<u8> nacp_data; |
| 331 | FileSys::NACP nacp; | 331 | FileSys::NACP nacp; |
| 332 | if (loader.ReadControlData(nacp) == Loader::ResultStatus::Success) { | 332 | if (loader.ReadControlData(nacp) == Loader::ResultStatus::Success) { |
| @@ -517,7 +517,7 @@ const Kernel::GlobalSchedulerContext& System::GlobalSchedulerContext() const { | |||
| 517 | return impl->kernel.GlobalSchedulerContext(); | 517 | return impl->kernel.GlobalSchedulerContext(); |
| 518 | } | 518 | } |
| 519 | 519 | ||
| 520 | Kernel::Process* System::CurrentProcess() { | 520 | Kernel::KProcess* System::CurrentProcess() { |
| 521 | return impl->kernel.CurrentProcess(); | 521 | return impl->kernel.CurrentProcess(); |
| 522 | } | 522 | } |
| 523 | 523 | ||
| @@ -529,7 +529,7 @@ const Core::DeviceMemory& System::DeviceMemory() const { | |||
| 529 | return *impl->device_memory; | 529 | return *impl->device_memory; |
| 530 | } | 530 | } |
| 531 | 531 | ||
| 532 | const Kernel::Process* System::CurrentProcess() const { | 532 | const Kernel::KProcess* System::CurrentProcess() const { |
| 533 | return impl->kernel.CurrentProcess(); | 533 | return impl->kernel.CurrentProcess(); |
| 534 | } | 534 | } |
| 535 | 535 | ||