diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/mv.h | 4 | ||||
-rw-r--r-- | firmware/export/pathfuncs.h | 6 | ||||
-rw-r--r-- | firmware/export/rbpaths.h | 3 |
3 files changed, 0 insertions, 13 deletions
diff --git a/firmware/export/mv.h b/firmware/export/mv.h index 5aa0ff8b4d..ec7b2efdbd 100644 --- a/firmware/export/mv.h +++ b/firmware/export/mv.h | |||
@@ -84,10 +84,6 @@ | |||
84 | #define VOL_MAX_LEN (1 + VOL_DEC_MAX_LEN + 2 + 1) | 84 | #define VOL_MAX_LEN (1 + VOL_DEC_MAX_LEN + 2 + 1) |
85 | #define VOL_NUM_MAX 100 | 85 | #define VOL_NUM_MAX 100 |
86 | 86 | ||
87 | #ifndef ROOT_VOLUME | ||
88 | #define ROOT_VOLUME INT_MAX | ||
89 | #endif | ||
90 | |||
91 | #else /* empty definitions if no multi-volume */ | 87 | #else /* empty definitions if no multi-volume */ |
92 | #define IF_MV(x...) | 88 | #define IF_MV(x...) |
93 | #define IF_MV_NONVOID(x...) void | 89 | #define IF_MV_NONVOID(x...) void |
diff --git a/firmware/export/pathfuncs.h b/firmware/export/pathfuncs.h index 8858d85d24..92539c54c1 100644 --- a/firmware/export/pathfuncs.h +++ b/firmware/export/pathfuncs.h | |||
@@ -30,15 +30,10 @@ | |||
30 | /* useful char constants that could be reconfigured if desired */ | 30 | /* useful char constants that could be reconfigured if desired */ |
31 | #define PATH_SEPCH '/' | 31 | #define PATH_SEPCH '/' |
32 | #define PATH_SEPSTR "/" | 32 | #define PATH_SEPSTR "/" |
33 | #define PATH_ROOTCHR '/' | ||
34 | #define PATH_ROOTSTR "/" | 33 | #define PATH_ROOTSTR "/" |
35 | #define PATH_BADSEPCH '\\' | 34 | #define PATH_BADSEPCH '\\' |
36 | #define PATH_DRVSEPCH ':' | 35 | #define PATH_DRVSEPCH ':' |
37 | 36 | ||
38 | #ifndef ROOT_VOLUME | ||
39 | #define ROOT_VOLUME INT_MAX | ||
40 | #endif | ||
41 | |||
42 | /* a nicer way to check for "." and ".." than two strcmp() calls */ | 37 | /* a nicer way to check for "." and ".." than two strcmp() calls */ |
43 | static inline bool is_dotdir_name(const char *name) | 38 | static inline bool is_dotdir_name(const char *name) |
44 | { | 39 | { |
@@ -80,7 +75,6 @@ static inline bool name_is_dot_dot(const char *name) | |||
80 | #ifdef HAVE_MULTIVOLUME | 75 | #ifdef HAVE_MULTIVOLUME |
81 | int path_strip_volume(const char *name, const char **nameptr, bool greedy); | 76 | int path_strip_volume(const char *name, const char **nameptr, bool greedy); |
82 | int get_volume_name(int volume, char *name); | 77 | int get_volume_name(int volume, char *name); |
83 | int make_volume_root(int volume, char *dst); | ||
84 | #endif | 78 | #endif |
85 | 79 | ||
86 | int path_strip_drive(const char *name, const char **nameptr, bool greedy); | 80 | 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 458a070f92..de591f0ec1 100644 --- a/firmware/export/rbpaths.h +++ b/firmware/export/rbpaths.h | |||
@@ -64,9 +64,6 @@ | |||
64 | #define PLUGIN_DIR ROCKBOX_DIR "/rocks" | 64 | #define PLUGIN_DIR ROCKBOX_DIR "/rocks" |
65 | #define CODECS_DIR ROCKBOX_DIR "/codecs" | 65 | #define CODECS_DIR ROCKBOX_DIR "/codecs" |
66 | 66 | ||
67 | #define RB_ROOT_VOL_HIDDEN(v) (IF_MV_VOL(v) == 0) | ||
68 | #define RB_ROOT_CONTENTS_DIR "/" IF_MV("<0>") | ||
69 | |||
70 | #else /* APPLICATION */ | 67 | #else /* APPLICATION */ |
71 | 68 | ||
72 | #define HOME_DIR "<HOME>" /* replaced at runtime */ | 69 | #define HOME_DIR "<HOME>" /* replaced at runtime */ |