X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin.c;h=1980ef5b2d06d20d690dc91b6307091a5e766336;hp=83eb14036342643e65f95f3d6e6aea6efec629bb;hb=2b30c1291db9d9801d51cf85f71f40fe54958898;hpb=e1d2234dbf1b62787219a8c83930569d70db8c37

diff --git a/frontend/plugin.c b/frontend/plugin.c
index 83eb1403..1980ef5b 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -11,18 +11,14 @@
 
 #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"
 
 static int dummy_func() {
 	return 0;
 }
 
-static long CDRreadTrack(unsigned char *time) {
-	fprintf(stderr, "CDRreadTrack\n");
-	return -1;
-}
-
 /* SPU */
 extern long SPUopen(void);
 extern long SPUinit(void);
@@ -36,26 +32,33 @@ extern unsigned short SPUreadDMA(void);
 extern void SPUwriteDMAMem(unsigned short *, int);
 extern void SPUreadDMAMem(unsigned short *, 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 void SPUplayCDDAchannel(short *, int);
+extern int  SPUplayCDDAchannel(short *, int);
 
 /* PAD */
 static long PADreadPort1(PadDataS *pad)
 {
-	pad->controllerType = PSE_PAD_TYPE_STANDARD;
-	pad->buttonStatus = ~keystate;
+	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];
+	}
 	return 0;
 }
 
 static long PADreadPort2(PadDataS *pad)
 {
-	pad->controllerType = PSE_PAD_TYPE_STANDARD;
-	pad->buttonStatus = ~keystate >> 16;
+	pad->controllerType = in_type2;
+	pad->buttonStatus = ~in_keystate >> 16;
 	return 0;
 }
 
@@ -72,17 +75,9 @@ extern uint32_t GPUreadData(void);
 extern void GPUreadDataMem(uint32_t *, int);
 extern long GPUdmaChain(uint32_t *,uint32_t);
 extern void GPUupdateLace(void);
-extern long GPUconfigure(void);
-extern long GPUtest(void);
-extern void GPUabout(void);
-extern void GPUmakeSnapshot(void);
-extern void GPUkeypressed(int);
-extern void GPUdisplayText(char *);
 extern long GPUfreeze(uint32_t, void *);
-extern long GPUgetScreenPic(unsigned char *);
-extern long GPUshowScreenPic(unsigned char *);
-extern void GPUclearDynarec(void (*callback)(void));
-extern void GPUvBlank(int);
+extern void GPUvBlank(int, int);
+extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs);
 
 
 #define DUMMY(id, name) \
@@ -91,6 +86,7 @@ extern void GPUvBlank(int);
 #define DIRECT(id, name) \
 	{ id, #name, name }
 
+#define DUMMY_GPU(name)  DUMMY(PLUGIN_GPU, name)
 #define DUMMY_CDR(name)  DUMMY(PLUGIN_CDR, name)
 #define DUMMY_PAD(name)  DUMMY(PLUGIN_PAD, name)
 #define DIRECT_SPU(name) DIRECT(PLUGIN_SPU, name)
@@ -122,7 +118,6 @@ static const struct {
 	DUMMY_CDR(CDRsetfilename),
 	DUMMY_CDR(CDRreadCDDA),
 	DUMMY_CDR(CDRgetTE),
-	DIRECT(PLUGIN_CDR, CDRreadTrack),
 	/* SPU */
 	DIRECT_SPU(SPUconfigure),
 	DIRECT_SPU(SPUabout),
@@ -141,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 */
@@ -164,9 +160,6 @@ static const struct {
 	DIRECT_GPU(GPUupdateLace),
 	DIRECT_GPU(GPUinit),
 	DIRECT_GPU(GPUshutdown),
-	DIRECT_GPU(GPUconfigure),
-	DIRECT_GPU(GPUtest),
-	DIRECT_GPU(GPUabout),
 	DIRECT_GPU(GPUopen),
 	DIRECT_GPU(GPUclose),
 	DIRECT_GPU(GPUreadStatus),
@@ -176,14 +169,21 @@ static const struct {
 	DIRECT_GPU(GPUwriteData),
 	DIRECT_GPU(GPUwriteDataMem),
 	DIRECT_GPU(GPUdmaChain),
+	DIRECT_GPU(GPUfreeze),
+	DIRECT_GPU(GPUvBlank),
+	DIRECT_GPU(GPUrearmedCallbacks),
+
+	DUMMY_GPU(GPUdisplayText),
+/*
 	DIRECT_GPU(GPUkeypressed),
-	DIRECT_GPU(GPUdisplayText),
 	DIRECT_GPU(GPUmakeSnapshot),
-	DIRECT_GPU(GPUfreeze),
+	DIRECT_GPU(GPUconfigure),
+	DIRECT_GPU(GPUtest),
+	DIRECT_GPU(GPUabout),
 	DIRECT_GPU(GPUgetScreenPic),
 	DIRECT_GPU(GPUshowScreenPic),
+*/
 //	DIRECT_GPU(GPUclearDynarec),
-//	DIRECT_GPU(GPUvBlank),
 };
 
 void *plugin_link(enum builtint_plugins_e id, const char *sym)
@@ -207,6 +207,16 @@ void *plugin_link(enum builtint_plugins_e id, const char *sym)
 	return NULL;
 }
 
+void plugin_call_rearmed_cbs(void)
+{
+	extern void *hGPUDriver;
+	void (*rearmed_set_cbs)(const struct rearmed_cbs *cbs);
+
+	rearmed_set_cbs = SysLoadSym(hGPUDriver, "GPUrearmedCallbacks");
+	if (rearmed_set_cbs != NULL)
+		rearmed_set_cbs(&pl_rearmed_cbs);
+}
+
 #ifdef PCNT
 
 /* basic profile stuff */
@@ -254,7 +264,7 @@ pc_hook_func              (SPU_writeDMAMem, (unsigned short *a0, int a1), (a0, a
 pc_hook_func              (SPU_readDMAMem, (unsigned short *a0, int a1), (a0, a1), 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_playCDDAchannel, (short *a0, int a1), (a0, a1), PCNT_SPU)
+pc_hook_func_ret(int,      SPU_playCDDAchannel, (short *a0, int a1), (a0, a1), PCNT_SPU)
 
 #define hook_it(name) { \
 	o_##name = name; \
@@ -263,8 +273,7 @@ pc_hook_func              (SPU_playCDDAchannel, (short *a0, int a1), (a0, a1), P
 
 void pcnt_hook_plugins(void)
 {
-	/* test it first */
-	pcnt_get();
+	pcnt_init();
 
 	hook_it(GPU_writeStatus);
 	hook_it(GPU_writeData);
@@ -285,4 +294,15 @@ void pcnt_hook_plugins(void)
 	hook_it(SPU_playCDDAchannel);
 }
 
+// hooked into recompiler
+void pcnt_gte_start(int op)
+{
+	pcnt_start(PCNT_GTE);
+}
+
+void pcnt_gte_end(int op)
+{
+	pcnt_end(PCNT_GTE);
+}
+
 #endif