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

diff --git a/libpcsxcore/cdrom.c b/libpcsxcore/cdrom.c
index 000e5482..310ea4f2 100644
--- a/libpcsxcore/cdrom.c
+++ b/libpcsxcore/cdrom.c
@@ -1462,9 +1462,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;
@@ -1493,15 +1492,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;