mailer | 1 Nov 18:06 2008

gevaerts: r18963 - trunk/firmware/export

Date: 2008-11-01 18:06:04 +0100 (Sat, 01 Nov 2008)
New Revision: 18963

Log Message:
Add more simulator stubs. This should get rid of the last reds

Modified:
   trunk/firmware/export/storage.h

Modified: trunk/firmware/export/storage.h
===================================================================
--- trunk/firmware/export/storage.h	2008-11-01 16:49:38 UTC (rev 18962)
+++ trunk/firmware/export/storage.h	2008-11-01 17:06:04 UTC (rev 18963)
 <at>  <at>  -50,6 +50,7  <at>  <at> 

 void storage_spindown(int seconds);

+#ifndef SIMULATOR
 static inline void storage_enable(bool on)
 {
 #if (CONFIG_STORAGE & STORAGE_ATA)
 <at>  <at>  -102,7 +103,6  <at>  <at> 
 }
 static inline int storage_init(void)
 {
-#ifndef SIMULATOR
 #if (CONFIG_STORAGE & STORAGE_ATA)
     return ata_init();
 #elif (CONFIG_STORAGE & STORAGE_SD)
 <at>  <at>  -114,9 +114,6  <at>  <at> 
 #else
     #error No storage driver!
 #endif
-#else
-    return 0;
-#endif
 }
 static inline void storage_close(void)
 {
 <at>  <at>  -174,7 +171,7  <at>  <at> 
     #error No storage driver!
 #endif
 }
-#endif
+#endif /*LED*/

 static inline long storage_last_disk_activity(void)
 {
 <at>  <at>  -245,5 +242,92  <at>  <at> 
     #error No storage driver!
 #endif
 }
+#endif /* HOTSWAP */
+#else /* SIMULATOR */
+static inline void storage_enable(bool on)
+{
+    (void)on;
+}
+static inline void storage_sleep(void)
+{
+}
+static inline void storage_sleepnow(void)
+{
+}
+static inline bool storage_disk_is_active(void)
+{
+    return 0;
+}
+static inline int storage_hard_reset(void)
+{
+    return 0;
+}
+static inline int storage_soft_reset(void)
+{
+    return 0;
+}
+static inline int storage_init(void)
+{
+    return 0;
+}
+static inline void storage_close(void)
+{
+}
+static inline int storage_read_sectors(IF_MV2(int drive,) unsigned long start, int count, void* buf)
+{
+    IF_MV((void)drive;)
+    (void)start;
+    (void)count;
+    (void)buf;
+    return 0;
+}
+static inline int storage_write_sectors(IF_MV2(int drive,) unsigned long start, int count, const
void* buf)
+{
+    IF_MV((void)drive;)
+    (void)start;
+    (void)count;
+    (void)buf;
+    return 0;
+}
+static inline void storage_spin(void)
+{
+}
+
+#if (CONFIG_LED == LED_REAL)
+static inline void storage_set_led_enabled(bool enabled)
+{
+    (void)enabled;
+}
+#endif /*LED*/
+
+static inline long storage_last_disk_activity(void)
+{
+    return 0;
+}
+
+static inline int storage_spinup_time(void)
+{
+    return 0;
+}
+
+static inline void storage_get_info(IF_MV2(int drive,) struct storage_info *info)
+{
+    IF_MV((void)drive;)
+    (void)info;
+}
+
+#ifdef HAVE_HOTSWAP
+static inline bool storage_removable(IF_MV_NONVOID(int drive))
+{
+    IF_MV((void)drive;)
+    return 0;
+}
+
+static inline bool storage_present(IF_MV_NONVOID(int drive))
+{
+    IF_MV((void)drive;)
+    return 0;
+}
+#endif /* HOTSWAP */
+#endif /* SIMULATOR */
 #endif
-#endif

_______________________________________________
rockbox-cvs mailing list
rockbox-cvs <at> cool.haxx.se
http://cool.haxx.se/cgi-bin/mailman/listinfo/rockbox-cvs


Gmane