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

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 5f4ce60e..7bc57cff 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -1318,7 +1318,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 +1515,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 +1565,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 +1580,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 +1597,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);