summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2020-08-09 16:15:38 -0400
committerSolomon Peachy <pizza@shaftnet.org>2020-08-09 17:00:27 -0400
commit491b69666960356d965e6d5dbcba89faba0f9080 (patch)
treec2a51d2a814d674771b789c791329769af29f61a
parent92d66f761f030bd6ec022e2f969d044e3bfd8c00 (diff)
downloadrockbox-491b69666960356d965e6d5dbcba89faba0f9080.tar.gz
rockbox-491b69666960356d965e6d5dbcba89faba0f9080.zip
Fix HOME_DIR path for Rocker, X3ii, and X20
Prevented plugins from accessing their config files properly Change-Id: Ic3b115aaa9168fa30b98607aeacb1a12b5498a5f
-rw-r--r--firmware/export/rbpaths.h4
-rw-r--r--firmware/target/hosted/filesystem-app.c2
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 @@
51#elif defined(DX50) || defined(DX90) 51#elif defined(DX50) || defined(DX90)
52/* Where to put save files like recordings, playlists, screen dumps ...*/ 52/* Where to put save files like recordings, playlists, screen dumps ...*/
53#define HOME_DIR "/mnt/sdcard" 53#define HOME_DIR "/mnt/sdcard"
54#elif defined(AGPTEK_ROCKER) || defined(XDUOO_X3II) || defined(XDUOO_X20)
55#define HOME_DIR "/mnt/sd_0"
54#else 56#else
55#define HOME_DIR "/" 57#define HOME_DIR "/"
56#endif 58#endif
@@ -88,7 +90,7 @@
88#define VIEWERS_DIR PLUGIN_DIR "/viewers" 90#define VIEWERS_DIR PLUGIN_DIR "/viewers"
89 91
90#if defined(APPLICATION) && !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \ 92#if defined(APPLICATION) && !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \
91 defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX)) 93 defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(AGPTEK_ROCKER) || defined(XDUOO_X3II) || defined(XDUOO_X20))
92#define PLUGIN_DATA_DIR ROCKBOX_DIR "/rocks.data" 94#define PLUGIN_DATA_DIR ROCKBOX_DIR "/rocks.data"
93#define PLUGIN_GAMES_DATA_DIR PLUGIN_DATA_DIR 95#define PLUGIN_GAMES_DATA_DIR PLUGIN_DATA_DIR
94#define PLUGIN_APPS_DATA_DIR PLUGIN_DATA_DIR 96#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 @@
37#include "logf.h" 37#include "logf.h"
38 38
39#if (defined(AGPTEK_ROCKER) || defined(XDUOO_X3II) || defined(XDUOO_X20)) && !(defined(BOOTLOADER) || defined(CHECKWPS) || defined(SIMULATOR)) 39#if (defined(AGPTEK_ROCKER) || defined(XDUOO_X3II) || defined(XDUOO_X20)) && !(defined(BOOTLOADER) || defined(CHECKWPS) || defined(SIMULATOR))
40#define PIVOT_ROOT "/mnt/sd_0" 40#define PIVOT_ROOT HOME_DIR
41#endif 41#endif
42 42
43#if (CONFIG_PLATFORM & PLATFORM_ANDROID) 43#if (CONFIG_PLATFORM & PLATFORM_ANDROID)