Diamond75/Panda3DS
1
0
Fork 0
mirror of https://github.com/wheremyfoodat/Panda3DS.git synced 2025-04-07 14:45:41 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fix KTimer not properly triggering

Browse source
This commit is contained in:
wheremyfoodat 2023-11-04 18:07:13 +02:00
parent 0b56427019
commit 798b10ec69
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/kernel/timers.cpp
View file

@ -51,6 +51,10 @@ void Kernel::signalTimer(Handle timerHandle, Timer* timer) {
case ResetType::Pulse: Helpers::panic("Signalled pulsing timer"); break; case ResetType::Pulse: Helpers::panic("Signalled pulsing timer"); break;
} }
} }
if (timer->interval == 0) {
cancelTimer(timer);
}
} }
void Kernel::svcCreateTimer() { void Kernel::svcCreateTimer() {
@ -70,8 +74,8 @@ void Kernel::svcCreateTimer() {
void Kernel::svcSetTimer() { void Kernel::svcSetTimer() {
Handle handle = regs[0]; Handle handle = regs[0];
// TODO: Is this actually s64 or u64? 3DBrew says s64, but u64 makes more sense // TODO: Is this actually s64 or u64? 3DBrew says s64, but u64 makes more sense
const s64 initial = s64(u64(regs[1]) | (u64(regs[2]) << 32)); const s64 initial = s64(u64(regs[1]) | (u64(regs[3]) << 32));
const s64 interval = s64(u64(regs[3]) | (u64(regs[4]) << 32)); const s64 interval = s64(u64(regs[2]) | (u64(regs[4]) << 32));
logSVC("SetTimer (handle = %X, initial delay = %llX, interval delay = %llX)\n", handle, initial, interval); logSVC("SetTimer (handle = %X, initial delay = %llX, interval delay = %llX)\n", handle, initial, interval);
KernelObject* object = getObject(handle, KernelObjectType::Timer); KernelObject* object = getObject(handle, KernelObjectType::Timer);