ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

... 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
This commit is contained in:
Jake.Stine 2010-09-13 23:05:14 +00:00
parent 59ebdf3e60
commit 4671428593
3 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2/SaveState.h
View File

@ -24,7 +24,7 @@
// the lower 16 bit value. IF the change is breaking of all compatibility with old // 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. // 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 // 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. :) // between the GS saving function and the MTGS's needs. :)

6
pcsx2/Vif.cpp
View File

@ -31,8 +31,6 @@ void vif0Reset()
memzero(vif0); memzero(vif0);
memzero(vif0Regs); memzero(vif0Regs);
vif0.regs = &vif0Regs;
resetNewVif(0); resetNewVif(0);
} }
@ -42,8 +40,6 @@ void vif1Reset()
memzero(vif1); memzero(vif1);
memzero(vif1Regs); memzero(vif1Regs);
vif1.regs = &vif1Regs;
resetNewVif(1); resetNewVif(1);
} }
@ -80,7 +76,6 @@ __fi void vif0FBRST(u32 value) {
//Console.WriteLn("Vif0 Reset %x", vif0Regs.stat._u32); //Console.WriteLn("Vif0 Reset %x", vif0Regs.stat._u32);
memzero(vif0); memzero(vif0);
vif0.regs = &vif0Regs;
vif0ch.qwc = 0; //? vif0ch.qwc = 0; //?
cpuRegs.interrupt &= ~1; //Stop all vif0 DMA's cpuRegs.interrupt &= ~1; //Stop all vif0 DMA's
psHu64(VIF0_FIFO) = 0; psHu64(VIF0_FIFO) = 0;
@ -140,7 +135,6 @@ __fi void vif1FBRST(u32 value) {
if (FBRST(value).RST) // Reset Vif. if (FBRST(value).RST) // Reset Vif.
{ {
memzero(vif1); memzero(vif1);
vif1.regs = &vif1Regs;
//cpuRegs.interrupt &= ~((1 << 1) | (1 << 10)); //Stop all vif1 DMA's //cpuRegs.interrupt &= ~((1 << 1) | (1 << 10)); //Stop all vif1 DMA's
vif1ch.qwc -= min((int)vif1ch.qwc, 16); //? vif1ch.qwc -= min((int)vif1ch.qwc, 16); //?

2
pcsx2/Vif_Dma.h
View File

@ -69,8 +69,6 @@ struct vifStruct {
bool vifstalled; bool vifstalled;
bool stallontag; bool stallontag;
VIFregisters* regs;
// GS registers used for calculating the size of the last local->host transfer initiated on the GS // 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 // Transfer size calculation should be restricted to GS emulation in the future
tBITBLTBUF BITBLTBUF; tBITBLTBUF BITBLTBUF;