defaut dualshock to digital again, unless overriden
[pcsx_rearmed.git] / libpcsxcore / plugins.c
index 67fe835..75e1f5f 100644 (file)
 
 #include "plugins.h"
 #include "cdriso.h"
-#include "../plugins/dfinput/externals.h"
+#include "psxcounters.h"
 
 static char IsoFile[MAXPATHLEN] = "";
 static s64 cdOpenCaseTime = 0;
 
 GPUupdateLace         GPU_updateLace;
 GPUinit               GPU_init;
-GPUshutdown           GPU_shutdown; 
+GPUshutdown           GPU_shutdown;
 GPUconfigure          GPU_configure;
 GPUtest               GPU_test;
 GPUabout              GPU_about;
@@ -39,7 +39,7 @@ GPUclose              GPU_close;
 GPUreadStatus         GPU_readStatus;
 GPUreadData           GPU_readData;
 GPUreadDataMem        GPU_readDataMem;
-GPUwriteStatus        GPU_writeStatus; 
+GPUwriteStatus        GPU_writeStatus;
 GPUwriteData          GPU_writeData;
 GPUwriteDataMem       GPU_writeDataMem;
 GPUdmaChain           GPU_dmaChain;
@@ -49,13 +49,13 @@ GPUmakeSnapshot       GPU_makeSnapshot;
 GPUfreeze             GPU_freeze;
 GPUgetScreenPic       GPU_getScreenPic;
 GPUshowScreenPic      GPU_showScreenPic;
-GPUclearDynarec       GPU_clearDynarec;
 GPUvBlank             GPU_vBlank;
+GPUgetScreenInfo      GPU_getScreenInfo;
 
 CDRinit               CDR_init;
 CDRshutdown           CDR_shutdown;
 CDRopen               CDR_open;
-CDRclose              CDR_close; 
+CDRclose              CDR_close;
 CDRtest               CDR_test;
 CDRgetTN              CDR_getTN;
 CDRgetTD              CDR_getTD;
@@ -72,18 +72,12 @@ CDRsetfilename        CDR_setfilename;
 CDRreadCDDA           CDR_readCDDA;
 CDRgetTE              CDR_getTE;
 
-SPUconfigure          SPU_configure;
-SPUabout              SPU_about;
 SPUinit               SPU_init;
 SPUshutdown           SPU_shutdown;
-SPUtest               SPU_test;
 SPUopen               SPU_open;
 SPUclose              SPU_close;
-SPUplaySample         SPU_playSample;
 SPUwriteRegister      SPU_writeRegister;
 SPUreadRegister       SPU_readRegister;
-SPUwriteDMA           SPU_writeDMA;
-SPUreadDMA            SPU_readDMA;
 SPUwriteDMAMem        SPU_writeDMAMem;
 SPUreadDMAMem         SPU_readDMAMem;
 SPUplayADPCMchannel   SPU_playADPCMchannel;
@@ -124,7 +118,7 @@ PADsetSensitive       PAD2_setSensitive;
 NETinit               NET_init;
 NETshutdown           NET_shutdown;
 NETopen               NET_open;
-NETclose              NET_close; 
+NETclose              NET_close;
 NETtest               NET_test;
 NETconfigure          NET_configure;
 NETabout              NET_about;
@@ -143,7 +137,7 @@ NETkeypressed         NET_keypressed;
 SIO1init              SIO1_init;
 SIO1shutdown          SIO1_shutdown;
 SIO1open              SIO1_open;
-SIO1close             SIO1_close; 
+SIO1close             SIO1_close;
 SIO1test              SIO1_test;
 SIO1configure         SIO1_configure;
 SIO1about             SIO1_about;
@@ -201,8 +195,8 @@ void CALLBACK GPU__makeSnapshot(void) {}
 void CALLBACK GPU__keypressed(int key) {}
 long CALLBACK GPU__getScreenPic(unsigned char *pMem) { return -1; }
 long CALLBACK GPU__showScreenPic(unsigned char *pMem) { return -1; }
-void CALLBACK GPU__clearDynarec(void (CALLBACK *callback)(void)) {}
 void CALLBACK GPU__vBlank(int val) {}
+void CALLBACK GPU__getScreenInfo(int *y, int *base_hres) {}
 
 #define LoadGpuSym1(dest, name) \
        LoadSym(GPU_##dest, GPU##dest, name, TRUE);
@@ -218,9 +212,9 @@ static int LoadGPUplugin(const char *GPUdll) {
        void *drv;
 
        hGPUDriver = SysLoadLibrary(GPUdll);
-       if (hGPUDriver == NULL) { 
+       if (hGPUDriver == NULL) {
                GPU_configure = NULL;
-               SysMessage (_("Could not load GPU plugin %s!"), GPUdll); return -1; 
+               SysMessage (_("Could not load GPU plugin %s!"), GPUdll); return -1;
        }
        drv = hGPUDriver;
        LoadGpuSym1(init, "GPUinit");
@@ -241,8 +235,8 @@ static int LoadGPUplugin(const char *GPUdll) {
        LoadGpuSym1(freeze, "GPUfreeze");
        LoadGpuSym0(getScreenPic, "GPUgetScreenPic");
        LoadGpuSym0(showScreenPic, "GPUshowScreenPic");
-       LoadGpuSym0(clearDynarec, "GPUclearDynarec");
-    LoadGpuSym0(vBlank, "GPUvBlank");
+       LoadGpuSym0(vBlank, "GPUvBlank");
+       LoadGpuSym0(getScreenInfo, "GPUgetScreenInfo");
        LoadGpuSym0(configure, "GPUconfigure");
        LoadGpuSym0(test, "GPUtest");
        LoadGpuSym0(about, "GPUabout");
@@ -317,12 +311,8 @@ static int LoadCDRplugin(const char *CDRdll) {
        return 0;
 }
 
-void *hSPUDriver = NULL;
-
-long CALLBACK SPU__configure(void) { return 0; }
-void CALLBACK SPU__about(void) {}
-long CALLBACK SPU__test(void) { return 0; }
-void CALLBACK SPU__registerScheduleCb(void (CALLBACK *cb)(unsigned int)) {}
+static void *hSPUDriver = NULL;\r
+static void CALLBACK SPU__registerScheduleCb(void (CALLBACK *cb)(unsigned int)) {}\r
 
 #define LoadSpuSym1(dest, name) \
        LoadSym(SPU_##dest, SPU##dest, name, TRUE);
@@ -339,7 +329,6 @@ static int LoadSPUplugin(const char *SPUdll) {
 
        hSPUDriver = SysLoadLibrary(SPUdll);
        if (hSPUDriver == NULL) {
-               SPU_configure = NULL;
                SysMessage (_("Could not load SPU plugin %s!"), SPUdll); return -1;
        }
        drv = hSPUDriver;
@@ -347,13 +336,8 @@ static int LoadSPUplugin(const char *SPUdll) {
        LoadSpuSym1(shutdown, "SPUshutdown");
        LoadSpuSym1(open, "SPUopen");
        LoadSpuSym1(close, "SPUclose");
-       LoadSpuSym0(configure, "SPUconfigure");
-       LoadSpuSym0(about, "SPUabout");
-       LoadSpuSym0(test, "SPUtest");
        LoadSpuSym1(writeRegister, "SPUwriteRegister");
-       LoadSpuSym1(readRegister, "SPUreadRegister");           
-       LoadSpuSym1(writeDMA, "SPUwriteDMA");
-       LoadSpuSym1(readDMA, "SPUreadDMA");
+       LoadSpuSym1(readRegister, "SPUreadRegister");
        LoadSpuSym1(writeDMAMem, "SPUwriteDMAMem");
        LoadSpuSym1(readDMAMem, "SPUreadDMAMem");
        LoadSpuSym1(playADPCMchannel, "SPUplayADPCMchannel");
@@ -366,50 +350,38 @@ static int LoadSPUplugin(const char *SPUdll) {
        return 0;
 }
 
+extern int in_type[8];
+
 void *hPAD1Driver = NULL;
 void *hPAD2Driver = NULL;
 
-static int multitap1 = -1;
-static int multitap2 = -1;
-//Pad information, keystate, mode, config mode, vibration
-static PadDataS pad[8];
+// Pad information, keystate, mode, config mode, vibration
+static PadDataS pads[8];
 
-static int reqPos, respSize, req;
-static int ledStateReq44[8];
+static int reqPos, respSize;
 
 static unsigned char buf[256];
-static unsigned char bufMulti[34] = { 0x80, 0x5a, 
-                                                                       0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                                                                       0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                                                                       0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                                                                       0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-                                                                       
-unsigned char stdpar[8] = { 0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-unsigned char multitappar[34] = { 0x80, 0x5a, 
-                                                                       0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                                                                       0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                                                                       0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                                                                       0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
-                                                                       
+
+static unsigned char stdpar[8] = { 0x41, 0x5a, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+
 //response for request 44, 45, 46, 47, 4C, 4D
-static unsigned char resp45[8]    = {0xF3, 0x5A, 0x01, 0x02, 0x00, 0x02, 0x01, 0x00};
-static unsigned char resp46_00[8] = {0xF3, 0x5A, 0x00, 0x00, 0x01, 0x02, 0x00, 0x0A};
-static unsigned char resp46_01[8] = {0xF3, 0x5A, 0x00, 0x00, 0x01, 0x01, 0x01, 0x14};
-static unsigned char resp47[8]    = {0xF3, 0x5A, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00};
-static unsigned char resp4C_00[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00};
-static unsigned char resp4C_01[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00};
-static unsigned char resp4D[8]    = {0xF3, 0x5A, 0x00, 0x01, 0xFF, 0xFF, 0xFF, 0xFF};
+static const u8 resp45[8]    = {0xF3, 0x5A, 0x01, 0x02, 0x00, 0x02, 0x01, 0x00};
+static const u8 resp46_00[8] = {0xF3, 0x5A, 0x00, 0x00, 0x01, 0x02, 0x00, 0x0A};
+static const u8 resp46_01[8] = {0xF3, 0x5A, 0x00, 0x00, 0x01, 0x01, 0x01, 0x14};
+static const u8 resp47[8]    = {0xF3, 0x5A, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00};
+static const u8 resp4C_00[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00};
+static const u8 resp4C_01[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00};
 
 //fixed reponse of request number 41, 48, 49, 4A, 4B, 4E, 4F
-static unsigned char resp40[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char resp41[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char resp43[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char resp44[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char resp49[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char resp4A[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char resp4B[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char resp4E[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
-static unsigned char resp4F[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static const u8 resp40[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static const u8 resp41[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static const u8 resp43[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static const u8 resp44[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static const u8 resp49[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static const u8 resp4A[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static const u8 resp4B[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static const u8 resp4E[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+static const u8 resp4F[8] = {0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
 
 // Resquest of psx core
 enum {
@@ -423,26 +395,26 @@ enum {
        // AA rumble large motor speed 0x00 -> 0xFF
        // RESPONSE
        // header 3 Bytes
-       // 0x00 
-       // PadId -> 0x41 for digital pas, 0x73 for analog pad 
+       // 0x00
+       // PadId -> 0x41 for digital pas, 0x73 for analog pad
        // 0x5A mode has not change (no press on analog button on the center of pad), 0x00 the analog button have been pressed and the mode switch
        // 6 Bytes for keystates
        CMD_READ_DATA_AND_VIBRATE = 0x42,
-       
+
        // REQUEST
        // Header
        // 0x0N, 0x43, 0x00, XX, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
        // XX = 00 -> Normal mode : Seconde bytes of response = padId
        // XX = 01 -> Configuration mode : Seconde bytes of response = 0xF3
        // RESPONSE
-       // enter in config mode example : 
+       // enter in config mode example :
        // req : 01 43 00 01 00 00 00 00 00 00
        // res : 00 41 5A buttons state, analog states
-       // exit config mode : 
+       // exit config mode :
        // req : 01 43 00 00 00 00 00 00 00 00
        // res : 00 F3 5A buttons state, analog states
        CMD_CONFIG_MODE = 0x43,
-       
+
        // Set led State
        // REQUEST
        // 0x0N, 0x44, 0x00, VAL, SEL, 0x00, 0x00, 0x00, 0x00
@@ -452,7 +424,7 @@ enum {
        // RESPONSE
        // 0x00, 0xF3, 0x5A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
        CMD_SET_MODE_AND_LOCK = 0x44,
-       
+
        // Get Analog Led state
        // REQUEST
        // 0x0N, 0x45, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -461,7 +433,7 @@ enum {
        // VAL = 00 Led OFF
        // VAL = 01 Led ON
        CMD_QUERY_MODEL_AND_MODE = 0x45,
-       
+
        //Get Variable A
        // REQUEST
        // 0x0N, 0x46, 0x00, 0xXX, 0x00, 0x00, 0x00, 0x00, 0x00
@@ -471,13 +443,13 @@ enum {
        // XX=01
        // 0x00, 0xF3, 0x5A, 0x00, 0x00, 0x01, 0x01, 0x01, 0x14
        CMD_QUERY_ACT = 0x46,
-       
+
        // REQUEST
        // 0x0N, 0x47, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
        // RESPONSE
        // 0x00, 0xF3, 0x5A, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00
        CMD_QUERY_COMB = 0x47,
-       
+
        // REQUEST
        // 0x0N, 0x4C, 0x00, 0xXX, 0x00, 0x00, 0x00, 0x00, 0x00
        // RESPONSE
@@ -486,7 +458,7 @@ enum {
        // XX = 1
        // 0x00, 0xF3, 0x5A, 0x00, 0x00, 0x00, 0x07, 0x00, 0x00
        CMD_QUERY_MODE = 0x4C,
-       
+
        // REQUEST
        // 0x0N, 0x4D, 0x00, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF
        // RESPONSE
@@ -508,27 +480,38 @@ enum {
 };
 
 
+static void initBufForRequest(int padIndex, char value) {
+       if (pads[padIndex].ds.configMode) {
+               buf[0] = 0xf3; buf[1] = 0x5a;
+               respSize = 8;
+       }
+       else if (value != 0x42 && value != 0x43) {
+               respSize = 1;
+               return;
+       }
 
+       if ((u32)(frame_counter - pads[padIndex].ds.lastUseFrame) > 60u
+           && !Config.hacks.dualshock_init_analog)
+               pads[padIndex].ds.padMode = 0; // according to nocash
+       pads[padIndex].ds.lastUseFrame = frame_counter;
 
-//NO MULTITAP
-
-void initBufForRequest(int padIndex, char value){
-       switch (value){
-               //Pad keystate already in buffer
+       switch (value) {
+               // keystate already in buffer, set by PADstartPoll_()
                //case CMD_READ_DATA_AND_VIBRATE :
                //      break;
                case CMD_CONFIG_MODE :
-                       if (pad[padIndex].configMode == 1) {
+                       if (pads[padIndex].ds.configMode) {
                                memcpy(buf, resp43, 8);
                                break;
                        }
-                       //else, not in config mode, pad keystate return (already in the buffer)
+                       // else not in config mode, pad keystate return
                        break;
                case CMD_SET_MODE_AND_LOCK :
                        memcpy(buf, resp44, 8);
                        break;
                case CMD_QUERY_MODEL_AND_MODE :
                        memcpy(buf, resp45, 8);
+                       buf[4] = pads[padIndex].ds.padMode;
                        break;
                case CMD_QUERY_ACT :
                        memcpy(buf, resp46_00, 8);
@@ -539,8 +522,8 @@ void initBufForRequest(int padIndex, char value){
                case CMD_QUERY_MODE :
                        memcpy(buf, resp4C_00, 8);
                        break;
-               case CMD_VIBRATION_TOGGLE :
-                       memcpy(buf, resp4D, 8);
+               case CMD_VIBRATION_TOGGLE: // 4d
+                       memcpy(buf + 2, pads[padIndex].ds.cmd4dConfig, 6);
                        break;
                case REQ40 :
                        memcpy(buf, resp40, 8);
@@ -566,24 +549,23 @@ void initBufForRequest(int padIndex, char value){
        }
 }
 
-
-
-
-void reqIndex2Treatment(int padIndex, char value){
-       switch (req){
+static void reqIndex2Treatment(int padIndex, u8 value) {
+       switch (pads[padIndex].txData[0]) {
                case CMD_CONFIG_MODE :
                        //0x43
                        if (value == 0) {
-                               pad[padIndex].configMode = 0;
-                       } else {
-                               pad[padIndex].configMode = 1;
+                               pads[padIndex].ds.configMode = 0;
+                       } else if (value == 1) {
+                               pads[padIndex].ds.configMode = 1;
+                               pads[padIndex].ds.configModeUsed = 1;
                        }
                        break;
                case CMD_SET_MODE_AND_LOCK :
                        //0x44 store the led state for change mode if the next value = 0x02
                        //0x01 analog ON
                        //0x00 analog OFF
-                       ledStateReq44[padIndex] = value;
+                       if ((value & ~1) == 0)
+                               pads[padIndex].ds.padMode = value;
                        break;
                case CMD_QUERY_ACT :
                        //0x46
@@ -596,227 +578,279 @@ void reqIndex2Treatment(int padIndex, char value){
                                memcpy(buf, resp4C_01, 8);
                        }
                        break;
-               case CMD_VIBRATION_TOGGLE :
-                       //0x4D
-                       memcpy(buf, resp4D, 8);
-                       break;
-               case CMD_READ_DATA_AND_VIBRATE:
-                       //mem the vibration value for small motor;
-                       pad[padIndex].Vib[0] = value;
-                       break;
        }
 }
-       
-void vibrate(int padIndex){
-       if (pad[padIndex].Vib[0] != pad[padIndex].VibF[0] || pad[padIndex].Vib[1] != pad[padIndex].VibF[1]) {
+
+static void ds_update_vibrate(int padIndex) {
+       PadDataS *pad = &pads[padIndex];
+       if (pad->ds.configModeUsed) {
+               pad->Vib[0] = (pad->Vib[0] == 1) ? 1 : 0;
+       }
+       else {
+               // compat mode
+               pad->Vib[0] = (pad->Vib[0] & 0xc0) == 0x40 && (pad->Vib[1] & 1);
+               pad->Vib[1] = 0;
+       }
+       if (pad->Vib[0] != pad->VibF[0] || pad->Vib[1] != pad->VibF[1]) {
                //value is different update Value and call libretro for vibration
-               pad[padIndex].VibF[0] = pad[padIndex].Vib[0];
-               pad[padIndex].VibF[1] = pad[padIndex].Vib[1];
-               plat_trigger_vibrate(padIndex, pad[padIndex].VibF[0], pad[padIndex].VibF[1]);
-               //printf("vibration pad %i", padIndex);
+               pad->VibF[0] = pad->Vib[0];
+               pad->VibF[1] = pad->Vib[1];
+               plat_trigger_vibrate(padIndex, pad->VibF[0], pad->VibF[1]);
+               //printf("vib%i %02x %02x\n", padIndex, pad->VibF[0], pad->VibF[1]);
        }
 }
 
+static void log_pad(int port, int pos)
+{
+#if 0
+       if (port == 0 && pos == respSize - 1) {
+               int i;
+               for (i = 0; i < respSize; i++)
+                       printf("%02x ", pads[port].txData[i]);
+               printf("|");
+               for (i = 0; i < respSize; i++)
+                       printf(" %02x", buf[i]);
+               printf("\n");
+       }
+#endif
+}
 
+static void adjust_analog(unsigned char *b)
+{
+       // ff8 hates 0x80 for whatever reason (broken in 2d area menus),
+       // or is this caused by something else we do wrong??
+       // Also S.C.A.R.S. treats 0x7f as turning left.
+       if (b[6] == 0x7f || b[6] == 0x80)
+               b[6] = 0x81;
+}
 
-
-//Build response for 0x42 request Pad in port
-void _PADstartPoll(PadDataS *pad) {
-    switch (pad->controllerType) {
-        case PSE_PAD_TYPE_MOUSE:
+// Build response for 0x42 request Pad in port
+static void PADstartPoll_(PadDataS *pad) {
+       switch (pad->controllerType) {
+               case PSE_PAD_TYPE_MOUSE:
                        stdpar[0] = 0x12;
-            stdpar[2] = pad->buttonStatus & 0xff;
-            stdpar[3] = pad->buttonStatus >> 8;
-            stdpar[4] = pad->moveX;
-            stdpar[5] = pad->moveY;
-            memcpy(buf, stdpar, 6);
-            respSize = 6;
-            break;
-        case PSE_PAD_TYPE_NEGCON: // npc101/npc104(slph00001/slph00069)
-            stdpar[0] = 0x23;
-            stdpar[2] = pad->buttonStatus & 0xff;
-            stdpar[3] = pad->buttonStatus >> 8;
-            stdpar[4] = pad->rightJoyX;
-            stdpar[5] = pad->rightJoyY;
-            stdpar[6] = pad->leftJoyX;
-            stdpar[7] = pad->leftJoyY;
-            memcpy(buf, stdpar, 8);
-            respSize = 8;
-            break;
-       case PSE_PAD_TYPE_GUNCON: // GUNCON - gun controller SLPH-00034 from Namco
-            stdpar[0] = 0x63;
-           stdpar[1] = 0x5a;
-            stdpar[2] = pad->buttonStatus & 0xff;
-            stdpar[3] = pad->buttonStatus >> 8;
-                   
-            //This code assumes an X resolution of 256 and a Y resolution of 240
-           int xres = 256;
-           int yres = 240;
-           
-           //The code wants an input range for x and y of 0-1023 we passed in -32767 -> 32767 
-           int absX = (pad->absoluteX / 64) + 512;
-           int absY = (pad->absoluteY / 64) + 512;
-                      
-           //Keep within limits
-           if (absX > 1023) absX = 1023;
-           if (absX < 0) absX = 0;
-           if (absY > 1023) absY = 1023;
-           if (absY < 0) absY = 0;
-                   
-           stdpar[4] = 0x5a - (xres - 256) / 3 + (((xres - 256) / 3 + 356) * absX >> 10);      
-           stdpar[5] = (0x5a - (xres - 256) / 3 + (((xres - 256) / 3 + 356) * absX >> 10)) >> 8;
-           stdpar[6] = 0x20 + (yres * absY >> 10);
-           stdpar[7] = (0x20 + (yres * absY >> 10)) >> 8;
-                   
-           //Offscreen - Point at the side of the screen so PSX thinks you are pointing offscreen
-           //Required as a mouse can't be offscreen
-           //Coordinates X=0001h, Y=000Ah indicates "no light"
-           //This will mean you cannot shoot the very each of the screen
-            //ToDo read offscreen range from settings if useful to change
-           int OffscreenRange = 2;
-           if (absX < (OffscreenRange) || absX > (1023 - OffscreenRange) || absY < (OffscreenRange) || absY > (1023 - OffscreenRange))
-           {
-               stdpar[4] = 0x01;
-               stdpar[5] = 0x00;
-               stdpar[6] = 0x0A;
-               stdpar[7] = 0x00;           
-           }
-                   
-            memcpy(buf, stdpar, 8);
-            respSize = 8;
-            break;
-        case PSE_PAD_TYPE_ANALOGPAD: // scph1150
-            stdpar[0] = 0x73;
-            stdpar[2] = pad->buttonStatus & 0xff;
-            stdpar[3] = pad->buttonStatus >> 8;
-            stdpar[4] = pad->rightJoyX;
-            stdpar[5] = pad->rightJoyY;
-            stdpar[6] = pad->leftJoyX;
-            stdpar[7] = pad->leftJoyY;
-            memcpy(buf, stdpar, 8);
-            respSize = 8;
-            break;
-        case PSE_PAD_TYPE_ANALOGJOY: // scph1110
-            stdpar[0] = 0x53;
-            stdpar[2] = pad->buttonStatus & 0xff;
-            stdpar[3] = pad->buttonStatus >> 8;
-            stdpar[4] = pad->rightJoyX;
-            stdpar[5] = pad->rightJoyY;
-            stdpar[6] = pad->leftJoyX;
-            stdpar[7] = pad->leftJoyY;
-            memcpy(buf, stdpar, 8);
-            respSize = 8;
-            break;
-        case PSE_PAD_TYPE_STANDARD:
-        default:
-               stdpar[0] = 0x41;
-            stdpar[2] = pad->buttonStatus & 0xff;
-            stdpar[3] = pad->buttonStatus >> 8;
-            //avoid analog value in multitap mode if change pad type in game.
-            stdpar[4] = 0xff;
-            stdpar[5] = 0xff;
-            stdpar[6] = 0xff;
-            stdpar[7] = 0xff;
-               memcpy(buf, stdpar, 8);
-               respSize = 8;
-    }
+                       stdpar[1] = 0x5a;
+                       stdpar[2] = pad->buttonStatus & 0xff;
+                       stdpar[3] = pad->buttonStatus >> 8;
+                       stdpar[4] = pad->moveX;
+                       stdpar[5] = pad->moveY;
+                       memcpy(buf, stdpar, 6);
+                       respSize = 6;
+                       break;
+               case PSE_PAD_TYPE_NEGCON: // npc101/npc104(slph00001/slph00069)
+                       stdpar[0] = 0x23;
+                       stdpar[1] = 0x5a;
+                       stdpar[2] = pad->buttonStatus & 0xff;
+                       stdpar[3] = pad->buttonStatus >> 8;
+                       stdpar[4] = pad->rightJoyX;
+                       stdpar[5] = pad->rightJoyY;
+                       stdpar[6] = pad->leftJoyX;
+                       stdpar[7] = pad->leftJoyY;
+                       memcpy(buf, stdpar, 8);
+                       respSize = 8;
+                       break;
+               case PSE_PAD_TYPE_GUNCON: // GUNCON - gun controller SLPH-00034 from Namco
+                       stdpar[0] = 0x63;
+                       stdpar[1] = 0x5a;
+                       stdpar[2] = pad->buttonStatus & 0xff;
+                       stdpar[3] = pad->buttonStatus >> 8;
+
+                       int absX = pad->absoluteX; // 0-1023
+                       int absY = pad->absoluteY;
+
+                       if (absX == 65536 || absY == 65536) {
+                               stdpar[4] = 0x01;
+                               stdpar[5] = 0x00;
+                               stdpar[6] = 0x0A;
+                               stdpar[7] = 0x00;
+                       }
+                       else {
+                               int y_ofs = 0, yres = 240;
+                               GPU_getScreenInfo(&y_ofs, &yres);
+                               int y_top = (Config.PsxType ? 0x30 : 0x19) + y_ofs;
+                               int w = Config.PsxType ? 385 : 378;
+                               int x = 0x40 + (w * absX >> 10);
+                               int y = y_top + (yres * absY >> 10);
+                               //printf("%3d %3d %4x %4x\n", absX, absY, x, y);
+
+                               stdpar[4] = x;
+                               stdpar[5] = x >> 8;
+                               stdpar[6] = y;
+                               stdpar[7] = y >> 8;
+                       }
+
+                       memcpy(buf, stdpar, 8);
+                       respSize = 8;
+                       break;
+               case PSE_PAD_TYPE_GUN: // GUN CONTROLLER - gun controller SLPH-00014 from Konami
+                       stdpar[0] = 0x31;
+                       stdpar[1] = 0x5a;
+                       stdpar[2] = pad->buttonStatus & 0xff;
+                       stdpar[3] = pad->buttonStatus >> 8;
+                       memcpy(buf, stdpar, 4);
+                       respSize = 4;
+                       break;
+               case PSE_PAD_TYPE_ANALOGPAD: // scph1150
+                       if (pad->ds.padMode == 0)
+                               goto standard;
+                       stdpar[0] = 0x73;
+                       stdpar[1] = 0x5a;
+                       stdpar[2] = pad->buttonStatus & 0xff;
+                       stdpar[3] = pad->buttonStatus >> 8;
+                       stdpar[4] = pad->rightJoyX;
+                       stdpar[5] = pad->rightJoyY;
+                       stdpar[6] = pad->leftJoyX;
+                       stdpar[7] = pad->leftJoyY;
+                       adjust_analog(stdpar);
+                       memcpy(buf, stdpar, 8);
+                       respSize = 8;
+                       break;
+               case PSE_PAD_TYPE_ANALOGJOY: // scph1110
+                       stdpar[0] = 0x53;
+                       stdpar[1] = 0x5a;
+                       stdpar[2] = pad->buttonStatus & 0xff;
+                       stdpar[3] = pad->buttonStatus >> 8;
+                       stdpar[4] = pad->rightJoyX;
+                       stdpar[5] = pad->rightJoyY;
+                       stdpar[6] = pad->leftJoyX;
+                       stdpar[7] = pad->leftJoyY;
+                       adjust_analog(stdpar);
+                       memcpy(buf, stdpar, 8);
+                       respSize = 8;
+                       break;
+               case PSE_PAD_TYPE_STANDARD:
+               standard:
+                       stdpar[0] = 0x41;
+                       stdpar[1] = 0x5a;
+                       stdpar[2] = pad->buttonStatus & 0xff;
+                       stdpar[3] = pad->buttonStatus >> 8;
+                       memcpy(buf, stdpar, 4);
+                       respSize = 4;
+                       break;
+               default:
+                       respSize = 0;
+                       break;
+       }
 }
 
+static void PADpoll_dualshock(int port, unsigned char value, int pos)
+{
+       switch (pos) {
+               case 0:
+                       initBufForRequest(port, value);
+                       break;
+               case 2:
+                       reqIndex2Treatment(port, value);
+                       break;
+               case 7:
+                       if (pads[port].txData[0] == CMD_VIBRATION_TOGGLE)
+                               memcpy(pads[port].ds.cmd4dConfig, pads[port].txData + 2, 6);
+                       break;
+       }
 
-//Build response for 0x42 request Multitap in port
-//Response header for multitap : 0x80, 0x5A, (Pad information port 1-2A), (Pad information port 1-2B), (Pad information port 1-2C), (Pad information port 1-2D)
-void _PADstartPollMultitap(PadDataS* padd) {
-    int i, offset;
-    for(i = 0; i < 4; i++) {
-       offset = 2 + (i * 8);
-       _PADstartPoll(&padd[i]);
-       memcpy(multitappar+offset, stdpar, 8);
-    }
-    memcpy(bufMulti, multitappar, 34);
-    respSize = 34;
+       if (pads[port].txData[0] == CMD_READ_DATA_AND_VIBRATE
+           && !pads[port].ds.configModeUsed && 2 <= pos && pos < 4)
+       {
+               // "compat" single motor mode
+               pads[port].Vib[pos - 2] = value;
+       }
+       else if (pads[port].txData[0] == CMD_READ_DATA_AND_VIBRATE
+                && 2 <= pos && pos < 8)
+       {
+               // 0 - weak motor, 1 - strong motor
+               int dev = pads[port].ds.cmd4dConfig[pos - 2];
+               if (dev < 2)
+                       pads[port].Vib[dev] = value;
+       }
+       if (pos == respSize - 1)
+               ds_update_vibrate(port);
 }
 
+static unsigned char PADpoll_(int port, unsigned char value, int pos, int *more_data) {
+       if (pos == 0 && value != 0x42 && in_type[port] != PSE_PAD_TYPE_ANALOGPAD)
+               respSize = 1;
 
-unsigned char _PADpoll(int port, unsigned char value) {
-       if (reqPos == 0) {
-               //mem the request number
-               req = value;
-               //copy the default value of request response in buffer instead of the keystate
-               initBufForRequest(port, value);
-       }
-       
-       //if no new request the pad return 0xff, for signaling connected
-       if (reqPos >= respSize) return 0xff;
-       
-       switch(reqPos){
-               case 2:
-                       reqIndex2Treatment(port, value);
-               break;
-               case 3:
-                       switch(req) {
-                               case CMD_SET_MODE_AND_LOCK :
-                                       //change mode on pad
-                               break;
-                               case CMD_READ_DATA_AND_VIBRATE:
-                               //mem the vibration value for Large motor;
-                               pad[port].Vib[1] = value;
-                               //vibration
-                               vibrate(port);
-                               break;
-                       }
-               break;
+       switch (in_type[port]) {
+               case PSE_PAD_TYPE_ANALOGPAD:
+                       PADpoll_dualshock(port, value, pos);
+                       break;
+               case PSE_PAD_TYPE_GUN:
+                       if (pos == 2)
+                               pl_gun_byte2(port, value);
+                       break;
        }
-       return buf[reqPos++];
+
+       *more_data = pos < respSize - 1;
+       if (pos >= respSize)
+               return 0xff; // no response/HiZ
+
+       log_pad(port, pos);
+       return buf[pos];
 }
 
+// response: 0x80, 0x5A, 8 bytes each for ports A, B, C, D
+static unsigned char PADpollMultitap(int port, unsigned char value, int pos, int *more_data) {
+       unsigned int devByte, dev;
+       int unused = 0;
 
-unsigned char _PADpollMultitap(int port, unsigned char value) {
-       if (reqPos >= respSize) return 0xff;
-       return bufMulti[reqPos++];
+       if (pos == 0) {
+               *more_data = (value == 0x42);
+               return 0x80;
+       }
+       *more_data = pos < 34 - 1;
+       if (pos == 1)
+               return 0x5a;
+       if (pos >= 34)
+               return 0xff;
+
+       devByte = pos - 2;
+       dev = devByte / 8;
+       if (devByte % 8 == 0)
+               PADstartPoll_(&pads[port + dev]);
+       return PADpoll_(port + dev, value, devByte % 8, &unused);
 }
 
+static unsigned char PADpollMain(int port, unsigned char value, int *more_data) {
+       unsigned char ret;
+       int pos = reqPos++;
+
+       if (pos < sizeof(pads[port].txData))
+               pads[port].txData[pos] = value;
+       if (!pads[port].portMultitap || !pads[port].multitapLongModeEnabled)
+               ret = PADpoll_(port, value, pos, more_data);
+       else
+               ret = PADpollMultitap(port, value, pos, more_data);
+       return ret;
+
+}
 
 // refresh the button state on port 1.
 // int pad is not needed.
-unsigned char CALLBACK PAD1__startPoll(int pad) {
+unsigned char CALLBACK PAD1__startPoll(int unused) {
+       int i;
+
        reqPos = 0;
-       // first call the pad provide if a multitap is connected between the psx and himself
-       if (multitap1 == -1) {
-               PadDataS padd;
-               padd.requestPadIndex = 0;
-               PAD1_readPort1(&padd);
-               multitap1 = padd.portMultitap;
-       }
-       // just one pad is on port 1 : NO MULTITAP
-       if (multitap1 == 0) {
-               PadDataS padd;
-               padd.requestPadIndex = 0;
-               PAD1_readPort1(&padd);
-               _PADstartPoll(&padd);
+       pads[0].requestPadIndex = 0;
+       PAD1_readPort1(&pads[0]);
+
+       pads[0].multitapLongModeEnabled = 0;
+       if (pads[0].portMultitap)
+               pads[0].multitapLongModeEnabled = pads[0].txData[1] & 1;
+
+       if (!pads[0].portMultitap || !pads[0].multitapLongModeEnabled) {
+               PADstartPoll_(&pads[0]);
        } else {
-               // a multitap is plugged : refresh all pad.
-               int i;
-               PadDataS padd[4];
-               for(i = 0; i < 4; i++) {
-                       padd[i].requestPadIndex = i;
-                       PAD1_readPort1(&padd[i]);
+               // a multitap is plugged and enabled: refresh pads 1-3
+               for (i = 1; i < 4; i++) {
+                       pads[i].requestPadIndex = i;
+                       PAD1_readPort1(&pads[i]);
                }
-               _PADstartPollMultitap(padd);
        }
-       //printf("\npad 1 : ");
-       return 0x00;
+       return 0xff;
 }
 
-unsigned char CALLBACK PAD1__poll(unsigned char value) {
-       char tmp;
-       if (multitap1 == 1) {
-               tmp = _PADpollMultitap(0, value);
-       } else {
-               tmp = _PADpoll(0, value);
-       }
-       //printf("%2x:%2x, ",value,tmp);
-       return tmp;
-       
+unsigned char CALLBACK PAD1__poll(unsigned char value, int *more_data) {
+       return PADpollMain(0, value, more_data);
 }
 
 
@@ -838,6 +872,7 @@ long CALLBACK PAD1__keypressed() { return 0; }
 
 static int LoadPAD1plugin(const char *PAD1dll) {
        void *drv;
+       size_t p;
 
        hPAD1Driver = SysLoadLibrary(PAD1dll);
        if (hPAD1Driver == NULL) {
@@ -859,58 +894,39 @@ static int LoadPAD1plugin(const char *PAD1dll) {
        LoadPad1Sym0(poll, "PADpoll");
        LoadPad1SymN(setSensitive, "PADsetSensitive");
 
+       memset(pads, 0, sizeof(pads));
+       for (p = 0; p < sizeof(pads) / sizeof(pads[0]); p++) {
+               memset(pads[p].ds.cmd4dConfig, 0xff, sizeof(pads[p].ds.cmd4dConfig));
+       }
+
        return 0;
 }
 
 unsigned char CALLBACK PAD2__startPoll(int pad) {
-       int pad_index;
+       int pad_index = pads[0].portMultitap ? 4 : 1;
+       int i;
 
        reqPos = 0;
-       if (multitap1 == 0 && (multitap2 == 0 || multitap2 == 2)) {
-               pad_index = 1;
-       } else if(multitap1 == 1 && (multitap2 == 0 || multitap2 == 2)) {
-               pad_index = 4;
-       } else {
-               pad_index = 0;
-       }
+       pads[pad_index].requestPadIndex = pad_index;
+       PAD2_readPort2(&pads[pad_index]);
 
-       //first call the pad provide if a multitap is connected between the psx and himself
-       if (multitap2 == -1) {
-               PadDataS padd;
-               padd.requestPadIndex = pad_index;
-               PAD2_readPort2(&padd);
-               multitap2 = padd.portMultitap;
-       }
-       
-       // just one pad is on port 1 : NO MULTITAP
-       if (multitap2 == 0) {
-               PadDataS padd;
-               padd.requestPadIndex = pad_index;
-               PAD2_readPort2(&padd);
-               _PADstartPoll(&padd);
+       pads[pad_index].multitapLongModeEnabled = 0;
+       if (pads[pad_index].portMultitap)
+               pads[pad_index].multitapLongModeEnabled = pads[pad_index].txData[1] & 1;
+
+       if (!pads[pad_index].portMultitap || !pads[pad_index].multitapLongModeEnabled) {
+               PADstartPoll_(&pads[pad_index]);
        } else {
-               // a multitap is plugged : refresh all pad.
-               int i;
-               PadDataS padd[4];
-               for(i = 0; i < 4; i++) {
-                       padd[i].requestPadIndex = i+pad_index;
-                       PAD2_readPort2(&padd[i]);
+               for (i = 1; i < 4; i++) {
+                       pads[pad_index + i].requestPadIndex = pad_index + i;
+                       PAD2_readPort2(&pads[pad_index + i]);
                }
-               _PADstartPollMultitap(padd);
        }
-       //printf("\npad 2 : ");
-       return 0x00;
+       return 0xff;
 }
 
-unsigned char CALLBACK PAD2__poll(unsigned char value) {
-       char tmp;
-       if (multitap2 == 2) {
-               tmp = _PADpollMultitap(1, value);
-       } else {
-               tmp = _PADpoll(1, value);
-       }
-       //printf("%2x:%2x, ",value,tmp);
-       return tmp;
+unsigned char CALLBACK PAD2__poll(unsigned char value, int *more_data) {
+       return PADpollMain(pads[0].portMultitap ? 4 : 1, value, more_data);
 }
 
 long CALLBACK PAD2__configure(void) { return 0; }
@@ -955,6 +971,29 @@ static int LoadPAD2plugin(const char *PAD2dll) {
        return 0;
 }
 
+int padFreeze(void *f, int Mode) {
+       size_t i;
+
+       for (i = 0; i < sizeof(pads) / sizeof(pads[0]); i++) {
+               pads[i].saveSize = sizeof(pads[i]);
+               gzfreeze(&pads[i], sizeof(pads[i]));
+               if (Mode == 0 && pads[i].saveSize != sizeof(pads[i]))
+                       SaveFuncs.seek(f, pads[i].saveSize - sizeof(pads[i]), SEEK_CUR);
+       }
+
+       return 0;
+}
+
+int padToggleAnalog(unsigned int index)
+{
+       int r = -1;
+
+       if (index < sizeof(pads) / sizeof(pads[0]))
+               r = (pads[index].ds.padMode ^= 1);
+       return r;
+}
+
+
 void *hNETDriver = NULL;
 
 void CALLBACK NET__setInfo(netInfo *info) {}
@@ -1040,70 +1079,66 @@ unsigned long CALLBACK SIO1__readBaud32(void) { return 0; }
 void CALLBACK SIO1__registerCallback(void (CALLBACK *callback)(void)) {};
 
 void CALLBACK SIO1irq(void) {
-    psxHu32ref(0x1070) |= SWAPu32(0x100);
+       psxHu32ref(0x1070) |= SWAPu32(0x100);
 }
 
 #define LoadSio1Sym1(dest, name) \
-    LoadSym(SIO1_##dest, SIO1##dest, name, TRUE);
+       LoadSym(SIO1_##dest, SIO1##dest, name, TRUE);
 
 #define LoadSio1SymN(dest, name) \
-    LoadSym(SIO1_##dest, SIO1##dest, name, FALSE);
+       LoadSym(SIO1_##dest, SIO1##dest, name, FALSE);
 
 #define LoadSio1Sym0(dest, name) \
-    LoadSym(SIO1_##dest, SIO1##dest, name, FALSE); \
-    if (SIO1_##dest == NULL) SIO1_##dest = (SIO1##dest) SIO1__##dest;
+       LoadSym(SIO1_##dest, SIO1##dest, name, FALSE); \
+       if (SIO1_##dest == NULL) SIO1_##dest = (SIO1##dest) SIO1__##dest;
 
 static int LoadSIO1plugin(const char *SIO1dll) {
-    void *drv;
-
-    hSIO1Driver = SysLoadLibrary(SIO1dll);
-    if (hSIO1Driver == NULL) {
-        SysMessage (_("Could not load SIO1 plugin %s!"), SIO1dll); return -1;
-    }
-    drv = hSIO1Driver;
-
-    LoadSio1Sym0(init, "SIO1init");
-    LoadSio1Sym0(shutdown, "SIO1shutdown");
-    LoadSio1Sym0(open, "SIO1open");
-    LoadSio1Sym0(close, "SIO1close");
-    LoadSio1Sym0(pause, "SIO1pause");
-    LoadSio1Sym0(resume, "SIO1resume");
-    LoadSio1Sym0(keypressed, "SIO1keypressed");
-    LoadSio1Sym0(configure, "SIO1configure");
-    LoadSio1Sym0(test, "SIO1test");
-    LoadSio1Sym0(about, "SIO1about");
-    LoadSio1Sym0(writeData8, "SIO1writeData8");
-    LoadSio1Sym0(writeData16, "SIO1writeData16");
-    LoadSio1Sym0(writeData32, "SIO1writeData32");
-    LoadSio1Sym0(writeStat16, "SIO1writeStat16");
-    LoadSio1Sym0(writeStat32, "SIO1writeStat32");
-    LoadSio1Sym0(writeMode16, "SIO1writeMode16");
-    LoadSio1Sym0(writeMode32, "SIO1writeMode32");
-    LoadSio1Sym0(writeCtrl16, "SIO1writeCtrl16");
-    LoadSio1Sym0(writeCtrl32, "SIO1writeCtrl32");
-    LoadSio1Sym0(writeBaud16, "SIO1writeBaud16");
-    LoadSio1Sym0(writeBaud32, "SIO1writeBaud32");
-    LoadSio1Sym0(readData16, "SIO1readData16");
-    LoadSio1Sym0(readData32, "SIO1readData32");
-    LoadSio1Sym0(readStat16, "SIO1readStat16");
-    LoadSio1Sym0(readStat32, "SIO1readStat32");
-    LoadSio1Sym0(readMode16, "SIO1readMode16");
-    LoadSio1Sym0(readMode32, "SIO1readMode32");
-    LoadSio1Sym0(readCtrl16, "SIO1readCtrl16");
-    LoadSio1Sym0(readCtrl32, "SIO1readCtrl32");
-    LoadSio1Sym0(readBaud16, "SIO1readBaud16");
-    LoadSio1Sym0(readBaud32, "SIO1readBaud32");
-    LoadSio1Sym0(registerCallback, "SIO1registerCallback");
-
-    return 0;
-}
+       void *drv;
 
-#endif
+       hSIO1Driver = SysLoadLibrary(SIO1dll);
+       if (hSIO1Driver == NULL) {
+               SysMessage (_("Could not load SIO1 plugin %s!"), SIO1dll); return -1;
+       }
+       drv = hSIO1Driver;
+
+       LoadSio1Sym0(init, "SIO1init");
+       LoadSio1Sym0(shutdown, "SIO1shutdown");
+       LoadSio1Sym0(open, "SIO1open");
+       LoadSio1Sym0(close, "SIO1close");
+       LoadSio1Sym0(pause, "SIO1pause");
+       LoadSio1Sym0(resume, "SIO1resume");
+       LoadSio1Sym0(keypressed, "SIO1keypressed");
+       LoadSio1Sym0(configure, "SIO1configure");
+       LoadSio1Sym0(test, "SIO1test");
+       LoadSio1Sym0(about, "SIO1about");
+       LoadSio1Sym0(writeData8, "SIO1writeData8");
+       LoadSio1Sym0(writeData16, "SIO1writeData16");
+       LoadSio1Sym0(writeData32, "SIO1writeData32");
+       LoadSio1Sym0(writeStat16, "SIO1writeStat16");
+       LoadSio1Sym0(writeStat32, "SIO1writeStat32");
+       LoadSio1Sym0(writeMode16, "SIO1writeMode16");
+       LoadSio1Sym0(writeMode32, "SIO1writeMode32");
+       LoadSio1Sym0(writeCtrl16, "SIO1writeCtrl16");
+       LoadSio1Sym0(writeCtrl32, "SIO1writeCtrl32");
+       LoadSio1Sym0(writeBaud16, "SIO1writeBaud16");
+       LoadSio1Sym0(writeBaud32, "SIO1writeBaud32");
+       LoadSio1Sym0(readData16, "SIO1readData16");
+       LoadSio1Sym0(readData32, "SIO1readData32");
+       LoadSio1Sym0(readStat16, "SIO1readStat16");
+       LoadSio1Sym0(readStat32, "SIO1readStat32");
+       LoadSio1Sym0(readMode16, "SIO1readMode16");
+       LoadSio1Sym0(readMode32, "SIO1readMode32");
+       LoadSio1Sym0(readCtrl16, "SIO1readCtrl16");
+       LoadSio1Sym0(readCtrl32, "SIO1readCtrl32");
+       LoadSio1Sym0(readBaud16, "SIO1readBaud16");
+       LoadSio1Sym0(readBaud32, "SIO1readBaud32");
+       LoadSio1Sym0(registerCallback, "SIO1registerCallback");
 
-void CALLBACK clearDynarec(void) {
-       psxCpu->Reset();
+       return 0;
 }
 
+#endif
+
 int LoadPlugins() {
        int ret;
        char Plugin[MAXPATHLEN * 2];
@@ -1181,7 +1216,7 @@ void ReleasePlugins() {
        if (hPAD1Driver != NULL) PAD1_shutdown();
        if (hPAD2Driver != NULL) PAD2_shutdown();
 
-       if (Config.UseNet && hNETDriver != NULL) NET_shutdown(); 
+       if (Config.UseNet && hNETDriver != NULL) NET_shutdown();
 
        if (hCDRDriver != NULL) { SysCloseLibrary(hCDRDriver); hCDRDriver = NULL; }
        if (hGPUDriver != NULL) { SysCloseLibrary(hGPUDriver); hGPUDriver = NULL; }