#include "revision.h"
#include <libretro.h>
+#include <compat/fopen_utf8.h>
#include "libretro_core_options.h"
#ifdef _3DS
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
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;
- 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;
set_retro_memmap();
+ input_changed = 1;
+
return true;
}
static void update_variables(bool in_flight)
{
struct retro_variable var;
- int i;
#ifdef GPU_PEOPS
int gpu_peops_fix = 0;
#endif
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_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",
}
}
}
-
- 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
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)
{
// skip BIOS logos
psxRegs.pc = psxRegs.GPR.n.ra;
}
+ return;
}
print_internal_fps();
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
notaz.gp2x.de / pcsx_rearmed.git / blobdiff