X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin.c;h=cf3d575dce6292370d73a4ae0edc64c98f730163;hp=a5f9830c9eb67880a239e2815579a46bdac5f282;hb=4e47706596441172d1cc3f203b8baa398cea3023;hpb=24de2dd4dbdd50e44c91c40ebbc7d59ee1c0ac9b

diff --git a/frontend/plugin.c b/frontend/plugin.c
index a5f9830c..cf3d575d 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -11,7 +11,7 @@
 
 #include "plugin_lib.h"
 #include "plugin.h"
-#include "../libpcsxcore/psemu_plugin_defs.h"
+#include "psemu_plugin_defs.h"
 #include "../libpcsxcore/system.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
 
@@ -25,19 +25,20 @@ extern long SPUinit(void);
 extern long SPUshutdown(void);
 extern long SPUclose(void);
 extern void SPUplaySample(unsigned char);
-extern void SPUwriteRegister(unsigned long, unsigned short);
+extern void SPUwriteRegister(unsigned long, unsigned short, unsigned int);
 extern unsigned short SPUreadRegister(unsigned long);
 extern void SPUwriteDMA(unsigned short);
 extern unsigned short SPUreadDMA(void);
-extern void SPUwriteDMAMem(unsigned short *, int);
-extern void SPUreadDMAMem(unsigned short *, int);
+extern void SPUwriteDMAMem(unsigned short *, int, unsigned int);
+extern void SPUreadDMAMem(unsigned short *, int, unsigned int);
 extern void SPUplayADPCMchannel(void *);
-extern void SPUregisterCallback(void (*callback)(void));
+extern void SPUregisterCallback(void (*cb)(void));
+extern void SPUregisterScheduleCb(void (*cb)(unsigned int));
 extern long SPUconfigure(void);
 extern long SPUtest(void);
 extern void SPUabout(void);
-extern long SPUfreeze(unsigned int, void *);
-extern void SPUasync(unsigned int);
+extern long SPUfreeze(unsigned int, void *, unsigned int);
+extern void SPUasync(unsigned int, unsigned int);
 extern int  SPUplayCDDAchannel(short *, int);
 
 /* PAD */
@@ -75,7 +76,7 @@ extern void GPUreadDataMem(uint32_t *, int);
 extern long GPUdmaChain(uint32_t *,uint32_t);
 extern void GPUupdateLace(void);
 extern long GPUfreeze(uint32_t, void *);
-extern void GPUvBlank(int, uint32_t *, uint32_t *);
+extern void GPUvBlank(int, int);
 extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs);
 
 
@@ -135,6 +136,7 @@ static const struct {
 	DIRECT_SPU(SPUplayADPCMchannel),
 	DIRECT_SPU(SPUfreeze),
 	DIRECT_SPU(SPUregisterCallback),
+	DIRECT_SPU(SPUregisterScheduleCb),
 	DIRECT_SPU(SPUasync),
 	DIRECT_SPU(SPUplayCDDAchannel),
 	/* PAD */
@@ -168,7 +170,7 @@ static const struct {
 	DIRECT_GPU(GPUwriteDataMem),
 	DIRECT_GPU(GPUdmaChain),
 	DIRECT_GPU(GPUfreeze),
-//	DIRECT_GPU(GPUvBlank), // unused
+	DIRECT_GPU(GPUvBlank),
 	DIRECT_GPU(GPUrearmedCallbacks),
 
 	DUMMY_GPU(GPUdisplayText),
@@ -254,14 +256,14 @@ pc_hook_func              (GPU_readDataMem, (uint32_t *a0, int a1), (a0, a1), PC
 pc_hook_func_ret(long,     GPU_dmaChain, (uint32_t *a0, int32_t a1), (a0, a1), PCNT_GPU)
 pc_hook_func              (GPU_updateLace, (void), (), PCNT_GPU)
 
-pc_hook_func              (SPU_writeRegister, (unsigned long a0, unsigned short a1), (a0, a1), PCNT_SPU)
+pc_hook_func              (SPU_writeRegister, (unsigned long a0, unsigned short a1, uint32_t a2), (a0, a1, a2), PCNT_SPU)
 pc_hook_func_ret(unsigned short,SPU_readRegister, (unsigned long a0), (a0), PCNT_SPU)
 pc_hook_func              (SPU_writeDMA, (unsigned short a0), (a0), PCNT_SPU)
 pc_hook_func_ret(unsigned short,SPU_readDMA, (void), (), PCNT_SPU)
-pc_hook_func              (SPU_writeDMAMem, (unsigned short *a0, int a1), (a0, a1), PCNT_SPU)
-pc_hook_func              (SPU_readDMAMem, (unsigned short *a0, int a1), (a0, a1), PCNT_SPU)
+pc_hook_func              (SPU_writeDMAMem, (unsigned short *a0, int a1, uint32_t a2), (a0, a1, a2), PCNT_SPU)
+pc_hook_func              (SPU_readDMAMem, (unsigned short *a0, int a1, uint32_t a2), (a0, a1, a2), PCNT_SPU)
 pc_hook_func              (SPU_playADPCMchannel, (void *a0), (a0), PCNT_SPU)
-pc_hook_func              (SPU_async, (unsigned int a0), (a0), PCNT_SPU)
+pc_hook_func              (SPU_async, (uint32_t a0, uint32_t a1), (a0, a1), PCNT_SPU)
 pc_hook_func_ret(int,      SPU_playCDDAchannel, (short *a0, int a1), (a0, a1), PCNT_SPU)
 
 #define hook_it(name) { \