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

Worked on straightening up Plugins.cpp a bit. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1441 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-06-28 01:00:22 +00:00
parent 8abcc6dab2
commit 9547448020
3 changed files with 257 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

453
pcsx2/Plugins.cpp
View File

@ -214,10 +214,40 @@ _FWfreeze FWfreeze;
_FWtest FWtest; _FWtest FWtest;
_FWabout FWabout; _FWabout FWabout;
DEV9handler dev9Handler; DEV9handler dev9Handler;
USBhandler usbHandler; USBhandler usbHandler;
enum PluginTypes
{
GS = 0,
PAD,
PAD1,
PAD2,
SPU2,
CDVD,
DEV9,
USB,
FW
};
int PS2E_LT[9] = {
PS2E_LT_GS,
PS2E_LT_PAD,PS2E_LT_PAD, PS2E_LT_PAD,
PS2E_LT_SPU2,
PS2E_LT_CDVD,
PS2E_LT_DEV9,
PS2E_LT_USB,
PS2E_LT_FW};
int PS2E_VERSION[9] = {
PS2E_GS_VERSION,
PS2E_PAD_VERSION,PS2E_PAD_VERSION, PS2E_PAD_VERSION,
PS2E_SPU2_VERSION,
PS2E_CDVD_VERSION,
PS2E_DEV9_VERSION,
PS2E_USB_VERSION,
PS2E_FW_VERSION};
#define Sfy(x) #x #define Sfy(x) #x
#define Strfy(x) Sfy(x) #define Strfy(x) Sfy(x)
#define MapSymbolVarType(var,type,name) var = (type)SysLoadSym(drv,Strfy(name)) #define MapSymbolVarType(var,type,name) var = (type)SysLoadSym(drv,Strfy(name))
@ -235,13 +265,13 @@ USBhandler usbHandler;
#define MapSymbol_Error(name) MapSymbolVar_Error(name,name) #define MapSymbol_Error(name) MapSymbolVar_Error(name,name)
// for pad1/2 // for pad1/2
#define MapSymbolPAD(var,sym,name) MapSymbolVar(var##name,sym##name) #define MapSymbolPAD(var,name) MapSymbolVar(var##name,PAD##name)
#define MapSymbolPAD_Fallback(var,sym,name) if((MapSymbolVarType(var##name,_##sym##name,sym##name))==NULL) var##name = var##_##name #define MapSymbolPAD_Fallback(var,name) if((MapSymbolVarType(var##name,_PAD##name,PAD##name))==NULL) var##name = var##_##name
#define MapSymbolPAD_Error(var,sym,name) MapSymbolVar_Error(var##name,sym##name) #define MapSymbolPAD_Error(var,name) MapSymbolVar_Error(var##name,PAD##name)
#define TestPS2Esyms(type) if(_TestPS2Esyms(drv,PS2E_LT_##type,PS2E_##type##_VERSION,filename) < 0) return -1; void *GSplugin;
int _TestPS2Esyms(void* drv, int type, int expected_version, const string& filename) static int _TestPS2Esyms(void* drv, int type, int expected_version, const string& filename)
{ {
_PS2EgetLibType PS2EgetLibType; _PS2EgetLibType PS2EgetLibType;
_PS2EgetLibVersion2 PS2EgetLibVersion2; _PS2EgetLibVersion2 PS2EgetLibVersion2;
@ -261,10 +291,11 @@ int _TestPS2Esyms(void* drv, int type, int expected_version, const string& filen
return 0; return 0;
} }
//static const char *err; static __forceinline bool TestPS2Esyms(void* &drv, PluginTypes type, const string& filename)
//static int errval; {
if (_TestPS2Esyms(drv, PS2E_LT[type],PS2E_VERSION[type],filename) < 0) return false;
void *GSplugin; return true;
}
void CALLBACK GS_printf(int timeout, char *fmt, ...) { void CALLBACK GS_printf(int timeout, char *fmt, ...) {
va_list list; va_list list;
@ -292,7 +323,7 @@ int LoadGSplugin(const string& filename)
GSplugin = SysLoadLibrary(filename.c_str()); GSplugin = SysLoadLibrary(filename.c_str());
if (GSplugin == NULL) { Msgbox::Alert ("Could Not Load GS Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (GSplugin == NULL) { Msgbox::Alert ("Could Not Load GS Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = GSplugin; drv = GSplugin;
TestPS2Esyms(GS); if (!TestPS2Esyms(drv, GS, filename)) return -1;
MapSymbol_Error(GSinit); MapSymbol_Error(GSinit);
MapSymbol_Error(GSshutdown); MapSymbol_Error(GSshutdown);
MapSymbol_Error(GSopen); MapSymbol_Error(GSopen);
@ -347,24 +378,24 @@ int LoadPAD1plugin(const string& filename) {
PAD1plugin = SysLoadLibrary(filename.c_str()); PAD1plugin = SysLoadLibrary(filename.c_str());
if (PAD1plugin == NULL) { Msgbox::Alert("Could Not Load PAD1 Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (PAD1plugin == NULL) { Msgbox::Alert("Could Not Load PAD1 Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = PAD1plugin; drv = PAD1plugin;
TestPS2Esyms(PAD); if (!TestPS2Esyms(drv, PAD, filename)) return -1;
MapSymbolPAD_Error(PAD1,PAD,init); MapSymbolPAD_Error(PAD1,init);
MapSymbolPAD_Error(PAD1,PAD,shutdown); MapSymbolPAD_Error(PAD1,shutdown);
MapSymbolPAD_Error(PAD1,PAD,open); MapSymbolPAD_Error(PAD1,open);
MapSymbolPAD_Error(PAD1,PAD,close); MapSymbolPAD_Error(PAD1,close);
MapSymbolPAD_Error(PAD1,PAD,keyEvent); MapSymbolPAD_Error(PAD1,keyEvent);
MapSymbolPAD_Error(PAD1,PAD,startPoll); MapSymbolPAD_Error(PAD1,startPoll);
MapSymbolPAD_Error(PAD1,PAD,poll); MapSymbolPAD_Error(PAD1,poll);
MapSymbolPAD_Error(PAD1,PAD,query); MapSymbolPAD_Error(PAD1,query);
MapSymbolPAD(PAD1,PAD,update); MapSymbolPAD(PAD1,update);
MapSymbolPAD(PAD1,PAD,gsDriverInfo); MapSymbolPAD(PAD1,gsDriverInfo);
MapSymbolPAD_Fallback(PAD1,PAD,configure); MapSymbolPAD_Fallback(PAD1,configure);
MapSymbolPAD_Fallback(PAD1,PAD,about); MapSymbolPAD_Fallback(PAD1,about);
MapSymbolPAD_Fallback(PAD1,PAD,test); MapSymbolPAD_Fallback(PAD1,test);
MapSymbolPAD_Fallback(PAD1,PAD,freeze); MapSymbolPAD_Fallback(PAD1,freeze);
MapSymbolPAD_Fallback(PAD1,PAD,setSlot); MapSymbolPAD_Fallback(PAD1,setSlot);
MapSymbolPAD_Fallback(PAD1,PAD,queryMtap); MapSymbolPAD_Fallback(PAD1,queryMtap);
return 0; return 0;
} }
@ -384,24 +415,24 @@ int LoadPAD2plugin(const string& filename) {
PAD2plugin = SysLoadLibrary(filename.c_str()); PAD2plugin = SysLoadLibrary(filename.c_str());
if (PAD2plugin == NULL) { Msgbox::Alert("Could Not Load PAD2 Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (PAD2plugin == NULL) { Msgbox::Alert("Could Not Load PAD2 Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = PAD2plugin; drv = PAD2plugin;
TestPS2Esyms(PAD); if (!TestPS2Esyms(drv, PAD, filename)) return -1;
MapSymbolPAD_Error(PAD2,PAD,init); MapSymbolPAD_Error(PAD2,init);
MapSymbolPAD_Error(PAD2,PAD,shutdown); MapSymbolPAD_Error(PAD2,shutdown);
MapSymbolPAD_Error(PAD2,PAD,open); MapSymbolPAD_Error(PAD2,open);
MapSymbolPAD_Error(PAD2,PAD,close); MapSymbolPAD_Error(PAD2,close);
MapSymbolPAD_Error(PAD2,PAD,keyEvent); MapSymbolPAD_Error(PAD2,keyEvent);
MapSymbolPAD_Error(PAD2,PAD,startPoll); MapSymbolPAD_Error(PAD2,startPoll);
MapSymbolPAD_Error(PAD2,PAD,poll); MapSymbolPAD_Error(PAD2,poll);
MapSymbolPAD_Error(PAD2,PAD,query); MapSymbolPAD_Error(PAD2,query);
MapSymbolPAD(PAD2,PAD,update); MapSymbolPAD(PAD2,update);
MapSymbolPAD(PAD2,PAD,gsDriverInfo); MapSymbolPAD(PAD2,gsDriverInfo);
MapSymbolPAD_Fallback(PAD2,PAD,configure); MapSymbolPAD_Fallback(PAD2,configure);
MapSymbolPAD_Fallback(PAD2,PAD,about); MapSymbolPAD_Fallback(PAD2,about);
MapSymbolPAD_Fallback(PAD2,PAD,test); MapSymbolPAD_Fallback(PAD2,test);
MapSymbolPAD_Fallback(PAD2,PAD,freeze); MapSymbolPAD_Fallback(PAD2,freeze);
MapSymbolPAD_Fallback(PAD2,PAD,setSlot); MapSymbolPAD_Fallback(PAD2,setSlot);
MapSymbolPAD_Fallback(PAD2,PAD,queryMtap); MapSymbolPAD_Fallback(PAD2,queryMtap);
return 0; return 0;
} }
@ -419,7 +450,7 @@ int LoadSPU2plugin(const string& filename) {
SPU2plugin = SysLoadLibrary(filename.c_str()); SPU2plugin = SysLoadLibrary(filename.c_str());
if (SPU2plugin == NULL) { Msgbox::Alert("Could Not Load SPU2 Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (SPU2plugin == NULL) { Msgbox::Alert("Could Not Load SPU2 Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = SPU2plugin; drv = SPU2plugin;
TestPS2Esyms(SPU2); if (!TestPS2Esyms(drv, SPU2, filename)) return -1;
MapSymbol_Error(SPU2init); MapSymbol_Error(SPU2init);
MapSymbol_Error(SPU2shutdown); MapSymbol_Error(SPU2shutdown);
MapSymbol_Error(SPU2open); MapSymbol_Error(SPU2open);
@ -462,7 +493,7 @@ int LoadCDVDplugin(const string& filename) {
CDVDplugin = SysLoadLibrary(filename.c_str()); CDVDplugin = SysLoadLibrary(filename.c_str());
if (CDVDplugin == NULL) { Msgbox::Alert("Could Not Load CDVD Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (CDVDplugin == NULL) { Msgbox::Alert("Could Not Load CDVD Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = CDVDplugin; drv = CDVDplugin;
TestPS2Esyms(CDVD); if (!TestPS2Esyms(drv, CDVD, filename)) return -1;
MapSymbol_Error(CDVDinit); MapSymbol_Error(CDVDinit);
MapSymbol_Error(CDVDshutdown); MapSymbol_Error(CDVDshutdown);
MapSymbol_Error(CDVDopen); MapSymbol_Error(CDVDopen);
@ -499,7 +530,7 @@ int LoadDEV9plugin(const string& filename) {
DEV9plugin = SysLoadLibrary(filename.c_str()); DEV9plugin = SysLoadLibrary(filename.c_str());
if (DEV9plugin == NULL) { Msgbox::Alert("Could Not Load DEV9 Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (DEV9plugin == NULL) { Msgbox::Alert("Could Not Load DEV9 Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = DEV9plugin; drv = DEV9plugin;
TestPS2Esyms(DEV9); if (!TestPS2Esyms(drv, DEV9, filename)) return -1;
MapSymbol_Error(DEV9init); MapSymbol_Error(DEV9init);
MapSymbol_Error(DEV9shutdown); MapSymbol_Error(DEV9shutdown);
MapSymbol_Error(DEV9open); MapSymbol_Error(DEV9open);
@ -536,7 +567,7 @@ int LoadUSBplugin(const string& filename) {
USBplugin = SysLoadLibrary(filename.c_str()); USBplugin = SysLoadLibrary(filename.c_str());
if (USBplugin == NULL) { Msgbox::Alert("Could Not Load USB Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (USBplugin == NULL) { Msgbox::Alert("Could Not Load USB Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = USBplugin; drv = USBplugin;
TestPS2Esyms(USB); if (!TestPS2Esyms(drv, USB, filename)) return -1;
MapSymbol_Error(USBinit); MapSymbol_Error(USBinit);
MapSymbol_Error(USBshutdown); MapSymbol_Error(USBshutdown);
MapSymbol_Error(USBopen); MapSymbol_Error(USBopen);
@ -573,7 +604,7 @@ int LoadFWplugin(const string& filename) {
FWplugin = SysLoadLibrary(filename.c_str()); FWplugin = SysLoadLibrary(filename.c_str());
if (FWplugin == NULL) { Msgbox::Alert("Could Not Load FW Plugin '%hs': %s", params &filename, SysLibError()); return -1; } if (FWplugin == NULL) { Msgbox::Alert("Could Not Load FW Plugin '%hs': %s", params &filename, SysLibError()); return -1; }
drv = FWplugin; drv = FWplugin;
TestPS2Esyms(FW); if (!TestPS2Esyms(drv, FW, filename)) return -1;
MapSymbol_Error(FWinit); MapSymbol_Error(FWinit);
MapSymbol_Error(FWshutdown); MapSymbol_Error(FWshutdown);
MapSymbol_Error(FWopen); MapSymbol_Error(FWopen);
@ -605,13 +636,13 @@ struct PluginOpenStatusFlags
static PluginOpenStatusFlags OpenStatus = {0}; static PluginOpenStatusFlags OpenStatus = {0};
static bool loadp = false; static bool plugins_loaded = false;
static bool initp = false; static bool plugins_initialized = false;
static bool cdvdElf = false; static bool only_loading_elf = false;
int LoadPlugins() int LoadPlugins()
{ {
if( loadp ) return 0; if (plugins_loaded) return 0;
if (LoadGSplugin( Path::Combine( Config.PluginsDir, Config.GS )) == -1) return -1; if (LoadGSplugin( Path::Combine( Config.PluginsDir, Config.GS )) == -1) return -1;
if (LoadPAD1plugin( Path::Combine( Config.PluginsDir, Config.PAD1 )) == -1) return -1; if (LoadPAD1plugin( Path::Combine( Config.PluginsDir, Config.PAD1 )) == -1) return -1;
@ -622,80 +653,73 @@ int LoadPlugins()
if (LoadUSBplugin( Path::Combine( Config.PluginsDir, Config.USB )) == -1) return -1; if (LoadUSBplugin( Path::Combine( Config.PluginsDir, Config.USB )) == -1) return -1;
if (LoadFWplugin( Path::Combine( Config.PluginsDir, Config.FW )) == -1) return -1; if (LoadFWplugin( Path::Combine( Config.PluginsDir, Config.FW )) == -1) return -1;
loadp = true; plugins_loaded = true;
return 0; return 0;
} }
bool ReportError(int err, const char *str)
{
if (err != 0)
{
Msgbox::Alert("%s error: %d", params str, err);
return true;
}
return false;
}
bool ReportError2(int err, const char *str)
{
if (err != 0)
{
Msgbox::Alert("Error Opening %s Plugin", params str, err);
return true;
}
return false;
}
int InitPlugins() int InitPlugins()
{ {
if( initp ) return 0; if (plugins_initialized) return 0;
// Ensure plugins have been loaded.... // Ensure plugins have been loaded....
if( LoadPlugins() == -1 ) return -1; if (LoadPlugins() == -1) return -1;
//if( !loadp ) //if( !plugins_loaded ) throw Exception::InvalidOperation( "Bad coder mojo - InitPlugins called prior to plugins having been loaded." );
// throw Exception::InvalidOperation( "Bad coder mojo - InitPlugins called prior to plugins having been loaded." );
#ifndef _WIN32 if (ReportError(GSinit(), "GSinit")) return -1;
//chdir(MAIN_DIR); if (ReportError(PAD1init(1), "PAD1init")) return -1;
#endif if (ReportError(PAD2init(2), "PAD2init")) return -1;
int ret; if (ReportError(SPU2init(), "SPU2init")) return -1;
if (ReportError(CDVDinit(), "CDVDinit")) return -1;
if (ReportError(DEV9init(), "DEV9init")) return -1;
if (ReportError(USBinit(), "USBinit")) return -1;
if (ReportError(FWinit(), "FWinit")) return -1;
ret = GSinit(); only_loading_elf = false;
if (ret != 0) { Msgbox::Alert("GSinit error: %d", params ret); return -1; } plugins_initialized = true;
ret = PAD1init(1);
if (ret != 0) { Msgbox::Alert("PAD1init error: %d", params ret); return -1; }
ret = PAD2init(2);
if (ret != 0) { Msgbox::Alert("PAD2init error: %d", params ret); return -1; }
ret = SPU2init();
if (ret != 0) { Msgbox::Alert("SPU2init error: %d", params ret); return -1; }
ret = CDVDinit();
if (ret != 0) { Msgbox::Alert("CDVDinit error: %d", params ret); return -1; }
ret = DEV9init();
if (ret != 0) { Msgbox::Alert("DEV9init error: %d", params ret); return -1; }
ret = USBinit();
if (ret != 0) { Msgbox::Alert("USBinit error: %d", params ret); return -1; }
ret = FWinit();
if (ret != 0) { Msgbox::Alert("FWinit error: %d", params ret); return -1; }
cdvdElf = false;
initp = true;
return 0; return 0;
} }
void ShutdownPlugins() void ShutdownPlugins()
{ {
if( !initp ) return; if (!plugins_initialized) return;
mtgsWaitGS(); mtgsWaitGS();
ClosePlugins( true ); ClosePlugins( true );
if( GSshutdown != NULL ) if (GSshutdown != NULL) GSshutdown();
GSshutdown();
if( PAD1shutdown != NULL ) if (PAD1shutdown != NULL) PAD1shutdown();
PAD1shutdown(); if (PAD2shutdown != NULL) PAD2shutdown();
if( PAD2shutdown != NULL )
PAD2shutdown();
if( SPU2shutdown != NULL ) if (SPU2shutdown != NULL) SPU2shutdown();
SPU2shutdown(); if (CDVDshutdown != NULL) CDVDshutdown();
if (DEV9shutdown != NULL) DEV9shutdown();
if (USBshutdown != NULL) USBshutdown();
if (FWshutdown != NULL) FWshutdown();
if( CDVDshutdown != NULL ) plugins_initialized = false;
CDVDshutdown();
if( DEV9shutdown != NULL )
DEV9shutdown();
if( USBshutdown != NULL )
USBshutdown();
if( FWshutdown != NULL )
FWshutdown();
initp = false;
} }
uptr pDsp; uptr pDsp;
@ -703,131 +727,167 @@ extern void spu2DMA4Irq();
extern void spu2DMA7Irq(); extern void spu2DMA7Irq();
extern void spu2Irq(); extern void spu2Irq();
int OpenPlugins(const char* pTitleFilename) bool OpenGS()
{ {
GSdriverInfo info; GSdriverInfo info;
int ret;
if (!OpenStatus.GS)
if ( !initp )
{ {
if( InitPlugins() == -1 ) return -1; if (ReportError2(gsOpen(), "GS"))
} {
ClosePlugins(true);
#ifndef _WIN32 return false;
// change dir so that CDVD can find its config file
/*char file[255], pNewTitle[255];
chdir(MAIN_DIR);
chdir(Config.PluginsDir);
if( pTitleFilename != NULL && pTitleFilename[0] != '/' )
{
// because we are changing the dir, we have to set a new title if it is a relative dir
sprintf(pNewTitle, "%s/%s", file, pTitleFilename);
pTitleFilename = pNewTitle;
}*/
#endif
// Don't Repetitively Open CDVD plugin if directly loading an elf file and Open failed once already
if( !OpenStatus.CDVD && !cdvdElf)
{
//first we need the data
if (CDVDnewDiskCB) CDVDnewDiskCB(cdvdNewDiskCB);
ret = CDVDopen(pTitleFilename);
if (ret != 0) {
if (g_Startup.BootMode != BootMode_Elf) { Msgbox::Alert("Error Opening CDVD Plugin"); goto OpenError; }
else { Console::Notice("Running ELF File Without CDVD Plugin Support!"); cdvdElf = 1; }
} }
OpenStatus.CDVD = true;
}
if( !OpenStatus.GS ) { //Get the user input.
ret = gsOpen(); if (GSgetDriverInfo)
if (ret != 0) { Msgbox::Alert("Error Opening GS Plugin"); goto OpenError; } {
OpenStatus.GS = true;
//then the user input
if (GSgetDriverInfo) {
GSgetDriverInfo(&info); GSgetDriverInfo(&info);
if (PAD1gsDriverInfo) PAD1gsDriverInfo(&info); if (PAD1gsDriverInfo) PAD1gsDriverInfo(&info);
if (PAD2gsDriverInfo) PAD2gsDriverInfo(&info); if (PAD2gsDriverInfo) PAD2gsDriverInfo(&info);
} }
OpenStatus.GS = true;
} }
return true;
}
if( !OpenStatus.PAD1 ) bool OpenCDVD(const char* pTitleFilename)
{
// Don't repetitively open the CDVD plugin if directly loading an elf file and open failed once already.
if (!OpenStatus.CDVD && !only_loading_elf)
{ {
ret = PAD1open((void *)&pDsp); //First, we need the data.
if (ret != 0) { Msgbox::Alert("Error Opening PAD1 Plugin"); goto OpenError; } if (CDVDnewDiskCB) CDVDnewDiskCB(cdvdNewDiskCB);
if (CDVDopen(pTitleFilename) != 0)
{
if (g_Startup.BootMode != BootMode_Elf)
{
Msgbox::Alert("Error Opening CDVD Plugin");
ClosePlugins(true);
return false;
}
else
{
Console::Notice("Running ELF File Without CDVD Plugin Support!");
only_loading_elf = true;
}
}
OpenStatus.CDVD = true;
}
return true;
}
bool OpenPAD1()
{
if (!OpenStatus.PAD1)
{
if (ReportError2(PAD1open((void *)&pDsp), "PAD1"))
{
ClosePlugins(true);
return false;
}
OpenStatus.PAD1 = true; OpenStatus.PAD1 = true;
} }
return true;
}
if( !OpenStatus.PAD2 ) bool OpenPAD2()
{
if (!OpenStatus.PAD2)
{ {
ret = PAD2open((void *)&pDsp); if (ReportError2(PAD2open((void *)&pDsp), "PAD2"))
if (ret != 0) { Msgbox::Alert("Error Opening PAD2 Plugin"); goto OpenError; } {
ClosePlugins(true);
return false;
}
OpenStatus.PAD2 = true; OpenStatus.PAD2 = true;
} }
return true;
}
//the sound bool OpenSPU2()
{
if( !OpenStatus.SPU2 ) if (!OpenStatus.SPU2)
{ {
SPU2irqCallback(spu2Irq,spu2DMA4Irq,spu2DMA7Irq); SPU2irqCallback(spu2Irq,spu2DMA4Irq,spu2DMA7Irq);
if( SPU2setDMABaseAddr != NULL )
SPU2setDMABaseAddr((uptr)psxM); if (SPU2setDMABaseAddr != NULL) SPU2setDMABaseAddr((uptr)psxM);
if (SPU2setClockPtr != NULL) SPU2setClockPtr(&psxRegs.cycle);
if(SPU2setClockPtr != NULL) if (ReportError2(SPU2open((void*)&pDsp), "SPU2"))
SPU2setClockPtr(&psxRegs.cycle); {
ClosePlugins(true);
ret = SPU2open((void*)&pDsp); return false;
if (ret != 0) { Msgbox::Alert("Error Opening SPU2 Plugin"); goto OpenError; } }
OpenStatus.SPU2 = true; OpenStatus.SPU2 = true;
} }
return true;
}
//and last the dev9 bool OpenDEV9()
if( !OpenStatus.DEV9 ) {
if (!OpenStatus.DEV9)
{ {
DEV9irqCallback(dev9Irq); DEV9irqCallback(dev9Irq);
dev9Handler = DEV9irqHandler(); dev9Handler = DEV9irqHandler();
ret = DEV9open(&psxRegs.pc); //((void *)&pDsp);
if (ret != 0) { Msgbox::Alert("Error Opening DEV9 Plugin"); goto OpenError; } if (ReportError2(DEV9open(&psxRegs.pc)/*((void *)&pDsp)*/, "DEV9"))
{
ClosePlugins(true);
return false;
}
OpenStatus.DEV9 = true; OpenStatus.DEV9 = true;
} }
return true;
if( !OpenStatus.USB ) }
bool OpenUSB()
{
if (!OpenStatus.USB)
{ {
USBirqCallback(usbIrq); USBirqCallback(usbIrq);
usbHandler = USBirqHandler(); usbHandler = USBirqHandler();
USBsetRAM(psxM); USBsetRAM(psxM);
ret = USBopen((void *)&pDsp);
if (ret != 0) { Msgbox::Alert("Error Opening USB Plugin"); goto OpenError; } if (ReportError2(USBopen((void *)&pDsp), "USB"))
{
ClosePlugins(true);
return false;
}
OpenStatus.USB = true; OpenStatus.USB = true;
} }
return true;
}
if( !OpenStatus.FW ) bool OpenFW()
{
if (!OpenStatus.FW)
{ {
FWirqCallback(fwIrq); FWirqCallback(fwIrq);
ret = FWopen((void *)&pDsp);
if (ret != 0) { Msgbox::Alert("Error Opening FW Plugin"); goto OpenError; } if (ReportError2(FWopen((void *)&pDsp), "FW"))
{
ClosePlugins(true);
return false;
}
OpenStatus.FW = true; OpenStatus.FW = true;
} }
return true;
}
if( !cdvdElf ) int OpenPlugins(const char* pTitleFilename)
cdvdNewDiskCB(); {
if (!plugins_initialized)
{
if( InitPlugins() == -1 ) return -1;
}
#ifndef _WIN32 if ((!OpenCDVD(pTitleFilename)) || (!OpenGS()) || (!OpenPAD1()) || (!OpenPAD2()) ||
//chdir(MAIN_DIR); (!OpenSPU2()) || (!OpenDEV9()) || (!OpenUSB()) || (!OpenFW()))
#endif return -1;
if (!only_loading_elf) cdvdNewDiskCB();
return 0; return 0;
OpenError:
ClosePlugins( true );
#ifndef _WIN32
//chdir(MAIN_DIR);
#endif
return -1;
} }
@ -857,7 +917,9 @@ void ClosePlugins( bool closegs )
OpenStatus.GS = false; OpenStatus.GS = false;
} }
else else
{
mtgsWaitGS(); mtgsWaitGS();
}
} }
CLOSE_PLUGIN( CDVD ); CLOSE_PLUGIN( CDVD );
@ -865,16 +927,6 @@ void ClosePlugins( bool closegs )
CLOSE_PLUGIN( USB ); CLOSE_PLUGIN( USB );
CLOSE_PLUGIN( FW ); CLOSE_PLUGIN( FW );
CLOSE_PLUGIN( SPU2 ); CLOSE_PLUGIN( SPU2 );
// More special treatment for the GS. It needs a complete shutdown and re-init
// or else it will tend to error out when we try to use it again.
if( 0 ) //closegs )
{
GSshutdown();
int ret = GSinit();
if (ret != 0) { Msgbox::Alert("GSinit error: %d", params ret); }
}
} }
//used to close the GS plugin window and pads, to switch gsdx renderer //used to close the GS plugin window and pads, to switch gsdx renderer
@ -894,11 +946,11 @@ void CloseGS()
void ReleasePlugins() void ReleasePlugins()
{ {
if (!loadp) return; if (!plugins_loaded) return;
if (GSplugin == NULL || PAD1plugin == NULL || PAD2plugin == NULL || if ((GSplugin == NULL) || (PAD1plugin == NULL) || (PAD2plugin == NULL) ||
SPU2plugin == NULL || CDVDplugin == NULL || DEV9plugin == NULL || (SPU2plugin == NULL) || (CDVDplugin == NULL) || (DEV9plugin == NULL) ||
USBplugin == NULL || FWplugin == NULL) return; (USBplugin == NULL) || (FWplugin == NULL)) return;
ShutdownPlugins(); ShutdownPlugins();
@ -910,7 +962,8 @@ void ReleasePlugins()
SysCloseLibrary(DEV9plugin); DEV9plugin = NULL; SysCloseLibrary(DEV9plugin); DEV9plugin = NULL;
SysCloseLibrary(USBplugin); USBplugin = NULL; SysCloseLibrary(USBplugin); USBplugin = NULL;
SysCloseLibrary(FWplugin); FWplugin = NULL; SysCloseLibrary(FWplugin); FWplugin = NULL;
loadp = false;
plugins_loaded = false;
} }
void PluginsResetGS() void PluginsResetGS()

2
pcsx2/SPR.cpp
View File

@ -347,7 +347,7 @@ void _dmaSPR1() // toSPR work function
{ {
Console::WriteLn("SPR1 Tag BUSERR"); Console::WriteLn("SPR1 Tag BUSERR");
spr1->chcr = (spr1->chcr & 0xFFFF) | ((*ptag) & 0xFFFF0000); //Transfer upper part of tag to CHCR bits 31-15 spr1->chcr = (spr1->chcr & 0xFFFF) | ((*ptag) & 0xFFFF0000); //Transfer upper part of tag to CHCR bits 31-15
psHu32(DMAC_STAT) |= 1 << 15; //If yes, set BEIS (BUSERR) in DMAC_STAT register psHu32(DMAC_STAT) |= DMAC_STAT_BEIS; //If yes, set BEIS (BUSERR) in DMAC_STAT register
done = TRUE; done = TRUE;
spr1finished = (done) ? 1: 0; spr1finished = (done) ? 1: 0;
return; return;

6
pcsx2/VifDma.cpp
View File

@ -1385,7 +1385,7 @@ int _chainVIF0()
{ {
Console::Error("Vif0 Tag BUSERR"); Console::Error("Vif0 Tag BUSERR");
vif0ch->chcr = (vif0ch->chcr & 0xFFFF) | ((*vif0ptag) & 0xFFFF0000); //Transfer upper part of tag to CHCR bits 31-15 vif0ch->chcr = (vif0ch->chcr & 0xFFFF) | ((*vif0ptag) & 0xFFFF0000); //Transfer upper part of tag to CHCR bits 31-15
psHu32(DMAC_STAT) |= 1 << 15; //If yes, set BEIS (BUSERR) in DMAC_STAT register psHu32(DMAC_STAT) |= DMAC_STAT_BEIS; //If yes, set BEIS (BUSERR) in DMAC_STAT register
return -1; //Return -1 as an error has occurred return -1; //Return -1 as an error has occurred
} }
@ -2358,7 +2358,7 @@ void vif1TransferFromMemory()
if (pMem == NULL) //Is vif0ptag empty? if (pMem == NULL) //Is vif0ptag empty?
{ {
Console::WriteLn("Vif1 Tag BUSERR"); Console::WriteLn("Vif1 Tag BUSERR");
psHu32(DMAC_STAT) |= 1 << 15; //If yes, set BEIS (BUSERR) in DMAC_STAT register psHu32(DMAC_STAT) |= DMAC_STAT_BEIS; //If yes, set BEIS (BUSERR) in DMAC_STAT register
vif1.done = true; vif1.done = true;
vif1Regs->stat &= ~0x1f000000; vif1Regs->stat &= ~0x1f000000;
vif1ch->qwc = 0; vif1ch->qwc = 0;
@ -2467,7 +2467,7 @@ __forceinline void vif1SetupTransfer()
{ {
Console::Error("Vif1 Tag BUSERR"); Console::Error("Vif1 Tag BUSERR");
vif1ch->chcr = (vif1ch->chcr & 0xFFFF) | ((*vif1ptag) & 0xFFFF0000); //Transfer upper part of tag to CHCR bits 31-15 vif1ch->chcr = (vif1ch->chcr & 0xFFFF) | ((*vif1ptag) & 0xFFFF0000); //Transfer upper part of tag to CHCR bits 31-15
psHu32(DMAC_STAT) |= 1 << 15; //If yes, set BEIS (BUSERR) in DMAC_STAT register psHu32(DMAC_STAT) |= DMAC_STAT_BEIS; //If yes, set BEIS (BUSERR) in DMAC_STAT register
return; //Return -1 as an error has occurred return; //Return -1 as an error has occurred
} }