3 files changed, 13 insertions, 0 deletions

diff --git a/firmware/export/mv.h b/firmware/export/mv.h
index 3657ef6c98..08daf50b34 100644
--- a/firmware/export/mv.h
+++ b/firmware/export/mv.h
@@ -87,6 +87,10 @@
 #define VOL_MAX_LEN      (1 + VOL_DEC_MAX_LEN + 2 + 1)
 #define VOL_NUM_MAX      100
 
+#ifndef ROOT_VOLUME
+#define ROOT_VOLUME      INT_MAX
+#endif
+
 #else /* empty definitions if no multi-volume */
 #define IF_MV(x...)
 #define IF_MV_NONVOID(x...) void
diff --git a/firmware/export/pathfuncs.h b/firmware/export/pathfuncs.h
index 350dd4e548..385d534714 100644
--- a/firmware/export/pathfuncs.h
+++ b/firmware/export/pathfuncs.h
@@ -30,10 +30,15 @@
 /* useful char constants that could be reconfigured if desired */
 #define PATH_SEPCH    '/'
 #define PATH_SEPSTR   "/"
+#define PATH_ROOTCHR  '/'
 #define PATH_ROOTSTR  "/"
 #define PATH_BADSEPCH '\\'
 #define PATH_DRVSEPCH ':'
 
+#ifndef ROOT_VOLUME
+#define ROOT_VOLUME   INT_MAX
+#endif
+
 /* a nicer way to check for "." and ".." than two strcmp() calls */
 static inline bool is_dotdir_name(const char *name)
 {
@@ -75,6 +80,7 @@ static inline bool name_is_dot_dot(const char *name)
 #ifdef HAVE_MULTIVOLUME
 int path_strip_volume(const char *name, const char **nameptr, bool greedy);
 int get_volume_name(int volume, char *name);
+int make_volume_root(int volume, char *dst);
 #endif
 
 int path_strip_drive(const char *name, const char **nameptr, bool greedy);
diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h
index a3042d80bc..9dd0a24c6f 100644
--- a/firmware/export/rbpaths.h
+++ b/firmware/export/rbpaths.h
@@ -52,6 +52,9 @@
 #define PLUGIN_DIR          ROCKBOX_DIR "/rocks"
 #define CODECS_DIR          ROCKBOX_DIR "/codecs"
 
+#define RB_ROOT_VOL_HIDDEN(v)   (IF_MV_VOL(v) == 0)
+#define RB_ROOT_CONTENTS_DIR    "/" IF_MV("<0>")
+
 #else /* APPLICATION */
 
 #define HOME_DIR "<HOME>" /* replaced at runtime */