X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fpsxdma.c;h=70e12f6e149660780611a70ff33c41437d287f45;hb=ececcc61fa9115edcc51892a27aaa720d983e23e;hp=b0f3fba4752d50ff92c926e54b9f5df7a006213f;hpb=58ebb94c13df061762a7aca78e52f066339d9610;p=pcsx_rearmed.git

diff --git a/libpcsxcore/psxdma.c b/libpcsxcore/psxdma.c
index b0f3fba4..70e12f6e 100644
--- a/libpcsxcore/psxdma.c
+++ b/libpcsxcore/psxdma.c
@@ -54,7 +54,7 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
 			words = (bcr >> 16) * (bcr & 0xffff);
 			SPU_writeDMAMem(ptr, words * 2, psxRegs.cycle);
 			HW_DMA4_MADR = SWAPu32(madr + words * 4);
-			SPUDMA_INT(words / 2);
+			SPUDMA_INT(words * 4);
 			return;
 
 		case 0x01000200: //spu to cpu transfer
@@ -73,14 +73,12 @@ void psxDma4(u32 madr, u32 bcr, u32 chcr) { // SPU
 			psxCpu->Clear(madr, words);
 
 			HW_DMA4_MADR = SWAPu32(madr + words * 4);
-			SPUDMA_INT(words / 2);
+			SPUDMA_INT(words * 4);
 			return;
 
-#ifdef PSXDMA_LOG
 		default:
-			PSXDMA_LOG("*** DMA4 SPU - unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
+			log_unhandled("*** DMA4 SPU - unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
 			break;
-#endif
 	}
 
 	HW_DMA4_CHCR &= SWAP32(~0x01000000);
@@ -122,7 +120,8 @@ static u32 gpuDmaChainSize(u32 addr) {
 		// next 32-bit pointer
 		addr = psxMu32( addr & ~0x3 ) & 0xffffff;
 		size += 1;
-	} while (addr != 0xffffff);
+	} while (!(addr & 0x800000)); // contrary to some documentation, the end-of-linked-list marker is not actually 0xFF'FFFF
+                                  // any pointer with bit 23 set will do.
 
 	return size;
 }
@@ -184,7 +183,7 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 			size = GPU_dmaChain((u32 *)psxM, madr & 0x1fffff);
 			if ((int)size <= 0)
 				size = gpuDmaChainSize(madr);
-			HW_GPU_STATUS &= ~PSXGPU_nBUSY;
+			HW_GPU_STATUS &= SWAP32(~PSXGPU_nBUSY);
 
 			// we don't emulate progress, just busy flag and end irq,
 			// so pretend we're already at the last block
@@ -199,11 +198,9 @@ void psxDma2(u32 madr, u32 bcr, u32 chcr) { // GPU
 			GPUDMA_INT(size);
 			return;
 
-#ifdef PSXDMA_LOG
 		default:
-			PSXDMA_LOG("*** DMA 2 - GPU unknown *** %lx addr = %lx size = %lx\n", chcr, madr, bcr);
+			log_unhandled("*** DMA 2 - GPU unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
 			break;
-#endif
 	}
 
 	HW_DMA2_CHCR &= SWAP32(~0x01000000);
@@ -216,11 +213,11 @@ void gpuInterrupt() {
 		HW_DMA2_CHCR &= SWAP32(~0x01000000);
 		DMA_INTERRUPT(2);
 	}
-	HW_GPU_STATUS |= PSXGPU_nBUSY; // GPU no longer busy
+	HW_GPU_STATUS |= SWAP32(PSXGPU_nBUSY); // GPU no longer busy
 }
 
 void psxDma6(u32 madr, u32 bcr, u32 chcr) {
-	u32 size;
+	u32 words;
 	u32 *mem = (u32 *)PSXM(madr);
 
 #ifdef PSXDMA_LOG
@@ -238,23 +235,24 @@ void psxDma6(u32 madr, u32 bcr, u32 chcr) {
 		}
 
 		// already 32-bit size
-		size = bcr;
+		words = bcr;
 
 		while (bcr--) {
 			*mem-- = SWAP32((madr - 4) & 0xffffff);
 			madr -= 4;
 		}
-		mem++; *mem = 0xffffff;
+		*++mem = SWAP32(0xffffff);
 
-		GPUOTCDMA_INT(size);
+		//GPUOTCDMA_INT(size);
+		// halted
+		psxRegs.cycle += words;
+		GPUOTCDMA_INT(16);
 		return;
 	}
-#ifdef PSXDMA_LOG
 	else {
 		// Unknown option
-		PSXDMA_LOG("*** DMA6 OT - unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
+		log_unhandled("*** DMA6 OT - unknown *** %x addr = %x size = %x\n", chcr, madr, bcr);
 	}
-#endif
 
 	HW_DMA6_CHCR &= SWAP32(~0x01000000);
 	DMA_INTERRUPT(6);