summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/k_thread.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2021-05-10 05:15:00 +0200
committerGitHub <noreply@github.com>2021-05-10 05:15:00 +0200
commitec50a9b5b9882940a2e107889d3d909b57603626 (patch)
tree884bc2b18f440ec3058ac546718d315bf1970ad3 /src/core/hle/kernel/k_thread.h
parentMerge pull request #6294 from german77/kernelCleanup (diff)
parentkernel: Eliminate variable shadowing (diff)
downloadyuzu-ec50a9b5b9882940a2e107889d3d909b57603626.tar
yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.tar.gz
yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.tar.bz2
yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.tar.lz
yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.tar.xz
yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.tar.zst
yuzu-ec50a9b5b9882940a2e107889d3d909b57603626.zip
Diffstat (limited to '')
-rw-r--r--src/core/hle/kernel/k_thread.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h
index 4145ef56c..4abfc2b49 100644
--- a/src/core/hle/kernel/k_thread.h
+++ b/src/core/hle/kernel/k_thread.h
@@ -111,7 +111,7 @@ public:
static constexpr s32 DefaultThreadPriority = 44;
static constexpr s32 IdleThreadPriority = Svc::LowestThreadPriority + 1;
- explicit KThread(KernelCore& kernel);
+ explicit KThread(KernelCore& kernel_);
~KThread() override;
public:
@@ -318,7 +318,7 @@ public:
[[nodiscard]] ResultCode GetPhysicalCoreMask(s32* out_ideal_core, u64* out_affinity_mask);
- [[nodiscard]] ResultCode SetCoreMask(s32 core_id, u64 v_affinity_mask);
+ [[nodiscard]] ResultCode SetCoreMask(s32 cpu_core_id, u64 v_affinity_mask);
[[nodiscard]] ResultCode SetActivity(Svc::ThreadActivity activity);
@@ -649,7 +649,7 @@ private:
std::function<void(void*)>&& init_func,
void* init_func_parameter);
- static void RestorePriority(KernelCore& kernel, KThread* thread);
+ static void RestorePriority(KernelCore& kernel_ctx, KThread* thread);
// For core KThread implementation
ThreadContext32 thread_context_32{};