suppress hack for crazy value on read port 2

[pcsx_rearmed.git] / libpcsxcore / plugins.c

diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c
index 8d3a00e..c9ccd2a 100644 (file)
--- a/libpcsxcore/plugins.c
+++ b/libpcsxcore/plugins.c
@@ -205,7 +205,7 @@ void CALLBACK GPU__vBlank(int val) {}
 \r
 #define LoadGpuSym1(dest, name) \\r
        LoadSym(GPU_##dest, GPU##dest, name, TRUE);\r
-\r
+
 #define LoadGpuSym0(dest, name) \\r
        LoadSym(GPU_##dest, GPU##dest, name, FALSE); \\r
        if (GPU_##dest == NULL) GPU_##dest = (GPU##dest) GPU__##dest;\r
@@ -371,7 +371,7 @@ void *hPAD2Driver = NULL;
 static int multitap1 = -1;\r
 static int multitap2 = -1;\r
 \r
-static unsigned char buf[512];\r
+static unsigned char buf[256];\r
 unsigned char stdpar[10] = { 0x00, 0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };\r
 unsigned char mousepar[8] = { 0x00, 0x12, 0x5a, 0xff, 0xff, 0xff, 0xff };\r
 unsigned char analogpar[9] = { 0x00, 0xff, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };\r
@@ -521,22 +521,25 @@ unsigned char CALLBACK PAD1__startPoll(int pad) {
        // first call the pad provide if a multitap is connected between the psx and himself\r
        if(multitap1 == -1)\r
        {\r
-               PadDataS padd;\r
-               PAD1_readPort1(&padd, 0);\r
+               PadDataS padd;
+               padd.requestPadIndex = 0;\r
+               PAD1_readPort1(&padd);\r
                multitap1 = padd.portMultitap;\r
        }\r
        // just one pad is on port 1 : NO MULTITAP\r
        if (multitap1 == 0)\r
        {\r
-               PadDataS padd;\r
-               PAD1_readPort1(&padd, 0);\r
+               PadDataS padd;
+               padd.requestPadIndex = 0;\r
+               PAD1_readPort1(&padd);\r
                return _PADstartPoll(&padd);\r
        } else {\r
                // a multitap is plugged : refresh all pad.\r
                int i=0;\r
                PadDataS padd[4];\r
-               for(i = 0; i < 4; i++) {\r
-                       PAD1_readPort1(&padd[i], i);\r
+               for(i = 0; i < 4; i++) {
+                       padd[i].requestPadIndex = i;\r
+                       PAD1_readPort1(&padd[i]);\r
                }\r
                return _PADstartPollMultitap(padd);\r
        }\r
@@ -609,22 +612,25 @@ unsigned char CALLBACK PAD2__startPoll(int pad) {
        }\r
        //first call the pad provide if a multitap is connected between the psx and himself\r
        if(multitap2 == -1){\r
-               PadDataS padd;\r
-               PAD2_readPort2(&padd,pad_index);\r
+               PadDataS padd;
+               padd.requestPadIndex = pad_index;\r
+               PAD2_readPort2(&padd);\r
                multitap2 = padd.portMultitap;\r
        }\r
 \r
        // just one pad is on port 2 : NO MULTITAP\r
        if (multitap2 == 0){\r
-               PadDataS padd;\r
-               PAD2_readPort2(&padd,pad_index);\r
+               PadDataS padd;
+               padd.requestPadIndex = pad_index;\r
+               PAD2_readPort2(&padd);\r
                return _PADstartPoll(&padd);\r
        }else{\r
                //a multitap is plugged : refresh all pad.\r
                int i=0;\r
                PadDataS padd[4];\r
-               for(i=0;i<4;i++){\r
-                       PAD2_readPort2(&padd[i],i+pad_index);\r
+               for(i=0;i<4;i++){
+                       padd[i].requestPadIndex = i+pad_index;\r
+                       PAD2_readPort2(&padd[i]);\r
                }\r
                return _PADstartPollMultitap(padd);\r
        }\r