X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=cc377b9f5e9bb14fafc41732e72469d7ce0140f7;hp=c82b6dafc9e6ab0e599ccbf9d3d6d07ed1801aba;hb=aecf98c59e00a1bd893cb0af3b7d0771f01e0185;hpb=a48ae3a7decaae1f0bbc45fb0ce37e030fd5357b

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index c82b6daf..cc377b9f 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -709,11 +709,12 @@ void cdrInterrupt() {
 			Wild 9: skip PREGAP + starting accurate SubQ
 			- plays tracks without retry play
 			*/
+			/* unneeded with correct cdriso?
 			Set_Track();
+			*/
 			Find_CurTrack();
 			ReadTrack( cdr.SetSectorPlay );
 
-
 			// GameShark CD Player: Calls 2x + Play 2x
 			if( cdr.FastBackward || cdr.FastForward ) {
 				if( cdr.FastForward ) cdr.FastForward--;
@@ -1901,9 +1902,14 @@ 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 (Config.CdrReschedule != 2)
+			if (left < time / 2 || Config.CdrReschedule) { // rearmed guesswork hack
+				//printf("-- resched %d -> %d\n", left, time);
+				CDREAD_INT(time);
+			}
 		}
 
 		return;
@@ -1931,6 +1937,7 @@ void cdrWrite3(unsigned char rt) {
 
 void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 	u32 cdsize;
+	int size;
 	u8 *ptr;
 
 #ifdef CDR_LOG
@@ -1975,15 +1982,12 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 			- CdlPlay
 			- Spams DMA3 and gets buffer overrun
 			*/
-
-			if( (cdr.pTransfer-cdr.Transfer) + cdsize > 2352 )
-			{
-				// avoid crash - probably should wrap here
-				//memcpy(ptr, cdr.pTransfer, cdsize);
-			}
-			else
+			size = CD_FRAMESIZE_RAW - (cdr.pTransfer - cdr.Transfer);
+			if (size > cdsize)
+				size = cdsize;
+			if (size > 0)
 			{
-				memcpy(ptr, cdr.pTransfer, cdsize);
+				memcpy(ptr, cdr.pTransfer, size);
 			}
 
 			psxCpu->Clear(madr, cdsize / 4);
@@ -2012,8 +2016,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() {