X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin.c;h=0bfc2aabcca65ca661279ede73fc1364ecaecf26;hb=20a3a441bc4176d91cd4d41f8dedf12a9f448abb;hp=d9eb04a40be1070f06700a79daf1293c6de16af8;hpb=003cfc63c69b3e900de768317354dfb80bbf6a55;p=pcsx_rearmed.git

diff --git a/frontend/plugin.c b/frontend/plugin.c
index d9eb04a4..0bfc2aab 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -15,14 +15,11 @@
 #include "../libpcsxcore/system.h"
 #include "../plugins/cdrcimg/cdrcimg.h"
 
-#ifndef _WIN32
+// this can't be __stdcall like it was in PSEmu API as too many functions are mixed up
+#undef CALLBACK
 #define CALLBACK
-#else
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-#endif
 
-static int dummy_func() {
+static long CALLBACK dummy_func() {
 	return 0;
 }
 
@@ -31,41 +28,35 @@ extern long CALLBACK SPUopen(void);
 extern long CALLBACK SPUinit(void);
 extern long CALLBACK SPUshutdown(void);
 extern long CALLBACK SPUclose(void);
-extern void CALLBACK SPUplaySample(unsigned char);
 extern void CALLBACK SPUwriteRegister(unsigned long, unsigned short, unsigned int);
 extern unsigned short CALLBACK SPUreadRegister(unsigned long);
-extern void CALLBACK SPUwriteDMA(unsigned short);
-extern unsigned short CALLBACK SPUreadDMA(void);
 extern void CALLBACK SPUwriteDMAMem(unsigned short *, int, unsigned int);
 extern void CALLBACK SPUreadDMAMem(unsigned short *, int, unsigned int);
-extern void CALLBACK SPUplayADPCMchannel(void *);
+extern void CALLBACK SPUplayADPCMchannel(void *, unsigned int, int);
 extern void CALLBACK SPUregisterCallback(void (*cb)(void));
 extern void CALLBACK SPUregisterScheduleCb(void (*cb)(unsigned int));
-extern long CALLBACK SPUconfigure(void);
-extern long CALLBACK SPUtest(void);
-extern void CALLBACK SPUabout(void);
 extern long CALLBACK SPUfreeze(unsigned int, void *, unsigned int);
 extern void CALLBACK SPUasync(unsigned int, unsigned int);
-extern int  CALLBACK SPUplayCDDAchannel(short *, int);
+extern int  CALLBACK SPUplayCDDAchannel(short *, int, unsigned int, int);
 
 /* PAD */
-static long PADreadPort1(PadDataS *pad)
+static long CALLBACK PADreadPort1(PadDataS *pad)
 {
-	pad->controllerType = in_type1;
-	pad->buttonStatus = ~in_keystate;
-	if (in_type1 == PSE_PAD_TYPE_ANALOGPAD) {
-		pad->leftJoyX = in_a1[0];
-		pad->leftJoyY = in_a1[1];
-		pad->rightJoyX = in_a2[0];
-		pad->rightJoyY = in_a2[1];
+	pad->controllerType = in_type[0];
+	pad->buttonStatus = ~in_keystate[0];
+	if (in_type[0] == PSE_PAD_TYPE_ANALOGPAD) {
+		pad->leftJoyX = in_analog_left[0][0];
+		pad->leftJoyY = in_analog_left[0][1];
+		pad->rightJoyX = in_analog_right[0][0];
+		pad->rightJoyY = in_analog_right[0][1];
 	}
 	return 0;
 }
 
-static long PADreadPort2(PadDataS *pad)
+static long CALLBACK PADreadPort2(PadDataS *pad)
 {
-	pad->controllerType = in_type2;
-	pad->buttonStatus = ~in_keystate >> 16;
+	pad->controllerType = in_type[1];
+	pad->buttonStatus = ~in_keystate[0] >> 16;
 	return 0;
 }
 
@@ -126,18 +117,12 @@ static const struct {
 	DUMMY_CDR(CDRreadCDDA),
 	DUMMY_CDR(CDRgetTE),
 	/* SPU */
-	DIRECT_SPU(SPUconfigure),
-	DIRECT_SPU(SPUabout),
 	DIRECT_SPU(SPUinit),
 	DIRECT_SPU(SPUshutdown),
-	DIRECT_SPU(SPUtest),
 	DIRECT_SPU(SPUopen),
 	DIRECT_SPU(SPUclose),
-//	DIRECT_SPU(SPUplaySample), // unused?
 	DIRECT_SPU(SPUwriteRegister),
 	DIRECT_SPU(SPUreadRegister),
-	DIRECT_SPU(SPUwriteDMA),
-	DIRECT_SPU(SPUreadDMA),
 	DIRECT_SPU(SPUwriteDMAMem),
 	DIRECT_SPU(SPUreadDMAMem),
 	DIRECT_SPU(SPUplayADPCMchannel),
@@ -190,7 +175,6 @@ static const struct {
 	DIRECT_GPU(GPUgetScreenPic),
 	DIRECT_GPU(GPUshowScreenPic),
 */
-//	DIRECT_GPU(GPUclearDynarec),
 };
 
 void *plugin_link(enum builtint_plugins_e id, const char *sym)
@@ -265,13 +249,11 @@ pc_hook_func              (GPU_updateLace, (void), (), PCNT_GPU)
 
 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, 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_playADPCMchannel, (void *a0, unsigned int a1, int a2), (a0, a1, a2), 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)
+pc_hook_func_ret(int,      SPU_playCDDAchannel, (short *a0, int a1, unsigned int a2, int a3), (a0, a1, a2, a3), PCNT_SPU)
 
 #define hook_it(name) { \
 	o_##name = name; \
@@ -292,8 +274,6 @@ void pcnt_hook_plugins(void)
 	hook_it(GPU_updateLace);
 	hook_it(SPU_writeRegister);
 	hook_it(SPU_readRegister);
-	hook_it(SPU_writeDMA);
-	hook_it(SPU_readDMA);
 	hook_it(SPU_writeDMAMem);
 	hook_it(SPU_readDMAMem);
 	hook_it(SPU_playADPCMchannel);