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

See last commit, only for ipu. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2569 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-02-06 09:08:08 +00:00
parent 0ab52c9274
commit ebadb4b971
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pcsx2/IPU/IPU.cpp
View File

@ -182,14 +182,22 @@ void SaveStateBase::ipuFreeze()
// old versions saved the IPU regs, but they're already saved as part of HW! // old versions saved the IPU regs, but they're already saved as part of HW!
//FreezeMem(ipuRegs, sizeof(IPUregisters)); //FreezeMem(ipuRegs, sizeof(IPUregisters));
if (GetVersion() <= 3)
{
Freeze(g_nDMATransfer._u32); Freeze(g_nDMATransfer._u32);
//Freeze(ipu_fifo);
Freeze(ipu_fifo.in.readpos); Freeze(ipu_fifo.in.readpos);
Freeze(ipu_fifo.in.writepos); Freeze(ipu_fifo.in.writepos);
Freeze(ipu_fifo.in.data); Freeze(ipu_fifo.in.data);
Freeze(ipu_fifo.out.readpos); Freeze(ipu_fifo.out.readpos);
Freeze(ipu_fifo.out.writepos); Freeze(ipu_fifo.out.writepos);
Freeze(ipu_fifo.out.data); Freeze(ipu_fifo.out.data);
}
else
{
Freeze(g_nDMATransfer);
Freeze(ipu_fifo);
}
Freeze(g_BP); Freeze(g_BP);
Freeze(niq); Freeze(niq);
Freeze(iq); Freeze(iq);
@ -199,11 +207,16 @@ void SaveStateBase::ipuFreeze()
Freeze(g_decoder); Freeze(g_decoder);
Freeze(mpeg2_scan_norm); Freeze(mpeg2_scan_norm);
Freeze(mpeg2_scan_alt); Freeze(mpeg2_scan_alt);
//Freeze(ipu_cmd); if (GetVersion() <= 3)
{
Freeze(ipu_cmd.pos); Freeze(ipu_cmd.pos);
Freeze(ipu_cmd.index); Freeze(ipu_cmd.index);
Freeze(ipu_cmd.current); Freeze(ipu_cmd.current);
}
else
{
Freeze(ipu_cmd);
}
Freeze(_readbits); Freeze(_readbits);
int temp = readbits - _readbits; int temp = readbits - _readbits;

2
pcsx2/Linux/LnxKeyCodes.cpp
View File

@ -6,7 +6,7 @@
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
// Returns a WXK_* keycode, given osome kinda GKT input mess! // Returns a WXK_* keycode, given some kinda GDK input mess!
int TranslateGDKtoWXK( u32 keysym ) int TranslateGDKtoWXK( u32 keysym )
{ {
int key_code; int key_code;