X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fcdrom.c;h=cdb7a1ee97cbad0a8190e391972e1a0800736f6b;hb=4ad17db3c1b6bfa042832d613369eda9c7ffff4f;hp=310ea4f273ae85ea1bf192d2ddc05d651c248e05;hpb=4f329f16f58b969df7ec9081549a7bbd70814f55;p=pcsx_rearmed.git

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 310ea4f2..cdb7a1ee 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -35,7 +35,7 @@
 #if 0
 #define CDR_LOG_I SysPrintf
 #else
-#define CDR_LOG_I(...)
+#define CDR_LOG_I log_unhandled
 #endif
 #if 0
 #define CDR_LOG_IO SysPrintf
@@ -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;
@@ -566,6 +567,8 @@ static int cdrSeekTime(unsigned char *target)
 }
 
 static void cdrReadInterrupt(void);
+static void cdrPrepCdda(s16 *buf, int samples);
+static void cdrAttenuate(s16 *buf, int samples, int stereo);
 
 void cdrPlaySeekReadInterrupt(void)
 {
@@ -612,6 +615,7 @@ void cdrPlaySeekReadInterrupt(void)
 		cdrPlayInterrupt_Autopause();
 
 	if (!cdr.Muted && !Config.Cdda) {
+		cdrPrepCdda(read_buf, CD_FRAMESIZE_RAW / 4);
 		cdrAttenuate(read_buf, CD_FRAMESIZE_RAW / 4, 1);
 		SPU_playCDDAchannel(read_buf, CD_FRAMESIZE_RAW, psxRegs.cycle, cdr.FirstSector);
 		cdr.FirstSector = 0;
@@ -1116,7 +1120,18 @@ void cdrInterrupt(void) {
  } while (0)
 #endif
 
-void cdrAttenuate(s16 *buf, int samples, int stereo)
+static void cdrPrepCdda(s16 *buf, int samples)
+{
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
+	int i;
+	for (i = 0; i < samples; i++) {
+		buf[i * 2 + 0] = SWAP16(buf[i * 2 + 0]);
+		buf[i * 2 + 1] = SWAP16(buf[i * 2 + 1]);
+	}
+#endif
+}
+
+static void cdrAttenuate(s16 *buf, int samples, int stereo)
 {
 	int i, l, r;
 	int ll = cdr.AttenuatorLeftToLeft;
@@ -1176,7 +1191,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 +1382,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 +1454,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) {
@@ -1464,10 +1486,6 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 
 	switch (chcr & 0x71000000) {
 		case 0x11000000:
-			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");
@@ -1491,6 +1509,8 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 				cdr.FifoOffset += size;
 				psxCpu->Clear(madr, size / 4);
 			}
+			if (size < cdsize)
+				CDR_LOG_I("cdrom: dma3 %d/%d\n", size, cdsize);
 
 			CDRDMA_INT((cdsize/4) * 24);
 
@@ -1506,7 +1526,7 @@ void psxDma3(u32 madr, u32 bcr, u32 chcr) {
 			return;
 
 		default:
-			CDR_LOG("psxDma3() Log: Unknown cddma %x\n", chcr);
+			CDR_LOG_I("psxDma3() Log: Unknown cddma %x\n", chcr);
 			break;
 	}
 
@@ -1575,6 +1595,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]);