X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin.c;h=6c83a4477833cfc312dccc2455c60f0986f4a4e7;hp=d6aca8a53c7c1b1f52bf24649db6b7056a2416cb;hb=201c21e2ad6be25a4b843d1434eabb432ce72884;hpb=14dffdb7a0457fc647103deafa5f1cac12e888fb

diff --git a/frontend/plugin.c b/frontend/plugin.c
index d6aca8a5..6c83a447 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -9,17 +9,16 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "plugin_lib.h"
 #include "plugin.h"
+#include "../libpcsxcore/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);
@@ -42,18 +41,18 @@ extern void SPUasync(unsigned int);
 extern void SPUplayCDDAchannel(short *, int);
 
 /* PAD */
-static uint8_t CurByte;
-
-static unsigned char PADstartPoll(int pad) {
-	CurByte = 0;
-	return 0xFF;
+static long PADreadPort1(PadDataS *pad)
+{
+	pad->controllerType = PSE_PAD_TYPE_STANDARD;
+	pad->buttonStatus = ~keystate;
+	return 0;
 }
 
-static unsigned char PADpoll(unsigned char value) {
-	static uint8_t buf[] = {0x41, 0x5A, 0xFF, 0xFF, 0x80, 0x80, 0x80, 0x80};
-	if (CurByte >= 4)
-		return 0;
-	return buf[CurByte++];
+static long PADreadPort2(PadDataS *pad)
+{
+	pad->controllerType = PSE_PAD_TYPE_STANDARD;
+	pad->buttonStatus = ~keystate >> 16;
+	return 0;
 }
 
 /* GPU */
@@ -119,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,20 +139,22 @@ static const struct {
 	DIRECT_SPU(SPUasync),
 	DIRECT_SPU(SPUplayCDDAchannel),
 	/* PAD */
-	DUMMY_PAD(PADconfigure),
-	DUMMY_PAD(PADabout),
 	DUMMY_PAD(PADinit),
 	DUMMY_PAD(PADshutdown),
-	DUMMY_PAD(PADtest),
 	DUMMY_PAD(PADopen),
 	DUMMY_PAD(PADclose),
+	DUMMY_PAD(PADsetSensitive),
+	DIRECT_PAD(PADreadPort1),
+	DIRECT_PAD(PADreadPort2),
+/*
 	DUMMY_PAD(PADquery),
-	DUMMY_PAD(PADreadPort1),
-	DUMMY_PAD(PADreadPort2),
+	DUMMY_PAD(PADconfigure),
+	DUMMY_PAD(PADtest),
+	DUMMY_PAD(PADabout),
 	DUMMY_PAD(PADkeypressed),
-	DUMMY_PAD(PADsetSensitive),
-	DIRECT_PAD(PADstartPoll),
-	DIRECT_PAD(PADpoll),
+	DUMMY_PAD(PADstartPoll),
+	DUMMY_PAD(PADpoll),
+*/
 	/* GPU */
 	DIRECT_GPU(GPUupdateLace),
 	DIRECT_GPU(GPUinit),
@@ -185,6 +185,9 @@ void *plugin_link(enum builtint_plugins_e id, const char *sym)
 {
 	int i;
 
+	if (id == PLUGIN_CDRCIMG)
+		return cdrcimg_get_sym(sym);
+
 	for (i = 0; i < ARRAY_SIZE(plugin_funcs); i++) {
 		if (id != plugin_funcs[i].id)
 			continue;
@@ -195,10 +198,22 @@ void *plugin_link(enum builtint_plugins_e id, const char *sym)
 		return plugin_funcs[i].func;
 	}
 
-	fprintf(stderr, "plugin_link: missing symbol %d %s\n", id, sym);
+	//fprintf(stderr, "plugin_link: missing symbol %d %s\n", id, 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 */
 #include "pcnt.h"
 
@@ -253,6 +268,9 @@ pc_hook_func              (SPU_playCDDAchannel, (short *a0, int a1), (a0, a1), P
 
 void pcnt_hook_plugins(void)
 {
+	/* test it first */
+	pcnt_get();
+
 	hook_it(GPU_writeStatus);
 	hook_it(GPU_writeData);
 	hook_it(GPU_writeDataMem);
@@ -272,3 +290,4 @@ void pcnt_hook_plugins(void)
 	hook_it(SPU_playCDDAchannel);
 }
 
+#endif