X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro.c;h=395bc13e7236d5a7d3d85457bd5b79b359d12322;hb=226a5691296bfb4f22d916348821b0eed6399a89;hp=e18b190c47a021a7ddb73f40357af702902fb1b2;hpb=96b0d7854b486457c3af6180ebf5560c94df9158;p=pcsx_rearmed.git diff --git a/frontend/libretro.c b/frontend/libretro.c index e18b190c..395bc13e 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -41,6 +41,10 @@ #include #include "libretro_core_options.h" +#ifdef USE_LIBRETRO_VFS +#include +#endif + #ifdef _3DS #include "3ds/3ds_utils.h" #endif @@ -555,6 +559,10 @@ static const struct retro_controller_info ports[9] = /* libretro */ void retro_set_environment(retro_environment_t cb) { +#ifdef USE_LIBRETRO_VFS + struct retro_vfs_interface_info vfs_iface_info; +#endif + environ_cb = cb; if (cb(RETRO_ENVIRONMENT_GET_LOG_INTERFACE, &logging)) @@ -562,6 +570,13 @@ void retro_set_environment(retro_environment_t cb) environ_cb(RETRO_ENVIRONMENT_SET_CONTROLLER_INFO, (void*)ports); libretro_set_core_options(environ_cb); + +#ifdef USE_LIBRETRO_VFS + vfs_iface_info.required_interface_version = 1; + vfs_iface_info.iface = NULL; + if (environ_cb(RETRO_ENVIRONMENT_GET_VFS_INTERFACE, &vfs_iface_info)) + filestream_vfs_init(&vfs_iface_info); +#endif } void retro_set_video_refresh(retro_video_refresh_t cb) { video_cb = cb; } @@ -577,53 +592,37 @@ unsigned retro_api_version(void) static void update_multitap(void) { - struct retro_variable var; - int auto_case, port; + struct retro_variable var = {}; var.value = NULL; - var.key = "pcsx_rearmed_multitap1"; - auto_case = 0; + var.key = "pcsx_rearmed_multitap"; if (environ_cb && (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)) { - if (strcmp(var.value, "enabled") == 0) + if (strcmp(var.value, "port 1 only") == 0) + { multitap1 = 1; - else if (strcmp(var.value, "disabled") == 0) + multitap2 = 0; + } + else if (strcmp(var.value, "port 2 only") == 0) + { multitap1 = 0; - else // 'auto' case - auto_case = 1; - } - else - auto_case = 1; - - if (auto_case) - { - // If a gamepad is plugged after port 2, we need a first multitap. - multitap1 = 0; - for (port = 2; port < PORTS_NUMBER; port++) - multitap1 |= in_type[port] != PSE_PAD_TYPE_NONE; - } - - var.value = NULL; - var.key = "pcsx_rearmed_multitap2"; - auto_case = 0; - if (environ_cb && (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)) - { - if (strcmp(var.value, "enabled") == 0) multitap2 = 1; - else if (strcmp(var.value, "disabled") == 0) + } + else if (strcmp(var.value, "both") == 0) + { + multitap1 = 1; + multitap2 = 1; + } + else + { + multitap1 = 0; multitap2 = 0; - else // 'auto' case - auto_case = 1; + } } else - auto_case = 1; - - if (auto_case) { - // If a gamepad is plugged after port 4, we need a second multitap. + multitap1 = 0; multitap2 = 0; - for (port = 4; port < PORTS_NUMBER; port++) - multitap2 |= in_type[port] != PSE_PAD_TYPE_NONE; } } @@ -660,6 +659,7 @@ void retro_set_controller_port_device(unsigned port, unsigned device) } SysPrintf("port: %u device: %s\n", port + 1, get_pse_pad_label[in_type[port]]); + input_changed = 1; } void retro_get_system_info(struct retro_system_info *info) @@ -1112,11 +1112,11 @@ static bool read_m3u(const char *file) { char line[1024]; char name[PATH_MAX]; - FILE *f = fopen(file, "r"); - if (!f) + FILE *fp = fopen(file, "r"); + if (!fp) return false; - while (fgets(line, sizeof(line), f) && disk_count < sizeof(disks) / sizeof(disks[0])) + while (fgets(fp, line, sizeof(line)) && disk_count < sizeof(disks) / sizeof(disks[0])) { if (line[0] == '#') continue; @@ -1142,7 +1142,7 @@ static bool read_m3u(const char *file) } } - fclose(f); + fclose(fp); return (disk_count != 0); } @@ -1744,9 +1744,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 @@ -2121,8 +2132,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_negcon_deadzone", "pcsx_rearmed_negcon_response", "pcsx_rearmed_analog_axis_modifier", @@ -2559,17 +2568,15 @@ void retro_run(void) static bool try_use_bios(const char *path) { - FILE *f; long size; const char *name; - - f = fopen(path, "rb"); - if (f == NULL) + FILE *fp = fopen(path, "rb"); + if (fp == NULL) return false; - fseek(f, 0, SEEK_END); - size = ftell(f); - fclose(f); + fseek(fp, 0, SEEK_END); + size = ftell(fp); + fclose(fp); if (size != 512 * 1024) return false; @@ -2671,6 +2678,7 @@ static void loadPSXBios(void) unsigned useHLE = 0; const char *bios[] = { + "PS1_ROM", "ps1_rom", "PSXONPSP660", "psxonpsp660", "SCPH101", "scph101", "SCPH5501", "scph5501", @@ -2715,11 +2723,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) { @@ -2754,7 +2770,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