X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=1569839989c8f7670467936a294637e06788b385;hp=87a7c198c0849ca9be28eee37d78bb63634f4f21;hb=631e6f284702250d609d34d56ba2278bac2fa637;hpb=4955e9d068cd7cbb2bc8755d7bab09b78b92a981

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 87a7c198..15698399 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -1905,9 +1905,10 @@ void cdrWrite3(unsigned char rt) {
 		if (cdr.Reading && !cdr.ResultReady) {
 			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);
+			if (Config.CdrReschedule != 2)
+			if (left < time / 2 || Config.CdrReschedule) { // rearmed guesswork hack
+				//printf("-- resched %d -> %d\n", left, time);
+				CDREAD_INT(time);
 			}
 		}
 
@@ -2017,8 +2018,11 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 
 void cdrDmaInterrupt()
 {
-	HW_DMA3_CHCR &= SWAP32(~0x01000000);
-	DMA_INTERRUPT(3);
+	if (HW_DMA3_CHCR & SWAP32(0x01000000))
+	{
+		HW_DMA3_CHCR &= SWAP32(~0x01000000);
+		DMA_INTERRUPT(3);
+	}
 }
 
 void cdrReset() {