From 4671428593fd51b14a80490bb95a1ee4866eb1a2 Mon Sep 17 00:00:00 2001 From: "Jake.Stine" Date: Mon, 13 Sep 2010 23:05:14 +0000 Subject: [PATCH] ... and update the savestate version, since I changed all the vif containers around. git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3764 96395faa-99c1-11dd-bbfe-3dabce05a288 --- pcsx2/SaveState.h | 2 +- pcsx2/Vif.cpp | 6 ------ pcsx2/Vif_Dma.h | 2 -- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/pcsx2/SaveState.h b/pcsx2/SaveState.h index f1bcda1950..bf506a3d58 100644 --- a/pcsx2/SaveState.h +++ b/pcsx2/SaveState.h @@ -24,7 +24,7 @@ // the lower 16 bit value. IF the change is breaking of all compatibility with old // states, increment the upper 16 bit value, and clear the lower 16 bits to 0. -static const u32 g_SaveVersion = 0x8b490000; +static const u32 g_SaveVersion = 0x8b4a0000; // this function is meant to be used in the place of GSfreeze, and provides a safe layer // between the GS saving function and the MTGS's needs. :) diff --git a/pcsx2/Vif.cpp b/pcsx2/Vif.cpp index 36fca019c5..f2d0b7da1c 100644 --- a/pcsx2/Vif.cpp +++ b/pcsx2/Vif.cpp @@ -31,8 +31,6 @@ void vif0Reset() memzero(vif0); memzero(vif0Regs); - vif0.regs = &vif0Regs; - resetNewVif(0); } @@ -42,8 +40,6 @@ void vif1Reset() memzero(vif1); memzero(vif1Regs); - vif1.regs = &vif1Regs; - resetNewVif(1); } @@ -80,7 +76,6 @@ __fi void vif0FBRST(u32 value) { //Console.WriteLn("Vif0 Reset %x", vif0Regs.stat._u32); memzero(vif0); - vif0.regs = &vif0Regs; vif0ch.qwc = 0; //? cpuRegs.interrupt &= ~1; //Stop all vif0 DMA's psHu64(VIF0_FIFO) = 0; @@ -140,7 +135,6 @@ __fi void vif1FBRST(u32 value) { if (FBRST(value).RST) // Reset Vif. { memzero(vif1); - vif1.regs = &vif1Regs; //cpuRegs.interrupt &= ~((1 << 1) | (1 << 10)); //Stop all vif1 DMA's vif1ch.qwc -= min((int)vif1ch.qwc, 16); //? diff --git a/pcsx2/Vif_Dma.h b/pcsx2/Vif_Dma.h index 75944ab609..4d9a301b79 100644 --- a/pcsx2/Vif_Dma.h +++ b/pcsx2/Vif_Dma.h @@ -69,8 +69,6 @@ struct vifStruct { bool vifstalled; bool stallontag; - VIFregisters* regs; - // GS registers used for calculating the size of the last local->host transfer initiated on the GS // Transfer size calculation should be restricted to GS emulation in the future tBITBLTBUF BITBLTBUF;