X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fmdec.c;h=167a1cff1145f1844799ef2f41d40e4d5a47d605;hb=bd9ad3d8eb63cee4e69913f121548badf834dd9e;hp=d6c7ab68fd34bb95cf3f556856830158097de206;hpb=fc4803bdc2c9840a007c60e422fb0531107b80f2;p=pcsx_rearmed.git

diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c
index d6c7ab68..167a1cff 100644
--- a/libpcsxcore/mdec.c
+++ b/libpcsxcore/mdec.c
@@ -32,7 +32,12 @@
  * 320x240x16@60Hz => 9.216 MB/s
  * so 2.0 to 4.0 should be fine.
  */
-#define MDEC_BIAS 2
+ 
+/*
+ * >= 10 for Galerians
+ * <= 18 for "Disney's Treasure Planet"
+ */
+#define MDEC_BIAS 10
 
 #define DSIZE			8
 #define DSIZE2			(DSIZE * DSIZE)
@@ -471,6 +476,7 @@ void psxDma0(u32 adr, u32 bcr, u32 chcr) {
 	int size;
 
 	if (chcr != 0x01000201) {
+		log_unhandled("mdec0: invalid dma %08x\n", chcr);
 		return;
 	}
 
@@ -480,7 +486,7 @@ void psxDma0(u32 adr, u32 bcr, u32 chcr) {
 	size = (bcr >> 16) * (bcr & 0xffff);
 
 	switch (cmd >> 28) {
-		case 0x3: // decode
+		case 0x3: // decode 15/24bpp
 			mdec.rl = (u16 *) PSXM(adr);
 			/* now the mdec is busy till all data are decoded */
 			mdec.reg1 |= MDEC1_BUSY;
@@ -488,10 +494,8 @@ void psxDma0(u32 adr, u32 bcr, u32 chcr) {
 			mdec.rl_end = mdec.rl + (size * 2);
 
 			/* sanity check */
-			if(mdec.rl_end <= mdec.rl) {
-				MDECINDMA_INT( size / 4 );
-				return;
-			}
+			if(mdec.rl_end <= mdec.rl)
+				break;
 
 			/* process the pending dma1 */
 			if(mdec.pending_dma1.adr){
@@ -510,23 +514,18 @@ void psxDma0(u32 adr, u32 bcr, u32 chcr) {
 				iqtab_init(iq_y, p);
 				iqtab_init(iq_uv, p + 64);
 			}
-
-			MDECINDMA_INT( size / 4 );
-      return;
+			break;
 
 		case 0x6: // cosine table
 			// printf("mdec cosine table\n");
-
-			MDECINDMA_INT( size / 4 );
-      return;
+			break;
 
 		default:
-			// printf("mdec unknown command\n");
+			log_unhandled("mdec: unknown command %08x\n", cmd);
 			break;
 	}
 
-	HW_DMA0_CHCR &= SWAP32(~0x01000000);
-	DMA_INTERRUPT(0);
+	MDECINDMA_INT(size);
 }
 
 void mdec0Interrupt()
@@ -547,7 +546,10 @@ void psxDma1(u32 adr, u32 bcr, u32 chcr) {
 	int size;
 	u32 words;
 
-	if (chcr != 0x01000200) return;
+	if (chcr != 0x01000200) {
+		log_unhandled("mdec1: invalid dma %08x\n", chcr);
+		return;
+	}
 
 	words = (bcr >> 16) * (bcr & 0xffff);
 	/* size in byte */
@@ -622,8 +624,10 @@ void psxDma1(u32 adr, u32 bcr, u32 chcr) {
 		}
 	}
 	
-	/* define the power of mdec */
-	MDECOUTDMA_INT(words * MDEC_BIAS);
+		/* define the power of mdec */
+		MDECOUTDMA_INT(words * MDEC_BIAS);
+		/* some CPU stalling */
+		psxRegs.cycle += words;
 	}
 }