X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=libpcsxcore%2Fmdec.c;h=6cf288654395c60c6652a4da909ef2a0ca123c1d;hp=629816bc706e5c07575f574325a345d53cfa2a00;hb=ad418c19cd4ca9a80820593609b786c6993b2eda;hpb=528ad661dd07067cbcd6c1beebad63fc36795759

diff --git a/libpcsxcore/mdec.c b/libpcsxcore/mdec.c
index 629816bc..6cf28865 100644
--- a/libpcsxcore/mdec.c
+++ b/libpcsxcore/mdec.c
@@ -219,7 +219,7 @@ struct _pending_dma1 {
 	u32 chcr;
 };
 
-struct {
+static struct {
 	u32 reg0;
 	u32 reg1;
 	u16 * rl;
@@ -436,11 +436,10 @@ static void yuv2rgb24(int *blk, u8 *image) {
 }
 
 void mdecInit(void) {
+	memset(&mdec, 0, sizeof(mdec));
+	memset(iq_y, 0, sizeof(iq_y));
+	memset(iq_uv, 0, sizeof(iq_uv));
 	mdec.rl = (u16 *)&psxM[0x100000];
-	mdec.reg0 = 0;
-	mdec.reg1 = 0;
-	mdec.pending_dma1.adr = 0;
-	mdec.block_buffer_pos = 0;
 }
 
 // command register
@@ -532,8 +531,11 @@ void psxDma0(u32 adr, u32 bcr, u32 chcr) {
 
 void mdec0Interrupt()
 {
-	HW_DMA0_CHCR &= SWAP32(~0x01000000);
-	DMA_INTERRUPT(0);
+	if (HW_DMA0_CHCR & SWAP32(0x01000000))
+	{
+		HW_DMA0_CHCR &= SWAP32(~0x01000000);
+		DMA_INTERRUPT(0);
+	}
 }
 
 #define SIZE_OF_24B_BLOCK (16*16*3)
@@ -652,22 +654,21 @@ void mdec1Interrupt() {
 	 *
 	 */
 
-	/* this else if avoid to read outside memory */
-	if(mdec.rl >= mdec.rl_end) {
-		mdec.reg1 &= ~MDEC1_STP;
-		HW_DMA0_CHCR &= SWAP32(~0x01000000);
-		DMA_INTERRUPT(0);
-		mdec.reg1 &= ~MDEC1_BUSY;
-	} else if (SWAP16(*(mdec.rl)) == MDEC_END_OF_DATA) {
-		mdec.reg1 &= ~MDEC1_STP;
-		HW_DMA0_CHCR &= SWAP32(~0x01000000);
-		DMA_INTERRUPT(0);
-		mdec.reg1 &= ~MDEC1_BUSY;
+	/* MDEC_END_OF_DATA avoids read outside memory */
+	if (mdec.rl >= mdec.rl_end || SWAP16(*(mdec.rl)) == MDEC_END_OF_DATA) {
+		mdec.reg1 &= ~(MDEC1_STP|MDEC1_BUSY);
+		if (HW_DMA0_CHCR & SWAP32(0x01000000))
+		{
+			HW_DMA0_CHCR &= SWAP32(~0x01000000);
+			DMA_INTERRUPT(0);
+		}
 	}
 
-	HW_DMA1_CHCR &= SWAP32(~0x01000000);
-	DMA_INTERRUPT(1);
-	return;
+	if (HW_DMA1_CHCR & SWAP32(0x01000000))
+	{
+		HW_DMA1_CHCR &= SWAP32(~0x01000000);
+		DMA_INTERRUPT(1);
+	}
 }
 
 int mdecFreeze(gzFile f, int Mode) {