From: notaz <notasas@gmail.com>
Date: Sun, 26 Jun 2011 19:56:05 +0000 (+0300)
Subject: cdrom: replace resched hack with another one
X-Git-Tag: r9~55
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=commitdiff_plain;h=4955e9d068cd7cbb2bc8755d7bab09b78b92a981;ds=sidebyside

cdrom: replace resched hack with another one

almost certainly wrong but hopefully better.
---

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index c667ac48..87a7c198 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -1902,9 +1902,13 @@ void cdrWrite3(unsigned char rt) {
 		// - Final Fantasy Tactics
 		// - various other games
 
-		if (cdr.Irq) // rearmed guesswork hack
 		if (cdr.Reading && !cdr.ResultReady) {
-			CDREAD_INT((cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime);
+			int left = psxRegs.intCycle[PSXINT_CDREAD].sCycle + psxRegs.intCycle[PSXINT_CDREAD].cycle - psxRegs.cycle;
+			int time = (cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime;
+			if (left < time / 2) { // rearmed guesswork hack
+				//printf("-- resched %d -> %d\n", left, time / 2);
+				CDREAD_INT(time / 2);
+			}
 		}
 
 		return;