From 7c4efa21c407aa7bfbab39e2e5ac76fe740dae06 Mon Sep 17 00:00:00 2001
From: Francisco Javier Trujillo Mata <fran.t.es@sync.money>
Date: Sat, 13 Feb 2021 21:00:47 +0100
Subject: [PATCH 1/2] Fix double slash in PS2
---
frontend/drivers/platform_ps2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/frontend/drivers/platform_ps2.c b/frontend/drivers/platform_ps2.c
index 3dcd07f32b..4d753be8c8 100644
--- a/frontend/drivers/platform_ps2.c
+++ b/frontend/drivers/platform_ps2.c
@@ -44,7 +44,7 @@ static void create_path_names(void)
{
char user_path[FILENAME_MAX];
- sprintf(user_path, "%s/retroarch", cwd);
+ sprintf(user_path, "%sretroarch", cwd);
fill_pathname_basedir(g_defaults.dirs[DEFAULT_DIR_PORT], cwd, sizeof(g_defaults.dirs[DEFAULT_DIR_PORT]));
/* Content in the same folder */
From c195fe696c5036d193fa1a8e0cbdbacb966c630c Mon Sep 17 00:00:00 2001
From: Francisco Javier Trujillo Mata <fran.t.es@sync.money>
Date: Sat, 13 Feb 2021 21:10:51 +0100
Subject: [PATCH 2/2] Remove not used bootDeviceID
---
frontend/drivers/platform_ps2.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/frontend/drivers/platform_ps2.c b/frontend/drivers/platform_ps2.c
index 4d753be8c8..3d466bed7b 100644
--- a/frontend/drivers/platform_ps2.c
+++ b/frontend/drivers/platform_ps2.c
@@ -37,7 +37,6 @@
static enum frontend_fork ps2_fork_mode = FRONTEND_FORK_NONE;
-static int bootDeviceID;
static char cwd[FILENAME_MAX];
static void create_path_names(void)
@@ -210,11 +209,9 @@ static void frontend_ps2_init(void *data)
#endif
#if defined(BUILD_FOR_PCSX2)
- bootDeviceID = BOOT_DEVICE_MC0;
- strlcpy(cwd, rootDevicePath(bootDeviceID), sizeof(cwd));
+ strlcpy(cwd, rootDevicePath(BOOT_DEVICE_MC0), sizeof(cwd));
#else
getcwd(cwd, sizeof(cwd));
- bootDeviceID = getBootDeviceID(cwd);
#if !defined(IS_SALAMANDER) && !defined(DEBUG)
// If it is not salamander we need to go one level up for set the CWD.
path_parent_dir(cwd);