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

diff --git a/frontend/plugin.c b/frontend/plugin.c
index d6aca8a5..e2c1ca39 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -9,7 +9,9 @@
 #include <string.h>
 #include <stdint.h>
 
+#include "plugin_lib.h"
 #include "plugin.h"
+#include "../plugins/cdrcimg/cdrcimg.h"
 
 static int dummy_func() {
 	return 0;
@@ -42,18 +44,22 @@ extern void SPUasync(unsigned int);
 extern void SPUplayCDDAchannel(short *, int);
 
 /* PAD */
-static uint8_t CurByte;
+static uint8_t pad_buf[] = { 0x41, 0x5A, 0xFF, 0xFF };
+static uint8_t pad_byte;
 
 static unsigned char PADstartPoll(int pad) {
-	CurByte = 0;
+	pad_byte = 0;
+	pad_buf[2] = ~keystate;
+	pad_buf[3] = ~keystate >> 8;
+
 	return 0xFF;
 }
 
 static unsigned char PADpoll(unsigned char value) {
-	static uint8_t buf[] = {0x41, 0x5A, 0xFF, 0xFF, 0x80, 0x80, 0x80, 0x80};
-	if (CurByte >= 4)
+	if (pad_byte >= 4)
 		return 0;
-	return buf[CurByte++];
+
+	return pad_buf[pad_byte++];
 }
 
 /* GPU */
@@ -185,6 +191,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;
@@ -199,6 +208,8 @@ void *plugin_link(enum builtint_plugins_e id, const char *sym)
 	return NULL;
 }
 
+#ifdef PCNT
+
 /* basic profile stuff */
 #include "pcnt.h"
 
@@ -253,6 +264,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 +286,4 @@ void pcnt_hook_plugins(void)
 	hook_it(SPU_playCDDAchannel);
 }
 
+#endif