psxbios: fix wrong regs in syscall handler

[pcsx_rearmed.git] / libpcsxcore / plugins.c

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 13ab297..6886a6a 100644 (file)
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -49,7 +49,6 @@ GPUmakeSnapshot       GPU_makeSnapshot;
 GPUfreeze             GPU_freeze;
 GPUgetScreenPic       GPU_getScreenPic;
 GPUshowScreenPic      GPU_showScreenPic;
-GPUclearDynarec       GPU_clearDynarec;
 GPUvBlank             GPU_vBlank;
 
 CDRinit               CDR_init;
@@ -72,18 +71,12 @@ CDRsetfilename        CDR_setfilename;
 CDRreadCDDA           CDR_readCDDA;
 CDRgetTE              CDR_getTE;
 
-SPUconfigure          SPU_configure;
-SPUabout              SPU_about;
 SPUinit               SPU_init;
 SPUshutdown           SPU_shutdown;
-SPUtest               SPU_test;
 SPUopen               SPU_open;
 SPUclose              SPU_close;
-SPUplaySample         SPU_playSample;
 SPUwriteRegister      SPU_writeRegister;
 SPUreadRegister       SPU_readRegister;
-SPUwriteDMA           SPU_writeDMA;
-SPUreadDMA            SPU_readDMA;
 SPUwriteDMAMem        SPU_writeDMAMem;
 SPUreadDMAMem         SPU_readDMAMem;
 SPUplayADPCMchannel   SPU_playADPCMchannel;
@@ -201,7 +194,6 @@ void CALLBACK GPU__makeSnapshot(void) {}
 void CALLBACK GPU__keypressed(int key) {}
 long CALLBACK GPU__getScreenPic(unsigned char *pMem) { return -1; }
 long CALLBACK GPU__showScreenPic(unsigned char *pMem) { return -1; }
-void CALLBACK GPU__clearDynarec(void (CALLBACK *callback)(void)) {}
 void CALLBACK GPU__vBlank(int val) {}
 
 #define LoadGpuSym1(dest, name) \
@@ -241,7 +233,6 @@ static int LoadGPUplugin(const char *GPUdll) {
        LoadGpuSym1(freeze, "GPUfreeze");
        LoadGpuSym0(getScreenPic, "GPUgetScreenPic");
        LoadGpuSym0(showScreenPic, "GPUshowScreenPic");
-       LoadGpuSym0(clearDynarec, "GPUclearDynarec");
        LoadGpuSym0(vBlank, "GPUvBlank");
        LoadGpuSym0(configure, "GPUconfigure");
        LoadGpuSym0(test, "GPUtest");
@@ -317,12 +308,8 @@ static int LoadCDRplugin(const char *CDRdll) {
        return 0;
 }
 
-void *hSPUDriver = NULL;
-
-long CALLBACK SPU__configure(void) { return 0; }
-void CALLBACK SPU__about(void) {}
-long CALLBACK SPU__test(void) { return 0; }
-void CALLBACK SPU__registerScheduleCb(void (CALLBACK *cb)(unsigned int)) {}
+static void *hSPUDriver = NULL;\r
+static void CALLBACK SPU__registerScheduleCb(void (CALLBACK *cb)(unsigned int)) {}\r
 
 #define LoadSpuSym1(dest, name) \
        LoadSym(SPU_##dest, SPU##dest, name, TRUE);
@@ -339,7 +326,6 @@ static int LoadSPUplugin(const char *SPUdll) {
 
        hSPUDriver = SysLoadLibrary(SPUdll);
        if (hSPUDriver == NULL) {
-               SPU_configure = NULL;
                SysMessage (_("Could not load SPU plugin %s!"), SPUdll); return -1;
        }
        drv = hSPUDriver;
@@ -347,13 +333,8 @@ static int LoadSPUplugin(const char *SPUdll) {
        LoadSpuSym1(shutdown, "SPUshutdown");
        LoadSpuSym1(open, "SPUopen");
        LoadSpuSym1(close, "SPUclose");
-       LoadSpuSym0(configure, "SPUconfigure");
-       LoadSpuSym0(about, "SPUabout");
-       LoadSpuSym0(test, "SPUtest");
        LoadSpuSym1(writeRegister, "SPUwriteRegister");
        LoadSpuSym1(readRegister, "SPUreadRegister");
-       LoadSpuSym1(writeDMA, "SPUwriteDMA");
-       LoadSpuSym1(readDMA, "SPUreadDMA");
        LoadSpuSym1(writeDMAMem, "SPUwriteDMAMem");
        LoadSpuSym1(readDMAMem, "SPUreadDMAMem");
        LoadSpuSym1(playADPCMchannel, "SPUplayADPCMchannel");
@@ -1120,10 +1101,6 @@ static int LoadSIO1plugin(const char *SIO1dll) {
 
 #endif
 
-void CALLBACK clearDynarec(void) {
-       psxCpu->Reset();
-}
-
 int LoadPlugins() {
        int ret;
        char Plugin[MAXPATHLEN * 2];