nold/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere synced 2024-12-22 20:31:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

kern: KConditionVariable arbiter functions now static

Browse source
This commit is contained in:
Michael Scire 2021-09-17 15:11:58 -07:00 committed by SciresM
parent 572cbd8619
commit d80ad222cc
3 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
libraries/libmesosphere/include/mesosphere/kern_k_condition_variable.hpp
View file

@ -29,8 +29,8 @@ namespace ams::kern {
constexpr KConditionVariable() : m_tree() { /* ... */ }
/* Arbitration. */
Result SignalToAddress(KProcessAddress addr);
Result WaitForAddress(ams::svc::Handle handle, KProcessAddress addr, u32 value);
static Result SignalToAddress(KProcessAddress addr);
static Result WaitForAddress(ams::svc::Handle handle, KProcessAddress addr, u32 value);
/* Condition variable. */
void Signal(uintptr_t cv_key, s32 count);

8
libraries/libmesosphere/include/mesosphere/kern_k_process.hpp
View file

@ -341,14 +341,6 @@ namespace ams::kern {
void UnpinCurrentThread();
void UnpinThread(KThread *thread);
Result SignalToAddress(KProcessAddress address) {
return m_cond_var.SignalToAddress(address);
}
Result WaitForAddress(ams::svc::Handle handle, KProcessAddress address, u32 tag) {
return m_cond_var.WaitForAddress(handle, address, tag);
}
void SignalConditionVariable(uintptr_t cv_key, int32_t count) {
return m_cond_var.Signal(cv_key, count);
}

4
libraries/libmesosphere/source/svc/kern_svc_lock.cpp
View file

@ -30,7 +30,7 @@ namespace ams::kern::svc {
R_UNLESS(!IsKernelAddress(address), svc::ResultInvalidCurrentMemory());
R_UNLESS(util::IsAligned(address, sizeof(u32)), svc::ResultInvalidAddress());
return GetCurrentProcess().WaitForAddress(thread_handle, address, tag);
return KConditionVariable::WaitForAddress(thread_handle, address, tag);
}
Result ArbitrateUnlock(uintptr_t address) {
@ -38,7 +38,7 @@ namespace ams::kern::svc {
R_UNLESS(!IsKernelAddress(address), svc::ResultInvalidCurrentMemory());
R_UNLESS(util::IsAligned(address, sizeof(u32)), svc::ResultInvalidAddress());
return GetCurrentProcess().SignalToAddress(address);
return KConditionVariable::SignalToAddress(address);
}
}