From 491b69666960356d965e6d5dbcba89faba0f9080 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sun, 9 Aug 2020 16:15:38 -0400 Subject: Fix HOME_DIR path for Rocker, X3ii, and X20 Prevented plugins from accessing their config files properly Change-Id: Ic3b115aaa9168fa30b98607aeacb1a12b5498a5f --- firmware/export/rbpaths.h | 4 +++- firmware/target/hosted/filesystem-app.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h index b95f1614eb..de591f0ec1 100644 --- a/firmware/export/rbpaths.h +++ b/firmware/export/rbpaths.h @@ -51,6 +51,8 @@ #elif defined(DX50) || defined(DX90) /* Where to put save files like recordings, playlists, screen dumps ...*/ #define HOME_DIR "/mnt/sdcard" +#elif defined(AGPTEK_ROCKER) || defined(XDUOO_X3II) || defined(XDUOO_X20) +#define HOME_DIR "/mnt/sd_0" #else #define HOME_DIR "/" #endif @@ -88,7 +90,7 @@ #define VIEWERS_DIR PLUGIN_DIR "/viewers" #if defined(APPLICATION) && !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ - defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX)) + defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(AGPTEK_ROCKER) || defined(XDUOO_X3II) || defined(XDUOO_X20)) #define PLUGIN_DATA_DIR ROCKBOX_DIR "/rocks.data" #define PLUGIN_GAMES_DATA_DIR PLUGIN_DATA_DIR #define PLUGIN_APPS_DATA_DIR PLUGIN_DATA_DIR diff --git a/firmware/target/hosted/filesystem-app.c b/firmware/target/hosted/filesystem-app.c index e54f0b91f7..3cb0dd3653 100644 --- a/firmware/target/hosted/filesystem-app.c +++ b/firmware/target/hosted/filesystem-app.c @@ -37,7 +37,7 @@ #include "logf.h" #if (defined(AGPTEK_ROCKER) || defined(XDUOO_X3II) || defined(XDUOO_X20)) && !(defined(BOOTLOADER) || defined(CHECKWPS) || defined(SIMULATOR)) -#define PIVOT_ROOT "/mnt/sd_0" +#define PIVOT_ROOT HOME_DIR #endif #if (CONFIG_PLATFORM & PLATFORM_ANDROID) -- cgit v1.2.3