diff options
| author | 2020-07-16 14:16:57 -0400 | |
|---|---|---|
| committer | 2020-07-16 14:16:57 -0400 | |
| commit | d84d9a64b36013e2745f019f0b6f422f8ed1fd32 (patch) | |
| tree | 4e43bcb0312811d74b78ed23014d96e4149b3f1c /src/core/hle/kernel/kernel.cpp | |
| parent | Merge pull request #4261 from ameerj/gc-calibration (diff) | |
| parent | kernel: Add missing include (diff) | |
| download | yuzu-d84d9a64b36013e2745f019f0b6f422f8ed1fd32.tar.gz yuzu-d84d9a64b36013e2745f019f0b6f422f8ed1fd32.tar.xz yuzu-d84d9a64b36013e2745f019f0b6f422f8ed1fd32.zip | |
Merge pull request #4356 from lioncash/inc
cpu_manager: Minor tidying up/header inclusions
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 6e2014e08..e1c7a0f3b 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp | |||
| @@ -161,13 +161,14 @@ struct KernelCore::Impl { | |||
| 161 | void InitializeSuspendThreads() { | 161 | void InitializeSuspendThreads() { |
| 162 | for (std::size_t i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { | 162 | for (std::size_t i = 0; i < Core::Hardware::NUM_CPU_CORES; i++) { |
| 163 | std::string name = "Suspend Thread Id:" + std::to_string(i); | 163 | std::string name = "Suspend Thread Id:" + std::to_string(i); |
| 164 | std::function<void(void*)> init_func = | 164 | std::function<void(void*)> init_func = Core::CpuManager::GetSuspendThreadStartFunc(); |
| 165 | system.GetCpuManager().GetSuspendThreadStartFunc(); | ||
| 166 | void* init_func_parameter = system.GetCpuManager().GetStartFuncParamater(); | 165 | void* init_func_parameter = system.GetCpuManager().GetStartFuncParamater(); |
| 167 | ThreadType type = | 166 | const auto type = |
| 168 | static_cast<ThreadType>(THREADTYPE_KERNEL | THREADTYPE_HLE | THREADTYPE_SUSPEND); | 167 | static_cast<ThreadType>(THREADTYPE_KERNEL | THREADTYPE_HLE | THREADTYPE_SUSPEND); |
| 169 | auto thread_res = Thread::Create(system, type, name, 0, 0, 0, static_cast<u32>(i), 0, | 168 | auto thread_res = |
| 170 | nullptr, std::move(init_func), init_func_parameter); | 169 | Thread::Create(system, type, std::move(name), 0, 0, 0, static_cast<u32>(i), 0, |
| 170 | nullptr, std::move(init_func), init_func_parameter); | ||
| 171 | |||
| 171 | suspend_threads[i] = std::move(thread_res).Unwrap(); | 172 | suspend_threads[i] = std::move(thread_res).Unwrap(); |
| 172 | } | 173 | } |
| 173 | } | 174 | } |