X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro.c;h=f94bcc68769b33c19adceb4dddc2a2361b2cf031;hb=4ee722a52cb0fb56260ccd3962537e5c772800e0;hp=62c4fbfa03ccd54b5230d498ab79bd4e887230b4;hpb=311312335dca8b82913397418ca5c8aa8a677081;p=pcsx_rearmed.git diff --git a/frontend/libretro.c b/frontend/libretro.c index 62c4fbfa..f94bcc68 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -39,6 +39,7 @@ #include "revision.h" #include +#include #include "libretro_core_options.h" #ifdef _3DS @@ -117,6 +118,7 @@ int in_mouse[8][2]; int multitap1 = 0; int multitap2 = 0; int in_enable_vibration = 1; +static int input_changed = 0; // NegCon adjustment parameters // > The NegCon 'twist' action is somewhat awkward when mapped @@ -574,106 +576,6 @@ unsigned retro_api_version(void) return RETRO_API_VERSION; } -static int controller_port_variable(unsigned port, struct retro_variable *var) -{ - if (port >= PORTS_NUMBER) - return 0; - - if (!environ_cb) - return 0; - - var->value = NULL; - switch (port) - { - case 0: - var->key = "pcsx_rearmed_pad1type"; - break; - case 1: - var->key = "pcsx_rearmed_pad2type"; - break; - case 2: - var->key = "pcsx_rearmed_pad3type"; - break; - case 3: - var->key = "pcsx_rearmed_pad4type"; - break; - case 4: - var->key = "pcsx_rearmed_pad5type"; - break; - case 5: - var->key = "pcsx_rearmed_pad6type"; - break; - case 6: - var->key = "pcsx_rearmed_pad7type"; - break; - case 7: - var->key = "pcsx_rearmed_pad8type"; - break; - } - - return environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, var) && var->value; -} - -static void update_controller_port_variable(unsigned port) -{ - if (port >= PORTS_NUMBER) - return; - - struct retro_variable var; - - if (controller_port_variable(port, &var)) - { - if (strcmp(var.value, "standard") == 0) - in_type[port] = PSE_PAD_TYPE_STANDARD; - else if (strcmp(var.value, "analog") == 0) - in_type[port] = PSE_PAD_TYPE_ANALOGJOY; - else if (strcmp(var.value, "dualshock") == 0) - in_type[port] = PSE_PAD_TYPE_ANALOGPAD; - else if (strcmp(var.value, "negcon") == 0) - in_type[port] = PSE_PAD_TYPE_NEGCON; - else if (strcmp(var.value, "guncon") == 0) - in_type[port] = PSE_PAD_TYPE_GUNCON; - else if (strcmp(var.value, "mouse") == 0) - in_type[port] = PSE_PAD_TYPE_MOUSE; - else if (strcmp(var.value, "none") == 0) - in_type[port] = PSE_PAD_TYPE_NONE; - // else 'default' case, do nothing - } -} - -static void update_controller_port_device(unsigned port, unsigned device) -{ - if (port >= PORTS_NUMBER) - return; - - struct retro_variable var; - - if (!controller_port_variable(port, &var)) - return; - - if (strcmp(var.value, "default") != 0) - return; - - switch (device) - { - case RETRO_DEVICE_JOYPAD: - in_type[port] = PSE_PAD_TYPE_STANDARD; - break; - case RETRO_DEVICE_ANALOG: - in_type[port] = PSE_PAD_TYPE_ANALOGPAD; - break; - case RETRO_DEVICE_MOUSE: - in_type[port] = PSE_PAD_TYPE_MOUSE; - break; - case RETRO_DEVICE_LIGHTGUN: - in_type[port] = PSE_PAD_TYPE_GUN; - break; - case RETRO_DEVICE_NONE: - default: - in_type[port] = PSE_PAD_TYPE_NONE; - } -} - static void update_multitap(void) { struct retro_variable var; @@ -688,11 +590,11 @@ static void update_multitap(void) multitap1 = 1; else if (strcmp(var.value, "disabled") == 0) multitap1 = 0; - else // 'auto' case + else if (strcmp(var.value, "automatic") == 0) auto_case = 1; } else - auto_case = 1; + multitap1 = 0; if (auto_case) { @@ -711,11 +613,11 @@ static void update_multitap(void) multitap2 = 1; else if (strcmp(var.value, "disabled") == 0) multitap2 = 0; - else // 'auto' case + else if (strcmp(var.value, "automatic") == 0) auto_case = 1; } else - auto_case = 1; + multitap2 = 0; if (auto_case) { @@ -1211,7 +1113,7 @@ static bool read_m3u(const char *file) { char line[1024]; char name[PATH_MAX]; - FILE *f = fopen(file, "r"); + FILE *f = fopen_utf8(file, "r"); if (!f) return false; @@ -1519,6 +1421,8 @@ bool retro_load_game(const struct retro_game_info *info) set_retro_memmap(); + input_changed = 1; + return true; } @@ -1585,7 +1489,6 @@ static float GunconAdjustRatioY = 1; static void update_variables(bool in_flight) { struct retro_variable var; - int i; #ifdef GPU_PEOPS int gpu_peops_fix = 0; #endif @@ -1842,9 +1745,20 @@ static void update_variables(bool in_flight) if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "async") == 0) + { Config.AsyncCD = 1; - else + Config.CHD_Precache = 0; + } + else if (strcmp(var.value, "sync") == 0) + { + Config.AsyncCD = 0; + Config.CHD_Precache = 0; + } + else if (strcmp(var.value, "precache") == 0) + { Config.AsyncCD = 0; + Config.CHD_Precache = 1; + } } #endif @@ -2219,14 +2133,6 @@ static void update_variables(bool in_flight) unsigned i; struct retro_core_option_display option_display; char gpu_peops_option[][50] = { - "pcsx_rearmed_multitap1", - "pcsx_rearmed_multitap2", - "pcsx_rearmed_pad3type", - "pcsx_rearmed_pad4type", - "pcsx_rearmed_pad5type", - "pcsx_rearmed_pad6type", - "pcsx_rearmed_pad7type", - "pcsx_rearmed_pad8type", "pcsx_rearmed_negcon_deadzone", "pcsx_rearmed_negcon_response", "pcsx_rearmed_analog_axis_modifier", @@ -2281,12 +2187,6 @@ static void update_variables(bool in_flight) } } } - - for (i = 0; i < 8; i++) { - SysPrintf("[DEBUG] Player %d: %s\n", i + 1, get_pse_pad_label[in_type[i]]); - } - SysPrintf("Multiplayer 1: %s\n", multitap1 ? "enabled" : "disabled"); - SysPrintf("Multiplayer 2: %s\n", multitap2 ? "enabled" : "disabled"); } // Taken from beetle-psx-libretro @@ -2621,6 +2521,19 @@ static void print_internal_fps(void) void retro_run(void) { + /* update multitap when inputs have changed */ + /* this is only applied on core restart */ + if (input_changed) + { + int i; + input_changed = 0; + update_multitap(); + for (i = 0; i < 8; i++) + SysDLog("Player %d: %s\n", i + 1, get_pse_pad_label[in_type[i]]); + SysDLog("Multiplayer 1: %s\n", multitap1 ? "enabled" : "disabled"); + SysDLog("Multiplayer 2: %s\n", multitap2 ? "enabled" : "disabled"); + } + //SysReset must be run while core is running,Not in menu (Locks up Retroarch) if (rebootemu != 0) { @@ -2631,6 +2544,7 @@ void retro_run(void) // skip BIOS logos psxRegs.pc = psxRegs.GPR.n.ra; } + return; } print_internal_fps(); @@ -2659,7 +2573,7 @@ static bool try_use_bios(const char *path) long size; const char *name; - f = fopen(path, "rb"); + f = fopen_utf8(path, "rb"); if (f == NULL) return false; @@ -2767,6 +2681,7 @@ static void loadPSXBios(void) unsigned useHLE = 0; const char *bios[] = { + "PS1_ROM", "ps1_rom", "PSXONPSP660", "psxonpsp660", "SCPH101", "scph101", "SCPH5501", "scph5501", @@ -2811,11 +2726,19 @@ static void loadPSXBios(void) } } - if (useHLE || !found_bios) + if (!found_bios) { - const char *msg_str = "No PlayStation BIOS file found - add for better compatibility"; - - SysPrintf("no BIOS files found.\n"); + const char *msg_str; + if (useHLE) + { + msg_str = "BIOS set to \'hle\' in core options - real BIOS will be ignored"; + SysPrintf("Using HLE BIOS.\n"); + } + else + { + msg_str = "No PlayStation BIOS file found - add for better compatibility"; + SysPrintf("No BIOS files found.\n"); + } if (msg_interface_version >= 1) { @@ -2850,7 +2773,7 @@ void retro_init(void) msg_interface_version = 0; environ_cb(RETRO_ENVIRONMENT_GET_MESSAGE_INTERFACE_VERSION, &msg_interface_version); -#ifdef __MACH__ +#if defined(__MACH__) && !defined(TVOS) // magic sauce to make the dynarec work on iOS syscall(SYS_ptrace, 0 /*PTRACE_TRACEME*/, 0, 0, 0); #endif