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, 9 insertions, 4 deletions

diff --git a/firmware/export/ramdisk.h b/firmware/export/ramdisk.h
index a0c011fadd..79551ca287 100644
--- a/firmware/export/ramdisk.h
+++ b/firmware/export/ramdisk.h
@@ -23,7 +23,7 @@
 #define __RAMDISK_H__
 
 #include <stdbool.h>
-#include "mv.h" /* for HAVE_MULTIVOLUME or not */
+#include "mv.h" /* for HAVE_MULTIDRIVE or not */
 
 struct storage_info;
 
@@ -34,15 +34,20 @@ bool ramdisk_disk_is_active(void);
 int ramdisk_soft_reset(void);
 int ramdisk_init(void);
 void ramdisk_close(void);
-int ramdisk_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf);
-int ramdisk_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const void* buf);
+int ramdisk_read_sectors(IF_MD2(int drive,) unsigned long start, int count, void* buf);
+int ramdisk_write_sectors(IF_MD2(int drive,) unsigned long start, int count, const void* buf);
 void ramdisk_spin(void);
 void ramdisk_sleepnow(void);
+int ramdisk_spinup_time(void);
 
 #ifdef STORAGE_GET_INFO
-void ramdisk_get_info(IF_MV2(int drive,) struct storage_info *info);
+void ramdisk_get_info(IF_MD2(int drive,) struct storage_info *info);
 #endif
 
 long ramdisk_last_disk_activity(void);
 
+#ifdef CONFIG_STORAGE_MULTI
+int ramdisk_num_drives(int first_drive);
+#endif
+
 #endif