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

Made USBsetRAM work again. Required for the following commit. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4897 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gigaherz 2011-09-04 01:49:34 +00:00
parent a9d59b1b66
commit 266f6fcd5d
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/portable.ini
View File

@ -0,0 +1 @@
RunWizard=0

6
pcsx2/PluginManager.cpp
View File

@ -646,6 +646,7 @@ static const LegacyApi_ReqMethod s_MethMessReq_USB[] =
static const LegacyApi_OptMethod s_MethMessOpt_USB[] = static const LegacyApi_OptMethod s_MethMessOpt_USB[] =
{ {
{ "USBasync", (vMeth**)&USBasync }, { "USBasync", (vMeth**)&USBasync },
{ "USBsetRAM", (vMeth**)&USBsetRAM },
{ NULL } { NULL }
}; };
@ -1108,8 +1109,9 @@ bool SysCorePlugins::OpenPlugin_USB()
if( USBopen((void*)pDsp) ) return false; if( USBopen((void*)pDsp) ) return false;
USBirqCallback( usbIrq ); USBirqCallback( usbIrq );
usbHandler = USBirqHandler(); usbHandler = USBirqHandler();
if( USBsetRAM != NULL ) // iopMem is not initialized yet. Moved elsewhere
USBsetRAM(iopMem->Main); //if( USBsetRAM != NULL )
// USBsetRAM(iopMem->Main);
return true; return true;
} }

4
pcsx2/R5900.cpp
View File

@ -90,6 +90,10 @@ void cpuReset()
DiscSerial = L""; DiscSerial = L"";
ElfEntry = -1; ElfEntry = -1;
// Probably not the right place, but it has to be done when the ram is actually initialized
if(USBsetRAM != 0)
USBsetRAM(iopMem->Main);
// FIXME: LastELF should be reset on media changes as well as on CPU resets, in // FIXME: LastELF should be reset on media changes as well as on CPU resets, in
// the very unlikely case that a user swaps to another media source that "looks" // the very unlikely case that a user swaps to another media source that "looks"
// the same (identical ELF names) but is actually different (devs actually could // the same (identical ELF names) but is actually different (devs actually could