X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=a3ddb44737fdd82cb9b4d40a9e44709bce515add;hb=742a21f278bff9a6c5c7f07a3fd8026fef47676a;hp=000e54829625d272bef2025d078494cec6222ced;hpb=79cd4919a2ceb70170da6eae1882d1738b4e54a9;p=pcsx_rearmed.git

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 000e5482..a3ddb447 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -76,7 +76,7 @@ static struct {
 	unsigned char ResultP;
 	unsigned char ResultReady;
 	unsigned char Cmd;
-	unsigned char Readed;
+	unsigned char unused4;
 	unsigned char SetlocPending;
 	u32 Reading;
 
@@ -95,7 +95,8 @@ static struct {
 
 	xa_decode_t Xa;
 
-	u32 FifoOffset;
+	u16 FifoOffset;
+	u16 FifoSize;
 
 	u16 CmdInProgress;
 	u8 Irq1Pending;
@@ -1176,7 +1177,8 @@ static void cdrUpdateTransferBuf(const u8 *buf)
 	memcpy(cdr.Transfer, buf, DATA_SIZE);
 	CheckPPFCache(cdr.Transfer, cdr.Prev[0], cdr.Prev[1], cdr.Prev[2]);
 	CDR_LOG("cdr.Transfer %x:%x:%x\n", cdr.Transfer[0], cdr.Transfer[1], cdr.Transfer[2]);
-	cdr.Readed = 0;
+	if (cdr.FifoOffset < 2048 + 12)
+		CDR_LOG("cdrom: FifoOffset(1) %d/%d\n", cdr.FifoOffset, cdr.FifoSize);
 }
 
 static void cdrReadInterrupt(void)
@@ -1366,10 +1368,10 @@ void cdrWrite1(unsigned char rt) {
 unsigned char cdrRead2(void) {
 	unsigned char ret = 0;
 
-	if (cdr.Readed && cdr.FifoOffset < DATA_SIZE)
+	if (cdr.FifoOffset < cdr.FifoSize)
 		ret = cdr.Transfer[cdr.FifoOffset++];
 	else
-		CDR_LOG_I("cdrom: read empty fifo\n");
+		CDR_LOG_I("cdrom: read empty fifo (%d)\n", cdr.FifoSize);
 
 	CDR_LOG_IO("cdr r2.dat: %02x\n", ret);
 	return ret;
@@ -1438,21 +1440,27 @@ void cdrWrite3(unsigned char rt) {
 		return;
 	}
 
-	if ((rt & 0x80) && cdr.Readed == 0) {
-		cdr.Readed = 1;
-
+	// test: Viewpoint
+	if ((rt & 0x80) && cdr.FifoOffset < cdr.FifoSize) {
+		CDR_LOG("cdrom: FifoOffset(2) %d/%d\n", cdr.FifoOffset, cdr.FifoSize);
+	}
+	else if (rt & 0x80) {
 		switch (cdr.Mode & 0x30) {
 			case MODE_SIZE_2328:
 			case 0x00:
 				cdr.FifoOffset = 12;
+				cdr.FifoSize = 2048 + 12;
 				break;
 
 			case MODE_SIZE_2340:
 			default:
 				cdr.FifoOffset = 0;
+				cdr.FifoSize = 2340;
 				break;
 		}
 	}
+	else if (!(rt & 0xc0))
+		cdr.FifoOffset = DATA_SIZE; // fifo empty
 }
 
 void psxDma3(u32 madr, u32 bcr, u32 chcr) {
@@ -1462,13 +1470,8 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 
 	CDR_LOG("psxDma3() Log: *** DMA 3 *** %x addr = %x size = %x\n", chcr, madr, bcr);
 
-	switch (chcr) {
+	switch (chcr & 0x71000000) {
 		case 0x11000000:
-		case 0x11400100:
-			if (cdr.Readed == 0) {
-				CDR_LOG_I("psxDma3() Log: *** DMA 3 *** NOT READY\n");
-				break;
-			}
 			ptr = (u8 *)PSXM(madr);
 			if (ptr == NULL) {
 				CDR_LOG_I("psxDma3() Log: *** DMA 3 *** NULL Pointer!\n");
@@ -1493,15 +1496,16 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 				psxCpu->Clear(madr, size / 4);
 			}
 
-			if( chcr == 0x11400100 ) {
+			CDRDMA_INT((cdsize/4) * 24);
+
+			HW_DMA3_CHCR &= SWAPu32(~0x10000000);
+			if (chcr & 0x100) {
 				HW_DMA3_MADR = SWAPu32(madr + cdsize);
-				CDRDMA_INT( (cdsize/4) / 4 );
+				HW_DMA3_BCR &= SWAPu32(0xffff0000);
 			}
-			else if( chcr == 0x11000000 ) {
-				// CDRDMA_INT( (cdsize/4) * 1 );
+			else {
 				// halted
-				psxRegs.cycle += (cdsize/4) * 24/2;
-				CDRDMA_INT(16);
+				psxRegs.cycle += (cdsize/4) * 24 - 20;
 			}
 			return;
 
@@ -1575,6 +1579,7 @@ int cdrFreeze(void *f, int Mode) {
 		getCdInfo();
 
 		cdr.FifoOffset = tmp;
+		cdr.FifoSize = (cdr.Mode & 0x20) ? 2340 : 2048 + 12;
 
 		// read right sub data
 		tmpp[0] = btoi(cdr.Prev[0]);