X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=frontend%2Flibretro.c;h=62acf4250a8b0cb97f9d8b217cd7b0fdc85938a0;hb=f770faad8e05014d16e9c1f3c46bfd76274695c6;hp=07601cbe38372aceb8a3f0a8d081f51c2a5f981b;hpb=89b1d73d6009cbd561f00f452fc055fcb0e62c33;p=pcsx_rearmed.git diff --git a/frontend/libretro.c b/frontend/libretro.c index 07601cbe..62acf425 100644 --- a/frontend/libretro.c +++ b/frontend/libretro.c @@ -39,9 +39,12 @@ #include "revision.h" #include -#include #include "libretro_core_options.h" +#ifdef USE_LIBRETRO_VFS +#include +#endif + #ifdef _3DS #include "3ds/3ds_utils.h" #endif @@ -118,7 +121,6 @@ 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 @@ -556,6 +558,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)) @@ -563,6 +569,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; } @@ -578,37 +591,24 @@ unsigned retro_api_version(void) static void update_multitap(void) { - struct retro_variable var = {}; + struct retro_variable var = { 0 }; + + multitap1 = 0; + multitap2 = 0; var.value = NULL; var.key = "pcsx_rearmed_multitap"; if (environ_cb && (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)) { - if (strcmp(var.value, "port 1 only") == 0) - { + if (strcmp(var.value, "port 1") == 0) multitap1 = 1; - multitap2 = 0; - } - else if (strcmp(var.value, "port 2 only") == 0) - { - multitap1 = 0; + else if (strcmp(var.value, "port 2") == 0) multitap2 = 1; - } - else if (strcmp(var.value, "both") == 0) + else if (strcmp(var.value, "ports 1 and 2") == 0) { multitap1 = 1; multitap2 = 1; } - else - { - multitap1 = 0; - multitap2 = 0; - } - } - else - { - multitap1 = 0; - multitap2 = 0; } } @@ -645,7 +645,6 @@ 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) @@ -655,7 +654,7 @@ void retro_get_system_info(struct retro_system_info *info) #endif memset(info, 0, sizeof(*info)); info->library_name = "PCSX-ReARMed"; - info->library_version = "r22" GIT_VERSION; + info->library_version = "r23l" GIT_VERSION; info->valid_extensions = "bin|cue|img|mdf|pbp|toc|cbn|m3u|chd"; info->need_fullpath = true; } @@ -1098,11 +1097,11 @@ static bool read_m3u(const char *file) { char line[1024]; char name[PATH_MAX]; - FILE *f = fopen_utf8(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(line, sizeof(line), fp) && disk_count < sizeof(disks) / sizeof(disks[0])) { if (line[0] == '#') continue; @@ -1128,7 +1127,7 @@ static bool read_m3u(const char *file) } } - fclose(f); + fclose(fp); return (disk_count != 0); } @@ -1338,14 +1337,12 @@ bool retro_load_game(const struct retro_game_info *info) for (i = 0; i < sizeof(disks) / sizeof(disks[0]) && i < cdrIsoMultidiskCount; i++) { - char disk_name[PATH_MAX]; - char disk_label[PATH_MAX]; - disk_name[0] = '\0'; - disk_label[0] = '\0'; + char disk_name[PATH_MAX - 16] = { 0 }; + char disk_label[PATH_MAX] = { 0 }; disks[i].fname = strdup(info->path); - get_disk_label(disk_name, info->path, PATH_MAX); + get_disk_label(disk_name, info->path, sizeof(disk_name)); snprintf(disk_label, sizeof(disk_label), "%s #%u", disk_name, (unsigned)i + 1); disks[i].flabel = strdup(disk_label); @@ -1386,6 +1383,10 @@ bool retro_load_game(const struct retro_game_info *info) } } + /* set ports to use "standard controller" initially */ + for (i = 0; i < 8; ++i) + in_type[i] = PSE_PAD_TYPE_STANDARD; + plugin_call_rearmed_cbs(); /* dfinput_activate(); */ @@ -1406,8 +1407,6 @@ bool retro_load_game(const struct retro_game_info *info) set_retro_memmap(); - input_changed = 1; - return true; } @@ -1496,9 +1495,6 @@ static void update_variables(bool in_flight) Config.PsxType = 1; } - /*for (i = 0; i < PORTS_NUMBER; i++) - update_controller_port_variable(i);*/ - update_multitap(); var.value = NULL; @@ -1632,11 +1628,13 @@ static void update_variables(bool in_flight) display_internal_fps = true; } -#if defined(LIGHTREC) || defined(NEW_DYNAREC) +#ifndef DRC_DISABLE var.value = NULL; var.key = "pcsx_rearmed_drc"; - if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + if (!environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var)) + var.value = "enabled"; + { R3000Acpu *prev_cpu = psxCpu; #if defined(LIGHTREC) @@ -1663,7 +1661,8 @@ static void update_variables(bool in_flight) psxCpu->Reset(); // not really a reset.. } } -#endif /* LIGHTREC || NEW_DYNAREC */ +#endif /* !DRC_DISABLE */ + psxCpu->ApplyConfig(); var.value = NULL; var.key = "pcsx_rearmed_spu_reverb"; @@ -1701,16 +1700,16 @@ static void update_variables(bool in_flight) else if (strcmp(var.value, "enabled") == 0) Config.RCntFix = 1; } - + var.value = NULL; - var.key = "pcsx_rearmed_idiablofix"; + var.key = "pcsx_rearmed_icache_emulation"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) { if (strcmp(var.value, "disabled") == 0) - spu_config.idiablofix = 0; + Config.icache_emulation = 0; else if (strcmp(var.value, "enabled") == 0) - spu_config.idiablofix = 1; + Config.icache_emulation = 1; } var.value = NULL; @@ -2054,7 +2053,7 @@ static void update_variables(bool in_flight) GunconAdjustRatioY = atof(var.value); } -#ifdef NEW_DYNAREC +#if !defined(DRC_DISABLE) && !defined(LIGHTREC) var.value = NULL; var.key = "pcsx_rearmed_nosmccheck"; if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) @@ -2093,7 +2092,27 @@ static void update_variables(bool in_flight) int psxclock = atoi(var.value); cycle_multiplier = 10000 / psxclock; } -#endif /* NEW_DYNAREC */ + + var.value = NULL; + var.key = "pcsx_rearmed_nocompathacks"; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "enabled") == 0) + new_dynarec_hacks |= NDHACK_NO_COMPAT_HACKS; + else + new_dynarec_hacks &= ~NDHACK_NO_COMPAT_HACKS; + } +#endif /* !DRC_DISABLE && !LIGHTREC */ + + var.value = NULL; + var.key = "pcsx_rearmed_nostalls"; + if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) + { + if (strcmp(var.value, "enabled") == 0) + Config.DisableStalls = 1; + else + Config.DisableStalls = 0; + } var.value = NULL; var.key = "pcsx_rearmed_input_sensitivity"; @@ -2506,19 +2525,6 @@ 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) { @@ -2554,17 +2560,15 @@ void retro_run(void) static bool try_use_bios(const char *path) { - FILE *f; long size; const char *name; - - f = fopen_utf8(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; @@ -2666,7 +2670,6 @@ static void loadPSXBios(void) unsigned useHLE = 0; const char *bios[] = { - "PS1_ROM", "ps1_rom", "PSXONPSP660", "psxonpsp660", "SCPH101", "scph101", "SCPH5501", "scph5501", @@ -2791,7 +2794,8 @@ void retro_init(void) #ifdef _3DS vout_buf = linearMemAlign(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2, 0x80); #elif defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 200112L) && !defined(VITA) && !defined(__SWITCH__) - posix_memalign(&vout_buf, 16, VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2); + if (posix_memalign(&vout_buf, 16, VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2) != 0) + vout_buf = (void *) 0; #else vout_buf = malloc(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2); #endif