#include "revision.h"
#include <libretro.h>
+#include <compat/fopen_utf8.h>
#include "libretro_core_options.h"
#ifdef _3DS
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;
}
}
}
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)
{
char line[1024];
char name[PATH_MAX];
- FILE *f = fopen(file, "r");
+ FILE *f = fopen_utf8(file, "r");
if (!f)
return false;
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
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",
long size;
const char *name;
- f = fopen(path, "rb");
+ f = fopen_utf8(path, "rb");
if (f == NULL)
return false;
unsigned useHLE = 0;
const char *bios[] = {
+ "PS1_ROM", "ps1_rom",
"PSXONPSP660", "psxonpsp660",
"SCPH101", "scph101",
"SCPH5501", "scph5501",
}
}
- 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)
{
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