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

Removed legacy savestate code (should have done it in my prev commits, but forgot). Made the PCSX2 startup a bit smarter and less assumptive about the UserDocs folder. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2673 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
Jake.Stine 2010-03-05 21:00:49 +00:00
parent 0d03b06708
commit 3e709bade8
5 changed files with 38 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pcsx2/IPU/IPU.cpp
View File

@ -182,22 +182,9 @@ void SaveStateBase::ipuFreeze()
// old versions saved the IPU regs, but they're already saved as part of HW!
//FreezeMem(ipuRegs, sizeof(IPUregisters));
if (GetVersion() <= 3)
{
Freeze(g_nDMATransfer._u32);
Freeze(ipu_fifo.in.readpos);
Freeze(ipu_fifo.in.writepos);
Freeze(ipu_fifo.in.data);
Freeze(ipu_fifo.out.readpos);
Freeze(ipu_fifo.out.writepos);
Freeze(ipu_fifo.out.data);
}
else
{
Freeze(g_nDMATransfer);
Freeze(ipu_fifo);
}
Freeze(g_nDMATransfer);
Freeze(ipu_fifo);
Freeze(g_BP);
Freeze(niq);
Freeze(iq);
@ -207,16 +194,9 @@ void SaveStateBase::ipuFreeze()
Freeze(g_decoder);
Freeze(mpeg2_scan_norm);
Freeze(mpeg2_scan_alt);
if (GetVersion() <= 3)
{
Freeze(ipu_cmd.pos);
Freeze(ipu_cmd.index);
Freeze(ipu_cmd.current);
}
else
{
Freeze(ipu_cmd);
}
Freeze(ipu_cmd);
Freeze(_readbits);
int temp = readbits - _readbits;
@ -240,7 +220,7 @@ __forceinline u32 ipuRead32(u32 mem)
// Note: It's assumed that mem's input value is always in the 0x10002000 page
// of memory (if not, it's probably bad code).
jASSUME((mem & ~0xff) == 0x10002000);
pxAssert((mem & ~0xff) == 0x10002000);
mem &= 0xff; // ipu repeats every 0x100
IPUProcessInterrupt();
@ -273,7 +253,7 @@ __forceinline u64 ipuRead64(u32 mem)
// Note: It's assumed that mem's input value is always in the 0x10002000 page
// of memory (if not, it's probably bad code).
jASSUME((mem & ~0xff) == 0x10002000);
pxAssert((mem & ~0xff) == 0x10002000);
mem &= 0xff; // ipu repeats every 0x100
IPUProcessInterrupt();
@ -325,7 +305,7 @@ __forceinline void ipuWrite32(u32 mem, u32 value)
// Note: It's assumed that mem's input value is always in the 0x10002000 page
// of memory (if not, it's probably bad code).
jASSUME((mem & ~0xfff) == 0x10002000);
pxAssert((mem & ~0xfff) == 0x10002000);
mem &= 0xfff;
IPUProcessInterrupt();
@ -364,7 +344,7 @@ __forceinline void ipuWrite64(u32 mem, u64 value)
// Note: It's assumed that mem's input value is always in the 0x10002000 page
// of memory (if not, it's probably bad code).
jASSUME((mem & ~0xfff) == 0x10002000);
pxAssert((mem & ~0xfff) == 0x10002000);
mem &= 0xfff;
IPUProcessInterrupt();

35
pcsx2/Sif.cpp
View File

@ -40,37 +40,6 @@ void SaveStateBase::sifFreeze()
{
FreezeTag("SIFdma");
if (GetVersion() <= 3)
{
// Nasty backwards compatability stuff.
old_sif_structure old_sif0, old_sif1;
bool ee_busy[2], iop_busy[2];
old_sif0.fifo = sif0.fifo;
old_sif1.fifo = sif1.fifo;
ee_busy[0] = sif0.ee.busy;
ee_busy[1] = sif1.ee.busy;
iop_busy[0] = sif0.iop.busy;
iop_busy[1] = sif1.iop.busy;
old_sif0.end = (sif0.ee.end) ? 1 : 0;
old_sif1.end = (sif1.ee.end) ? 1 : 0;
old_sif0.counter = sif0.iop.counter;
old_sif1.counter = sif1.iop.counter;
old_sif0.data = sif0.iop.data;
old_sif1.data = sif1.iop.data;
Freeze(old_sif0);
Freeze(old_sif1);
Freeze(ee_busy);
Freeze(iop_busy);
}
else
{
Freeze(sif0);
Freeze(sif1);
}
Freeze(sif0);
Freeze(sif1);
}

9
pcsx2/Sio.cpp
View File

@ -652,14 +652,7 @@ void SaveStateBase::sioFreeze()
u64 m_mcdCRCs[2][8];
FreezeTag( "sio" );
if (GetVersion() == 0) {
FreezeMem( &sio, sizeof( sio ) - 4);
memset(sio.activePadSlot, 0, sizeof(sio.activePadSlot));
memset(sio.activeMemcardSlot, 0, sizeof(sio.activeMemcardSlot));
}
else {
Freeze( sio );
}
Freeze( sio );
if( IsSaving() )
{

26
pcsx2/Vif.cpp
View File

@ -70,34 +70,16 @@ void SaveStateBase::vif0Freeze()
Freeze(g_vifmask); // mask settings for VIF0 and VIF1
Freeze(vif0);
if (GetVersion() <= 3) {
static u32 g_vif0Masks[64]; // Dummy Var for saved state compatibility
static u32 g_vif0HasMask3[4]; // Dummy Var for saved state compatibility
Freeze(g_vif0HasMask3); // Not Used Anymore
Freeze(g_vif0Masks); // Not Used Anymore
nVif[0].bSize = 0;
}
else {
Freeze(nVif[0].bSize);
FreezeMem(nVif[0].buffer, nVif[0].bSize);
}
Freeze(nVif[0].bSize);
FreezeMem(nVif[0].buffer, nVif[0].bSize);
}
void SaveStateBase::vif1Freeze()
{
Freeze(vif1);
if (GetVersion() <= 3) {
static u32 g_vif1Masks[64]; // Dummy Var for saved state compatibility
static u32 g_vif1HasMask3[4]; // Dummy Var for saved state compatibility
Freeze(g_vif1HasMask3); // Not Used Anymore
Freeze(g_vif1Masks); // Not Used Anymore
nVif[1].bSize = 0;
}
else {
Freeze(nVif[1].bSize);
FreezeMem(nVif[1].buffer, nVif[1].bSize);
}
Freeze(nVif[1].bSize);
FreezeMem(nVif[1].buffer, nVif[1].bSize);
}
//------------------------------------------------------------------

36
pcsx2/gui/AppInit.cpp
View File

@ -121,22 +121,28 @@ void Pcsx2App::ReadUserModeSettings()
hackedVersion.ShowModal();
}
if( m_ForceWizard || !conf_usermode->HasGroup( groupname ) )
bool hasGroup = conf_usermode->HasGroup( groupname );
bool forceWiz = m_ForceWizard || !hasGroup || !conf_usermode->HasEntry( L"DocumentsFolderMode" );
if( forceWiz )
{
// Pre-Alpha Warning! Why didn't I think to add this sooner?!
wxDialogWithHelpers preAlpha( NULL, _("It might devour your kittens! - PCSX2 0.9.7 Pre-Alpha"), wxVERTICAL );
preAlpha.SetSizer( new wxBoxSizer( wxVERTICAL ) );
preAlpha += new pxStaticText( &preAlpha,
L"NOTICE!! This is a *PRE-ALPHA* developer build of PCSX2 0.9.7. We are in the middle of major rewrites of the "
L"user interface, and many parts of the program have *NOT* been implemented yet. Options will be missing. "
L"Some things may crash or hang without warning. Other things will seem plainly stupid and the product of incompetent "
L"programmers. This is normal. We're working on it.\n\nYou have been warned!", wxALIGN_CENTER
);
preAlpha += new wxButton( &preAlpha, wxID_OK ) | pxSizerFlags::StdCenter();
preAlpha.ShowModal();
if( !hasGroup )
{
wxDialogWithHelpers preAlpha( NULL, _("It might devour your kittens! - PCSX2 0.9.7 Pre-Alpha"), wxVERTICAL );
preAlpha.SetSizer( new wxBoxSizer( wxVERTICAL ) );
preAlpha += new pxStaticText( &preAlpha,
L"NOTICE!! This is a *PRE-ALPHA* developer build of PCSX2 0.9.7. We are in the middle of major rewrites of the "
L"user interface, and many parts of the program have *NOT* been implemented yet. Options will be missing. "
L"Some things may crash or hang without warning. Other things will seem plainly stupid and the product of incompetent "
L"programmers. This is normal. We're working on it.\n\nYou have been warned!", wxALIGN_CENTER
);
preAlpha += new wxButton( &preAlpha, wxID_OK ) | pxSizerFlags::StdCenter();
preAlpha.ShowModal();
}
// first time startup, so give the user the choice of user mode:
OpenWizardConsole();
@ -152,8 +158,8 @@ void Pcsx2App::ReadUserModeSettings()
}
else
{
// usermode.ini exists -- assume User Documents mode, unless the ini explicitly
// specifies otherwise.
// usermode.ini exists and is populated with valid data -- assume User Documents mode,
// unless the ini explicitly specifies otherwise.
DocsFolderMode = DocsFolder_User;