diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2014-02-18 07:11:11 +0100 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2014-02-23 20:23:51 +0100 |
| commit | 706e6b7a75339cadc7b8a856a2eace68f89bb168 (patch) | |
| tree | a2333677f20154021d6a1df80c4ff5899a1ff7cb /firmware | |
| parent | 3f116769fded08d8fe4d08d4b1de4a7ba4738390 (diff) | |
| download | rockbox-706e6b7a75339cadc7b8a856a2eace68f89bb168.zip rockbox-706e6b7a75339cadc7b8a856a2eace68f89bb168.tar.gz rockbox-706e6b7a75339cadc7b8a856a2eace68f89bb168.tar.bz2 rockbox-706e6b7a75339cadc7b8a856a2eace68f89bb168.tar.xz | |
Move VOL_NAMES definition to mv.h
Fits better and including dir.h is more messy for some places.
Change-Id: I3ec30dcc1ac2734ad3844c903238b6cc2f4e134c
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/export/mv.h | 17 | ||||
| -rw-r--r-- | firmware/include/dir.h | 17 |
2 files changed, 14 insertions, 20 deletions
diff --git a/firmware/export/mv.h b/firmware/export/mv.h index b1c8a83..0d98ed1 100644 --- a/firmware/export/mv.h +++ b/firmware/export/mv.h @@ -37,18 +37,29 @@ #define IF_MD(x...) #define IF_MD_NONVOID(x...) void #define IF_MD_DRV(d) 0 -#endif +#endif /* HAVE_MULTIDRIVE */ /* Volumes mean things that have filesystems on them, like partitions */ #ifdef HAVE_MULTIVOLUME #define IF_MV(x...) x /* valist contents or empty */ #define IF_MV_NONVOID(x...) x /* valist contents or 'void' */ #define IF_MV_VOL(v) v /* volume argument or '0' */ +/* how to name volumes, first char must be outside of legal file names, + a number gets appended to enumerate, if applicable */ +#if (CONFIG_STORAGE & STORAGE_MMC) +#define VOL_NAMES "<MMC%d>" +#define VOL_ENUM_POS 4 /* position of %d, to avoid runtime calculation */ +#elif (CONFIG_STORAGE & STORAGE_SD) +#define VOL_NAMES "<microSD%d>" +#define VOL_ENUM_POS 8 /* position of %d, to avoid runtime calculation */ +#else +#define VOL_NAMES "<HD%d>" +#define VOL_ENUM_POS 3 +#endif /* CONFIG_STORAGE */ #else /* empty definitions if no multi-volume */ #define IF_MV(x...) #define IF_MV_NONVOID(x...) void #define IF_MV_VOL(v) 0 -#endif - +#endif /* HAVE_MULTIVOLUME */ #endif /* __MV_H__ */ diff --git a/firmware/include/dir.h b/firmware/include/dir.h index 3427893..6e8b705 100644 --- a/firmware/include/dir.h +++ b/firmware/include/dir.h @@ -24,23 +24,6 @@ #include "config.h" -#ifdef HAVE_MULTIVOLUME - -/* how to name volumes, first char must be outside of legal file names, - a number gets appended to enumerate, if applicable */ -#if (CONFIG_STORAGE & STORAGE_MMC) -#define VOL_NAMES "<MMC%d>" -#define VOL_ENUM_POS 4 /* position of %d, to avoid runtime calculation */ -#elif (CONFIG_STORAGE & STORAGE_SD) -#define VOL_NAMES "<microSD%d>" -#define VOL_ENUM_POS 8 /* position of %d, to avoid runtime calculation */ -#else -#define VOL_NAMES "<HD%d>" -#define VOL_ENUM_POS 3 -#endif - -#endif - #define ATTR_READ_ONLY 0x01 #define ATTR_HIDDEN 0x02 #define ATTR_SYSTEM 0x04 |