From 4b46de89bba9b51bc9691880037a6ff46b7f0b03 Mon Sep 17 00:00:00 2001 From: Stefanos Kornilios Mitsis Poiitidis Date: Thu, 7 May 2015 22:03:55 +0200 Subject: [PATCH] sh4_sched: Handle disabled events correctly --- core/hw/sh4/sh4_sched.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/core/hw/sh4/sh4_sched.cpp b/core/hw/sh4/sh4_sched.cpp index c64f49bf9..0a4813e59 100755 --- a/core/hw/sh4/sh4_sched.cpp +++ b/core/hw/sh4/sh4_sched.cpp @@ -108,10 +108,17 @@ u64 sh4_sched_now64() } void sh4_sched_request(int id, int cycles) { - verify(cycles <= SH4_MAIN_CLOCK); + verify(cycles== -1 || (cycles >= 0 && cycles <= SH4_MAIN_CLOCK)); list[id].start=sh4_sched_now(); - list[id].end=list[id].start+cycles; + + if (cycles == -1) { + list[id].end = -1; + } + else + { + list[id].end = list[id].start + cycles; + } sh4_sched_ffts(); }