From: notaz <notasas@gmail.com>
Date: Tue, 11 Jul 2023 23:21:26 +0000 (+0300)
Subject: cdrom: moar hacks
X-Git-Tag: r24~256
X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=commitdiff_plain;h=69dc4e5ffc0eed8fb3914b46fde5d781e2e40dd3

cdrom: moar hacks

libretro/pcsx_rearmed#714
---

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 5f4ce60e..c092f2ca 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -1318,7 +1318,7 @@ static void cdrReadInterrupt(void)
 	}
 	memcpy(cdr.LocL, buf, 8);
 
-	if (!cdr.Irq1Pending)
+	if (!cdr.Stat && !cdr.Irq1Pending)
 		cdrUpdateTransferBuf(buf);
 
 	if ((!cdr.Muted) && (cdr.Mode & MODE_STRSND) && (!Config.Xa) && (cdr.FirstSector != -1)) { // CD-XA
@@ -1515,8 +1515,11 @@ void cdrWrite3(unsigned char rt) {
 			// note: Croc, Shadow Tower (more) vs Discworld Noir (<993)
 			if (!pending && (cdr.CmdInProgress || cdr.Irq1Pending))
 			{
-				s32 c = 2048 - (psxRegs.cycle - nextCycle);
-				c = MAX_VALUE(c, 512);
+				s32 c = 2048;
+				if (cdr.CmdInProgress) {
+					c = 2048 - (psxRegs.cycle - nextCycle);
+					c = MAX_VALUE(c, 512);
+				}
 				CDR_INT(c);
 			}
 		}