Merge pull request #3214 from lioncash/svc-func
kernel/svc: Amend function signature of SignalProcessWideKey
This commit is contained in:
commit
6d0d79109b
|
@ -1650,8 +1650,7 @@ static ResultCode WaitProcessWideKeyAtomic(Core::System& system, VAddr mutex_add
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Signal process wide key
|
/// Signal process wide key
|
||||||
static ResultCode SignalProcessWideKey(Core::System& system, VAddr condition_variable_addr,
|
static void SignalProcessWideKey(Core::System& system, VAddr condition_variable_addr, s32 target) {
|
||||||
s32 target) {
|
|
||||||
LOG_TRACE(Kernel_SVC, "called, condition_variable_addr=0x{:X}, target=0x{:08X}",
|
LOG_TRACE(Kernel_SVC, "called, condition_variable_addr=0x{:X}, target=0x{:08X}",
|
||||||
condition_variable_addr, target);
|
condition_variable_addr, target);
|
||||||
|
|
||||||
|
@ -1726,8 +1725,6 @@ static ResultCode SignalProcessWideKey(Core::System& system, VAddr condition_var
|
||||||
system.PrepareReschedule(thread->GetProcessorID());
|
system.PrepareReschedule(thread->GetProcessorID());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return RESULT_SUCCESS;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait for an address (via Address Arbiter)
|
// Wait for an address (via Address Arbiter)
|
||||||
|
|
|
@ -112,11 +112,6 @@ void SvcWrap(Core::System& system) {
|
||||||
FuncReturn(system, retval);
|
FuncReturn(system, retval);
|
||||||
}
|
}
|
||||||
|
|
||||||
template <ResultCode func(Core::System&, u64, s32)>
|
|
||||||
void SvcWrap(Core::System& system) {
|
|
||||||
FuncReturn(system, func(system, Param(system, 0), static_cast<s32>(Param(system, 1))).raw);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <ResultCode func(Core::System&, u64, u32)>
|
template <ResultCode func(Core::System&, u64, u32)>
|
||||||
void SvcWrap(Core::System& system) {
|
void SvcWrap(Core::System& system) {
|
||||||
FuncReturn(system, func(system, Param(system, 0), static_cast<u32>(Param(system, 1))).raw);
|
FuncReturn(system, func(system, Param(system, 0), static_cast<u32>(Param(system, 1))).raw);
|
||||||
|
@ -327,6 +322,11 @@ void SvcWrap(Core::System& system) {
|
||||||
func(system, static_cast<s64>(Param(system, 0)));
|
func(system, static_cast<s64>(Param(system, 0)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <void func(Core::System&, u64, s32)>
|
||||||
|
void SvcWrap(Core::System& system) {
|
||||||
|
func(system, Param(system, 0), static_cast<s32>(Param(system, 1)));
|
||||||
|
}
|
||||||
|
|
||||||
template <void func(Core::System&, u64, u64)>
|
template <void func(Core::System&, u64, u64)>
|
||||||
void SvcWrap(Core::System& system) {
|
void SvcWrap(Core::System& system) {
|
||||||
func(system, Param(system, 0), Param(system, 1));
|
func(system, Param(system, 0), Param(system, 1));
|
||||||
|
|
Reference in New Issue