X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=libpcsxcore%2Fplugins.c;h=e6d8a11e155be021dd22ffc2226c4cec5b0777d1;hb=HEAD;hp=2dacfd5a1565c7031b20bd2f9e1075a82b731ef1;hpb=ab88daca6f1367543d88b35e04a7999f3e36a0ff;p=pcsx_rearmed.git diff --git a/libpcsxcore/plugins.c b/libpcsxcore/plugins.c index 2dacfd5a..369ea974 100644 --- a/libpcsxcore/plugins.c +++ b/libpcsxcore/plugins.c @@ -23,6 +23,7 @@ #include "plugins.h" #include "cdriso.h" +#include "psxcounters.h" static char IsoFile[MAXPATHLEN] = ""; static s64 cdOpenCaseTime = 0; @@ -30,9 +31,6 @@ static s64 cdOpenCaseTime = 0; GPUupdateLace GPU_updateLace; GPUinit GPU_init; GPUshutdown GPU_shutdown; -GPUconfigure GPU_configure; -GPUtest GPU_test; -GPUabout GPU_about; GPUopen GPU_open; GPUclose GPU_close; GPUreadStatus GPU_readStatus; @@ -70,6 +68,7 @@ CDRabout CDR_about; CDRsetfilename CDR_setfilename; CDRreadCDDA CDR_readCDDA; CDRgetTE CDR_getTE; +CDRprefetch CDR_prefetch; SPUinit SPU_init; SPUshutdown SPU_shutdown; @@ -85,6 +84,7 @@ SPUregisterCallback SPU_registerCallback; SPUregisterScheduleCb SPU_registerScheduleCb; SPUasync SPU_async; SPUplayCDDAchannel SPU_playCDDAchannel; +SPUsetCDvol SPU_setCDvol; PADconfigure PAD1_configure; PADabout PAD1_about; @@ -178,7 +178,7 @@ static const char *err; #define LoadSym(dest, src, name, checkerr) { \ dest = (src)SysLoadSym(drv, name); \ - if (checkerr) { CheckErr(name); } else SysLibError(); \ + if (checkerr) { CheckErr(name); } \ } void *hGPUDriver = NULL; @@ -212,7 +212,6 @@ static int LoadGPUplugin(const char *GPUdll) { hGPUDriver = SysLoadLibrary(GPUdll); if (hGPUDriver == NULL) { - GPU_configure = NULL; SysMessage (_("Could not load GPU plugin %s!"), GPUdll); return -1; } drv = hGPUDriver; @@ -236,9 +235,6 @@ static int LoadGPUplugin(const char *GPUdll) { LoadGpuSym0(showScreenPic, "GPUshowScreenPic"); LoadGpuSym0(vBlank, "GPUvBlank"); LoadGpuSym0(getScreenInfo, "GPUgetScreenInfo"); - LoadGpuSym0(configure, "GPUconfigure"); - LoadGpuSym0(test, "GPUtest"); - LoadGpuSym0(about, "GPUabout"); return 0; } @@ -262,6 +258,7 @@ long CALLBACK CDR__configure(void) { return 0; } long CALLBACK CDR__test(void) { return 0; } void CALLBACK CDR__about(void) {} long CALLBACK CDR__setfilename(char*filename) { return 0; } +long CALLBACK CDR__prefetch(u8 m, u8 s, u8 f) { return 1; } #define LoadCdrSym1(dest, name) \ LoadSym(CDR_##dest, CDR##dest, name, TRUE); @@ -306,19 +303,22 @@ static int LoadCDRplugin(const char *CDRdll) { LoadCdrSym0(setfilename, "CDRsetfilename"); LoadCdrSymN(readCDDA, "CDRreadCDDA"); LoadCdrSymN(getTE, "CDRgetTE"); + LoadCdrSym0(prefetch, "CDRprefetch"); return 0; } static void *hSPUDriver = NULL; static void CALLBACK SPU__registerScheduleCb(void (CALLBACK *cb)(unsigned int)) {} +static void CALLBACK SPU__setCDvol(unsigned char ll, unsigned char lr, + unsigned char rl, unsigned char rr, unsigned int cycle) {} #define LoadSpuSym1(dest, name) \ LoadSym(SPU_##dest, SPU##dest, name, TRUE); #define LoadSpuSym0(dest, name) \ LoadSym(SPU_##dest, SPU##dest, name, FALSE); \ - if (SPU_##dest == NULL) SPU_##dest = (SPU##dest) SPU__##dest; + if (SPU_##dest == NULL) SPU_##dest = SPU__##dest; #define LoadSpuSymN(dest, name) \ LoadSym(SPU_##dest, SPU##dest, name, FALSE); @@ -345,6 +345,7 @@ static int LoadSPUplugin(const char *SPUdll) { LoadSpuSym0(registerScheduleCb, "SPUregisterScheduleCb"); LoadSpuSymN(async, "SPUasync"); LoadSpuSymN(playCDDAchannel, "SPUplayCDDAchannel"); + LoadSpuSym0(setCDvol, "SPUsetCDvol"); return 0; } @@ -364,24 +365,23 @@ static unsigned char buf[256]; 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 { @@ -481,23 +481,56 @@ enum { static void initBufForRequest(int padIndex, char value) { - switch (value){ - //Pad keystate already in buffer + 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) > 2*60u + && pads[padIndex].ds.configModeUsed + && !Config.hacks.dualshock_init_analog) + { + //SysPrintf("Pad reset\n"); + pads[padIndex].ds.padMode = 0; // according to nocash + pads[padIndex].ds.autoAnalogTried = 0; + } + else if (pads[padIndex].ds.padMode == 0 && value == CMD_READ_DATA_AND_VIBRATE + && pads[padIndex].ds.configModeUsed + && !pads[padIndex].ds.configMode + && !pads[padIndex].ds.userToggled) + { + if (pads[padIndex].ds.autoAnalogTried == 16) { + // auto-enable for convenience + SysPrintf("Auto-enabling dualshock analog mode.\n"); + pads[padIndex].ds.padMode = 1; + pads[padIndex].ds.autoAnalogTried = 255; + } + else if (pads[padIndex].ds.autoAnalogTried < 16) + pads[padIndex].ds.autoAnalogTried++; + } + pads[padIndex].ds.lastUseFrame = frame_counter; + + switch (value) { + // keystate already in buffer, set by PADstartPoll_() //case CMD_READ_DATA_AND_VIBRATE : // break; case CMD_CONFIG_MODE : - if (pads[padIndex].configMode) { + 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].PadMode; + buf[4] = pads[padIndex].ds.padMode; break; case CMD_QUERY_ACT : memcpy(buf, resp46_00, 8); @@ -508,8 +541,8 @@ static 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); @@ -535,22 +568,23 @@ static void initBufForRequest(int padIndex, char value) { } } -static void reqIndex2Treatment(int padIndex, char value) { +static void reqIndex2Treatment(int padIndex, u8 value) { switch (pads[padIndex].txData[0]) { case CMD_CONFIG_MODE : //0x43 if (value == 0) { - pads[padIndex].configMode = 0; - } else { - pads[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; - pads[padIndex].PadMode = value; + if ((value & ~1) == 0) + pads[padIndex].ds.padMode = value; break; case CMD_QUERY_ACT : //0x46 @@ -563,26 +597,50 @@ static 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; - pads[padIndex].Vib[0] = value; - break; } } -static void vibrate(int padIndex) { +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->VibF[0] = pad->Vib[0]; pad->VibF[1] = pad->Vib[1]; plat_trigger_vibrate(padIndex, pad->VibF[0], pad->VibF[1]); - //printf("vibration pad %i", padIndex); + //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 @@ -652,6 +710,8 @@ static void PADstartPoll_(PadDataS *pad) { 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; @@ -660,6 +720,7 @@ static void PADstartPoll_(PadDataS *pad) { stdpar[5] = pad->rightJoyY; stdpar[6] = pad->leftJoyX; stdpar[7] = pad->leftJoyY; + adjust_analog(stdpar); memcpy(buf, stdpar, 8); respSize = 8; break; @@ -672,10 +733,12 @@ static void PADstartPoll_(PadDataS *pad) { 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; @@ -698,15 +761,28 @@ static void PADpoll_dualshock(int port, unsigned char value, int pos) case 2: reqIndex2Treatment(port, value); break; - case 3: - if (pads[port].txData[0] == CMD_READ_DATA_AND_VIBRATE) { - // vibration value for the Large motor - pads[port].Vib[1] = value; - - vibrate(port); - } + case 7: + if (pads[port].txData[0] == CMD_VIBRATION_TOGGLE) + memcpy(pads[port].ds.cmd4dConfig, pads[port].txData + 2, 6); break; } + + 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) { @@ -727,6 +803,7 @@ static unsigned char PADpoll_(int port, unsigned char value, int pos, int *more_ if (pos >= respSize) return 0xff; // no response/HiZ + log_pad(port, pos); return buf[pos]; } @@ -814,6 +891,7 @@ long CALLBACK PAD1__keypressed() { return 0; } static int LoadPAD1plugin(const char *PAD1dll) { void *drv; + size_t p; hPAD1Driver = SysLoadLibrary(PAD1dll); if (hPAD1Driver == NULL) { @@ -835,6 +913,11 @@ 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; } @@ -907,6 +990,31 @@ 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); + pads[index].ds.userToggled = 1; + } + return r; +} + + void *hNETDriver = NULL; void CALLBACK NET__setInfo(netInfo *info) {}