notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #572 from gameblabla/cd_volume_fix_lib
[pcsx_rearmed.git]
/
frontend
/
libretro.c
diff --git
a/frontend/libretro.c
b/frontend/libretro.c
index
59e986e
..
6fee42a
100644
(file)
--- a/
frontend/libretro.c
+++ b/
frontend/libretro.c
@@
-1337,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++)
{
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);
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);
snprintf(disk_label, sizeof(disk_label), "%s #%u", disk_name, (unsigned)i + 1);
disks[i].flabel = strdup(disk_label);
@@
-1701,17
+1699,19
@@
static void update_variables(bool in_flight)
else if (strcmp(var.value, "enabled") == 0)
Config.RCntFix = 1;
}
else if (strcmp(var.value, "enabled") == 0)
Config.RCntFix = 1;
}
-
+
+#ifdef ICACHE_EMULATION
var.value = NULL;
var.value = NULL;
- var.key = "pcsx_rearmed_i
diablofix
";
+ var.key = "pcsx_rearmed_i
cache_emulation
";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
if (strcmp(var.value, "disabled") == 0)
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)
else if (strcmp(var.value, "enabled") == 0)
-
spu_config.idiablofix
= 1;
+
Config.icache_emulation
= 1;
}
}
+#endif
var.value = NULL;
var.key = "pcsx_rearmed_inuyasha_fix";
var.value = NULL;
var.key = "pcsx_rearmed_inuyasha_fix";
@@
-2651,7
+2651,6
@@
static void loadPSXBios(void)
unsigned useHLE = 0;
const char *bios[] = {
unsigned useHLE = 0;
const char *bios[] = {
- "PS1_ROM", "ps1_rom",
"PSXONPSP660", "psxonpsp660",
"SCPH101", "scph101",
"SCPH5501", "scph5501",
"PSXONPSP660", "psxonpsp660",
"SCPH101", "scph101",
"SCPH5501", "scph5501",
@@
-2776,7
+2775,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__)
#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
#else
vout_buf = malloc(VOUT_MAX_WIDTH * VOUT_MAX_HEIGHT * 2);
#endif