X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=28358bf65ed9c110915a18f1909f541b8a6b122c;hb=11d23573173ec4b5074eb35665c6012a46034d5c;hp=5f4ce60e5cf05531e6b2069ebb28fca402a8395b;hpb=10b9bf1ee1e2e6b6fa7f31f34cd27e385365ea26;p=pcsx_rearmed.git

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 5f4ce60e..28358bf6 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -102,7 +102,7 @@ static struct {
 	u16 CmdInProgress;
 	u8 Irq1Pending;
 	u8 unused5;
-	u32 unused6;
+	u32 LastReadCycles;
 
 	u8 unused7;
 
@@ -562,26 +562,18 @@ static void cdrPlayInterrupt_Autopause()
 	}
 }
 
+// LastReadCycles
 static int cdrSeekTime(unsigned char *target)
 {
 	int diff = msf2sec(cdr.SetSectorPlay) - msf2sec(target);
-	int seekTime = abs(diff) * (cdReadTime / 200);
-	/*
-	* Gameblabla :
-	* It was originally set to 1000000 for Driver, however it is not high enough for Worms Pinball
-	* and was unreliable for that game.
-	* I also tested it against Mednafen and Driver's titlescreen music starts 25 frames later, not immediatly.
-	*
-	* Obviously, this isn't perfect but right now, it should be a bit better.
-	* Games to test this against if you change that setting :
-	* - Driver (titlescreen music delay and retry mission)
-	* - Worms Pinball (Will either not boot or crash in the memory card screen)
-	* - Viewpoint (short pauses if the delay in the ingame music is too long)
-	*
-	* It seems that 3386880 * 5 is too much for Driver's titlescreen and it starts skipping.
-	* However, 1000000 is not enough for Worms Pinball to reliably boot.
-	*/
-	if(seekTime > 3386880 * 2) seekTime = 3386880 * 2;
+	int pausePenalty, seekTime = abs(diff) * (cdReadTime / 2000);
+	seekTime = MAX_VALUE(seekTime, 20000);
+
+	// need this stupidly long penalty or else Spyro2 intro desyncs
+	pausePenalty = (s32)(psxRegs.cycle - cdr.LastReadCycles) > cdReadTime * 4 ? cdReadTime * 25 : 0;
+	seekTime += pausePenalty;
+
+	seekTime = MIN_VALUE(seekTime, PSXCLK * 2 / 3);
 	CDR_LOG("seek: %.2f %.2f\n", (float)seekTime / PSXCLK, (float)seekTime / cdReadTime);
 	return seekTime;
 }
@@ -634,6 +626,8 @@ static void msfiAdd(u8 *msfi, u32 count)
 
 void cdrPlayReadInterrupt(void)
 {
+	cdr.LastReadCycles = psxRegs.cycle;
+
 	if (cdr.Reading) {
 		cdrReadInterrupt();
 		return;
@@ -914,7 +908,7 @@ void cdrInterrupt(void) {
 			}
 			else
 			{
-				second_resp_time = (((cdr.Mode & MODE_SPEED) ? 2 : 1) * 1000000);
+				second_resp_time = (((cdr.Mode & MODE_SPEED) ? 1 : 2) * 1097107);
 			}
 			SetPlaySeekRead(cdr.StatP, 0);
 			break;
@@ -1318,7 +1312,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 +1509,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);
 			}
 		}
@@ -1562,7 +1559,7 @@ void cdrWrite3(unsigned char rt) {
 }
 
 void psxDma3(u32 madr, u32 bcr, u32 chcr) {
-	u32 cdsize;
+	u32 cdsize, max_words;
 	int size;
 	u8 *ptr;
 
@@ -1577,7 +1574,7 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 
 	switch (chcr & 0x71000000) {
 		case 0x11000000:
-			ptr = (u8 *)PSXM(madr);
+			ptr = getDmaRam(madr, &max_words);
 			if (ptr == INVALID_PTR) {
 				CDR_LOG_I("psxDma3() Log: *** DMA 3 *** NULL Pointer!\n");
 				break;
@@ -1594,6 +1591,8 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 			size = DATA_SIZE - cdr.FifoOffset;
 			if (size > cdsize)
 				size = cdsize;
+			if (size > max_words * 4)
+				size = max_words * 4;
 			if (size > 0)
 			{
 				memcpy(ptr, cdr.Transfer + cdr.FifoOffset, size);
@@ -1712,8 +1711,6 @@ int cdrFreeze(void *f, int Mode) {
 			Find_CurTrack(cdr.SetSectorPlay);
 			if (!Config.Cdda)
 				CDR_play(cdr.SetSectorPlay);
-			if (psxRegs.interrupt & (1 << PSXINT_CDRPLAY_OLD))
-				CDRPLAYREAD_INT((cdr.Mode & MODE_SPEED) ? (cdReadTime / 2) : cdReadTime, 1);
 		}
 
 		if ((cdr.freeze_ver & 0xffffff00) != 0x63647200) {