X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=frontend%2Fplugin.c;h=853fb1545fd1b890a1fc28fe71a600935db9c903;hp=0d244fa7649486ad2550437b9190a5331dfea2d7;hb=61ef5cf48ec7019f10f83017667e681ff8288509;hpb=6c9a982ac534aef9b19b9e7d9033516a0f13485a

diff --git a/frontend/plugin.c b/frontend/plugin.c
index 0d244fa7..853fb154 100644
--- a/frontend/plugin.c
+++ b/frontend/plugin.c
@@ -43,9 +43,9 @@ extern void SPUplayCDDAchannel(short *, int);
 /* PAD */
 static long PADreadPort1(PadDataS *pad)
 {
-	pad->controllerType = in_type;
+	pad->controllerType = in_type1;
 	pad->buttonStatus = ~in_keystate;
-	if (in_type == PSE_PAD_TYPE_ANALOGPAD) {
+	if (in_type1 == PSE_PAD_TYPE_ANALOGPAD) {
 		pad->leftJoyX = in_a1[0];
 		pad->leftJoyY = in_a1[1];
 		pad->rightJoyX = in_a2[0];
@@ -56,7 +56,7 @@ static long PADreadPort1(PadDataS *pad)
 
 static long PADreadPort2(PadDataS *pad)
 {
-	pad->controllerType = PSE_PAD_TYPE_STANDARD;
+	pad->controllerType = in_type2;
 	pad->buttonStatus = ~in_keystate >> 16;
 	return 0;
 }
@@ -75,7 +75,8 @@ extern void GPUreadDataMem(uint32_t *, int);
 extern long GPUdmaChain(uint32_t *,uint32_t);
 extern void GPUupdateLace(void);
 extern long GPUfreeze(uint32_t, void *);
-extern void GPUvBlank(int, uint32_t *);
+extern void GPUvBlank(int, uint32_t *, uint32_t *);
+extern void GPUrearmedCallbacks(const struct rearmed_cbs *cbs);
 
 
 #define DUMMY(id, name) \
@@ -168,6 +169,7 @@ static const struct {
 	DIRECT_GPU(GPUdmaChain),
 	DIRECT_GPU(GPUfreeze),
 	DIRECT_GPU(GPUvBlank),
+	DIRECT_GPU(GPUrearmedCallbacks),
 
 	DUMMY_GPU(GPUdisplayText),
 /*
@@ -269,8 +271,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);