X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=1aa958b0642ae99e301d487e7d0f138ee930b190;hp=fa0e6a9f24eaeac6d132a7add585835c2c9473e1;hb=8e1040b6a82ee1802fda83d4de84290a02656cc0;hpb=9b470ab7ede4edfa4d933a434f45a563302d7de7

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index fa0e6a9f..1aa958b0 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -26,6 +26,7 @@
 #include "psxdma.h"
 
 cdrStruct cdr;
+static unsigned char *pTransfer;
 
 /* CD-ROM magic numbers */
 #define CdlSync        0
@@ -541,6 +542,9 @@ static void cdrPlayInterrupt_Autopause()
 	struct SubQ *subq = (struct SubQ *)CDR_getBufferSub();
 	int track_changed = 0;
 	if (subq != NULL ) {
+		// update subq
+		ReadTrack( cdr.SetSectorPlay );
+
 #ifdef CDR_LOG
 		CDR_LOG( "CDDA SUB - %X:%X:%X\n",
 			subq->AbsoluteAddress[0], subq->AbsoluteAddress[1], subq->AbsoluteAddress[2] );
@@ -553,7 +557,7 @@ static void cdrPlayInterrupt_Autopause()
 		Tomb Raider 1 ($7)
 		*/
 
-		if( cdr.CurTrack < btoi( subq->TrackNumber ) )
+		if( cdr.CurTrack + 1 == btoi( subq->TrackNumber ) )
 			track_changed = 1;
 	} else {
 		Create_Fake_Subq();
@@ -958,6 +962,9 @@ void cdrInterrupt() {
 			subq = (struct SubQ *)CDR_getBufferSub();
 
 			if (subq != NULL) {
+				// update subq
+				ReadTrack( cdr.SetSectorPlay );
+
 				cdr.Result[0] = subq->TrackNumber;
 				cdr.Result[1] = subq->IndexNumber;
 				memcpy(cdr.Result + 2, subq->TrackRelativeAddress, 3);
@@ -1264,6 +1271,9 @@ void cdrInterrupt() {
 
 	Check_Shell( Irq );
 
+	cdr.ParamP = 0;
+	cdr.ParamC = 0;
+
 	if (cdr.Stat != NoIntr && cdr.Reg2 != 0x18) {
 		psxHu32ref(0x1070) |= SWAP32((u32)0x4);
 	}
@@ -1450,13 +1460,7 @@ void cdrWrite0(unsigned char rt) {
 #ifdef CDR_LOG
 	CDR_LOG("cdrWrite0() Log: CD0 write: %x\n", rt);
 #endif
-	cdr.Ctrl = rt | (cdr.Ctrl & ~0x3);
-
-	if (rt == 0) {
-		cdr.ParamP = 0;
-		cdr.ParamC = 0;
-		cdr.ResultReady = 0;
-	}
+	cdr.Ctrl = (rt & 3) | (cdr.Ctrl & ~3);
 }
 
 unsigned char cdrRead1(void) {
@@ -1506,7 +1510,9 @@ void cdrWrite1(unsigned char rt) {
 	}
 #endif
 
-	if (cdr.Ctrl & 0x1) return;
+	if (cdr.Ctrl & 0x3) return;
+
+	cdr.ResultReady = 0;
 
 	switch (cdr.Cmd) {
     	case CdlSync:
@@ -1809,6 +1815,8 @@ void cdrWrite1(unsigned char rt) {
         	break;
 
     	default:
+		cdr.ParamP = 0;
+		cdr.ParamC = 0;
 #ifdef CDR_LOG
 		CDR_LOG("cdrWrite1() Log: Unknown command: %x\n", cdr.Cmd);
 #endif
@@ -1825,7 +1833,7 @@ unsigned char cdrRead2(void) {
 	if (cdr.Readed == 0) {
 		ret = 0;
 	} else {
-		ret = *cdr.pTransfer++;
+		ret = *pTransfer++;
 	}
 
 #ifdef CDR_LOG
@@ -1861,7 +1869,7 @@ void cdrWrite2(unsigned char rt) {
 				cdr.Reg2 = rt;
 				break;
 		}
-	} else if (!(cdr.Ctrl & 0x1) && cdr.ParamP < 8) {
+	} else if (!(cdr.Ctrl & 0x3) && cdr.ParamP < 8) {
 		cdr.Param[cdr.ParamP++] = rt;
 		cdr.ParamC++;
 	}
@@ -1914,7 +1922,7 @@ void cdrWrite3(unsigned char rt) {
 	}
 
 
-	if (rt == 0x07 && cdr.Ctrl & 0x1) {
+	if (rt == 0x07 && (cdr.Ctrl & 3) == 1) {
 		cdr.Stat = 0;
 
 		if (cdr.Irq == 0xff) {
@@ -1939,18 +1947,18 @@ void cdrWrite3(unsigned char rt) {
 		return;
 	}
 
-	if (rt == 0x80 && !(cdr.Ctrl & 0x1) && cdr.Readed == 0) {
+	if (rt == 0x80 && !(cdr.Ctrl & 0x3) && cdr.Readed == 0) {
 		cdr.Readed = 1;
-		cdr.pTransfer = cdr.Transfer;
+		pTransfer = cdr.Transfer;
 
 		switch (cdr.Mode & 0x30) {
 			case MODE_SIZE_2328:
 			case 0x00:
-				cdr.pTransfer += 12;
+				pTransfer += 12;
 				break;
 
 			case MODE_SIZE_2340:
-				cdr.pTransfer += 0;
+				pTransfer += 0;
 				break;
 
 			default:
@@ -2006,16 +2014,16 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 			- CdlPlay
 			- Spams DMA3 and gets buffer overrun
 			*/
-			size = CD_FRAMESIZE_RAW - (cdr.pTransfer - cdr.Transfer);
+			size = CD_FRAMESIZE_RAW - (pTransfer - cdr.Transfer);
 			if (size > cdsize)
 				size = cdsize;
 			if (size > 0)
 			{
-				memcpy(ptr, cdr.pTransfer, size);
+				memcpy(ptr, pTransfer, size);
 			}
 
 			psxCpu->Clear(madr, cdsize / 4);
-			cdr.pTransfer += cdsize;
+			pTransfer += cdsize;
 
 
 			// burst vs normal
@@ -2052,6 +2060,7 @@ void cdrReset() {
 	cdr.CurTrack = 1;
 	cdr.File = 1;
 	cdr.Channel = 1;
+	pTransfer = cdr.Transfer;
 
 	// BIOS player - default values
 	cdr.AttenuatorLeft[0] = 0x80;
@@ -2061,8 +2070,7 @@ void cdrReset() {
 }
 
 int cdrFreeze(gzFile f, int Mode) {
-	uintptr_t tmp;
-
+	u32 tmp;
 
 	if( Mode == 0 ) {
 		StopCdda();
@@ -2071,12 +2079,12 @@ int cdrFreeze(gzFile f, int Mode) {
 	gzfreeze(&cdr, sizeof(cdr));
 	
 	if (Mode == 1)
-		tmp = cdr.pTransfer - cdr.Transfer;
+		tmp = pTransfer - cdr.Transfer;
 
 	gzfreeze(&tmp, sizeof(tmp));
 
 	if (Mode == 0) {
-		cdr.pTransfer = cdr.Transfer + tmp;
+		pTransfer = cdr.Transfer + tmp;
 
 		if (cdr.Play && !Config.Cdda)
 			CDR_play(cdr.SetSectorPlay);