X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Fplugin.c;h=a2739858dd069ed6ace632ca42771dab06579696;hb=a901d51993abd8cbef621385b4298399455bff99;hp=d9eb04a40be1070f06700a79daf1293c6de16af8;hpb=cebb70f24ab54693b12aaa27b85a52689e26e1ff;p=pcsx_rearmed.git

diff --git a/frontend/plugin.c b/frontend/plugin.c
index d9eb04a4..a2739858 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;
 }
 
@@ -38,7 +35,7 @@ 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);
@@ -46,26 +43,68 @@ 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)
-{
-	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];
+static long CALLBACK PADreadPort1(PadDataS *pad) {
+	int pad_index = pad->requestPadIndex;
+
+	pad->controllerType = in_type[pad_index];
+	pad->buttonStatus = ~in_keystate[pad_index];
+
+	if (multitap1 == 1)
+		pad->portMultitap = 1;
+	else
+		pad->portMultitap = 0;
+
+	if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGJOY || in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON || in_type[pad_index] == PSE_PAD_TYPE_GUNCON)
+	{
+		pad->leftJoyX = in_analog_left[pad_index][0];
+		pad->leftJoyY = in_analog_left[pad_index][1];
+		pad->rightJoyX = in_analog_right[pad_index][0];
+		pad->rightJoyY = in_analog_right[pad_index][1];
+
+		pad->absoluteX = in_analog_left[pad_index][0];
+		pad->absoluteY = in_analog_left[pad_index][1];
+	}
+
+	if (in_type[pad_index] == PSE_PAD_TYPE_MOUSE)
+	{
+		pad->moveX = in_mouse[pad_index][0];
+		pad->moveY = in_mouse[pad_index][1];
 	}
+
 	return 0;
 }
 
-static long PADreadPort2(PadDataS *pad)
-{
-	pad->controllerType = in_type2;
-	pad->buttonStatus = ~in_keystate >> 16;
+static long CALLBACK PADreadPort2(PadDataS *pad) {
+	int pad_index = pad->requestPadIndex;
+
+	pad->controllerType = in_type[pad_index];
+	pad->buttonStatus = ~in_keystate[pad_index];
+
+	if (multitap2 == 1)
+		pad->portMultitap = 2;
+	else
+		pad->portMultitap = 0;
+
+	if (in_type[pad_index] == PSE_PAD_TYPE_ANALOGJOY || in_type[pad_index] == PSE_PAD_TYPE_ANALOGPAD || in_type[pad_index] == PSE_PAD_TYPE_NEGCON || in_type[pad_index] == PSE_PAD_TYPE_GUNCON)
+	{
+		pad->leftJoyX = in_analog_left[pad_index][0];
+		pad->leftJoyY = in_analog_left[pad_index][1];
+		pad->rightJoyX = in_analog_right[pad_index][0];
+		pad->rightJoyY = in_analog_right[pad_index][1];
+
+		pad->absoluteX = in_analog_left[pad_index][0];
+		pad->absoluteY = in_analog_left[pad_index][1];
+	}
+
+	if (in_type[pad_index] == PSE_PAD_TYPE_MOUSE)
+	{
+		pad->moveX = in_mouse[pad_index][0];
+		pad->moveY = in_mouse[pad_index][1];
+	}
+
 	return 0;
 }
 
@@ -269,9 +308,9 @@ 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; \