Commit FS#9545, storage cleanup and multi-driver support

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21933 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 15 insertions, 3 deletions

diff --git a/firmware/export/mv.h b/firmware/export/mv.h
index fda650c7e9..b1d16a7267 100644
--- a/firmware/export/mv.h
+++ b/firmware/export/mv.h
@@ -26,16 +26,28 @@
 
 /* FixMe: These macros are a bit nasty and perhaps misplaced here.
    We'll get rid of them once decided on how to proceed with multivolume. */
+
+/* Drives are things like a disk, a card, a flash chip. They can have volumes on them */
+#ifdef HAVE_MULTIDRIVE
+#define IF_MD(x) x /* optional drive parameter */
+#define IF_MD2(x,y) x,y /* same, for a list of arguments */
+#define IF_MD_NONVOID(x) x /* for prototype with sole volume parameter */
+#else /* empty definitions if no multi-drive */
+#define IF_MD(x)
+#define IF_MD2(x,y)
+#define IF_MD_NONVOID(x) void
+#endif
+
+/* Volumes mean things that have filesystems on them, like partitions */
 #ifdef HAVE_MULTIVOLUME
-#define IF_MV(x) x /* optional volume/drive parameter */
+#define IF_MV(x) x /* optional volume parameter */
 #define IF_MV2(x,y) x,y /* same, for a list of arguments */
 #define IF_MV_NONVOID(x) x /* for prototype with sole volume parameter */
-#define NUM_VOLUMES 2
 #else /* empty definitions if no multi-volume */
 #define IF_MV(x)
 #define IF_MV2(x,y)
 #define IF_MV_NONVOID(x) void
-#define NUM_VOLUMES 1
 #endif
 
+
 #endif