psx_gpu: improve fills

[pcsx_rearmed.git] / plugins / dfinput / pad.c

diff --git a/plugins/dfinput/pad.c b/plugins/dfinput/pad.c
index c522117..ab55db0 100644 (file)
--- a/plugins/dfinput/pad.c
+++ b/plugins/dfinput/pad.c
@@ -22,6 +22,7 @@
 #include <stdint.h>
 
 #include "../../libpcsxcore/psemu_plugin_defs.h"
+#include "main.h"
 
 enum {
        ANALOG_LEFT = 0,
@@ -44,6 +45,7 @@ enum {
 static struct {
        uint8_t PadMode;
        uint8_t PadID;
+       uint8_t ConfigMode;
        PadDataS pad;
 } padstate[2];
 
@@ -101,7 +103,6 @@ static uint8_t stdmodel[2][8] = {
         0x00}
 };
 
-static uint8_t CurPad = 0, CurByte = 0, CurCmd = 0, CmdLen = 0;
 static uint8_t *buf;
 
 static uint8_t do_cmd(void)
@@ -111,11 +112,6 @@ static uint8_t do_cmd(void)
 
        CmdLen = 8;
        switch (CurCmd) {
-               case CMD_CONFIG_MODE:
-                       buf = stdcfg[pad_num];
-                       if (stdcfg[pad_num][3] == 0xFF) return 0xF3;
-                       else return padstate[pad_num].PadID;
-
                case CMD_SET_MODE_AND_LOCK:
                        buf = stdmode[pad_num];
                        return 0xF3;
@@ -141,6 +137,13 @@ static uint8_t do_cmd(void)
                        buf = unk4d[pad_num];
                        return 0xF3;
 
+               case CMD_CONFIG_MODE:
+                       if (padstate[pad_num].ConfigMode) {
+                               buf = stdcfg[pad_num];
+                               return 0xF3;
+                       }
+                       // else FALLTHROUGH
+
                case CMD_READ_DATA_AND_VIBRATE:
                default:
                        buf = stdpar[pad_num];
@@ -165,17 +168,7 @@ static void do_cmd2(unsigned char value)
 {
        switch (CurCmd) {
                case CMD_CONFIG_MODE:
-                       switch (value) {
-                               case 0:
-                                       buf[2] = 0;
-                                       buf[3] = 0;
-                                       break;
-
-                               case 1:
-                                       buf[2] = 0xFF;
-                                       buf[3] = 0xFF;
-                                       break;
-                       }
+                       padstate[CurPad].ConfigMode = value;
                        break;
 
                case CMD_SET_MODE_AND_LOCK:
@@ -210,10 +203,26 @@ static void do_cmd2(unsigned char value)
                                        break;
                        }
                        break;
+
+               case CMD_READ_DATA_AND_VIBRATE:
+                       if (value == 1 && CurPad == 0 && in_enable_vibration)
+                               plat_trigger_vibrate();
+                       break;
        }
 }
 
-static unsigned char PADpoll_(unsigned char value) {
+#if 0
+#include <stdio.h>
+unsigned char PADpoll_(unsigned char value);
+unsigned char PADpoll(unsigned char value) {
+       unsigned char b = CurByte, r = PADpoll_(value);
+       printf("poll[%d] %02x %02x\n", b, value, r);
+       return r;
+}
+#define PADpoll PADpoll_
+#endif
+
+unsigned char PADpoll_pad(unsigned char value) {
 
        if (CurByte == 0) {
                CurCmd = value;
@@ -230,58 +239,32 @@ static unsigned char PADpoll_(unsigned char value) {
                do_cmd2(value);
 
        if (CurByte >= CmdLen)
-               return 0;
+               return 0xff;    // verified
 
        return buf[CurByte++];
 }
 
-#include <stdio.h>
-static unsigned char PADpoll(unsigned char value) {
-       unsigned char b = CurByte, r = PADpoll_(value);
-       printf("poll[%d] %02x %02x\n", b, value, r);
-       return r;
-}
-
-/* hack.. */
-extern long (*PAD1_readPort1)(PadDataS *pad);
-
-static unsigned char PADstartPoll1(int pad) {
-       CurPad = 0;
+unsigned char PADstartPoll_pad(int pad) {
+       CurPad = pad - 1;
        CurByte = 0;
 
-       PAD1_readPort1(&padstate[0].pad);
+       if (pad == 1)
+               PAD1_readPort1(&padstate[0].pad);
+       else
+               PAD2_readPort2(&padstate[1].pad);
 
        return 0xFF;
 }
 
-/* some more hacks here but oh well */
-extern void *PAD1_startPoll, *PAD1_poll;
-
-void dfinput_activate(int yes)
+void pad_init(void)
 {
-       static void *old_start, *old_poll;
-
-       if (!yes) {
-               if (PAD1_startPoll == PADstartPoll1)
-                       PAD1_startPoll = old_start;
-               if (PAD1_poll == PADpoll)
-                       PAD1_poll = old_poll;
-               return;
-       }
-
-       if (PAD1_startPoll == PADstartPoll1 && PAD1_poll == PADpoll)
-               return;
-
-       old_start = PAD1_startPoll;
-       old_poll = PAD1_poll;
-       PAD1_startPoll = PADstartPoll1;
-       PAD1_poll = PADpoll;
+       int i;
 
        PAD1_readPort1(&padstate[0].pad);
-       padstate[0].PadID = padstate[0].pad.controllerType == PSE_PAD_TYPE_ANALOGPAD ? 0x73 : 0x41;
-       padstate[0].PadMode = padstate[0].pad.controllerType == PSE_PAD_TYPE_ANALOGPAD;
+       PAD2_readPort2(&padstate[1].pad);
 
-       padstate[1].PadID = 0x41;
-       padstate[1].PadMode = 0;
+       for (i = 0; i < 2; i++) {
+               padstate[i].PadID = padstate[i].pad.controllerType == PSE_PAD_TYPE_ANALOGPAD ? 0x73 : 0x41;
+               padstate[i].PadMode = padstate[i].pad.controllerType == PSE_PAD_TYPE_ANALOGPAD;
+       }
 }
-