Storage API : remove undeeded target-specific functions

storage_sleep, storage_spin, storage_spindown are only defined if #defiend (HAVE_DISK_STORAGE), not for MMC/ATA/SD
remove already unneeded nand_disk_is_active, nand_soft_reset

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

7 files changed, 20 insertions, 2 deletions

diff --git a/apps/plugin.c b/apps/plugin.c
index 84200bbf05..4b7eb28b3d 100644
--- a/apps/plugin.c
+++ b/apps/plugin.c
@@ -284,9 +284,11 @@ static const struct plugin_api rockbox_api = {
     fdprintf,
     read_line,
     settings_parseline,
+#ifdef HAVE_DISK_STORAGE
     storage_sleep,
     storage_spin,
     storage_spindown,
+#endif
 #if USING_STORAGE_CALLBACK
     register_storage_idle_func,
     unregister_storage_idle_func,
diff --git a/apps/plugin.h b/apps/plugin.h
index 74daa2a67b..ebb2518c78 100644
--- a/apps/plugin.h
+++ b/apps/plugin.h
@@ -129,12 +129,12 @@ void* plugin_get_buffer(size_t *buffer_size);
 #define PLUGIN_MAGIC 0x526F634B /* RocK */
 
 /* increase this every time the api struct changes */
-#define PLUGIN_API_VERSION 162
+#define PLUGIN_API_VERSION 163
 
 /* update this to latest version if a change to the api struct breaks
    backwards compatibility (and please take the opportunity to sort in any
    new function which are "waiting" at the end of the function table) */
-#define PLUGIN_MIN_API_VERSION 162
+#define PLUGIN_MIN_API_VERSION 163
 
 /* plugin return codes */
 enum plugin_status {
@@ -395,9 +395,11 @@ struct plugin_api {
     int (*fdprintf)(int fd, const char *fmt, ...) ATTRIBUTE_PRINTF(2, 3);
     int (*read_line)(int fd, char* buffer, int buffer_size);
     bool (*settings_parseline)(char* line, char** name, char** value);
+#ifdef HAVE_DISK_STORAGE
     void (*storage_sleep)(void);
     void (*storage_spin)(void);
     void (*storage_spindown)(int seconds);
+#endif
 #if USING_STORAGE_CALLBACK
     void (*register_storage_idle_func)(storage_idle_notify function);
     void (*unregister_storage_idle_func)(storage_idle_notify function, bool run);
diff --git a/apps/plugins/clock/clock_settings.c b/apps/plugins/clock/clock_settings.c
index d765cbb0da..ef3114a943 100644
--- a/apps/plugins/clock/clock_settings.c
+++ b/apps/plugins/clock/clock_settings.c
@@ -173,7 +173,9 @@ void load_settings(void){
             draw_message(display, MESSAGE_ERRLOAD, 1);
         display->update();
     }
+#ifdef HAVE_DISK_STORAGE
     rb->storage_sleep();
+#endif
     rb->sleep(HZ);
 }
 
diff --git a/apps/plugins/jpeg/jpeg.c b/apps/plugins/jpeg/jpeg.c
index fc98834a7d..685122bb1a 100644
--- a/apps/plugins/jpeg/jpeg.c
+++ b/apps/plugins/jpeg/jpeg.c
@@ -1038,7 +1038,9 @@ int load_and_show(char* filename)
     else if(immediate_ata_off)
     {
         /* running slideshow and time is long enough: power down disk */
+#ifdef HAVE_DISK_STORAGE
         rb->storage_sleep();
+#endif
     }
 #endif
 
diff --git a/apps/plugins/mpegplayer/disk_buf.c b/apps/plugins/mpegplayer/disk_buf.c
index defd8ef81d..4328606a1e 100644
--- a/apps/plugins/mpegplayer/disk_buf.c
+++ b/apps/plugins/mpegplayer/disk_buf.c
@@ -172,7 +172,9 @@ static inline void disk_buf_buffer(void)
         if (!stream_get_window(&sw))
         {
             disk_buf.state = TSTATE_DATA;
+#ifdef HAVE_DISK_STORAGE
             rb->storage_sleep();
+#endif
             break;
         }
 
@@ -187,7 +189,9 @@ static inline void disk_buf_buffer(void)
             /* Free space is less than one page */
             disk_buf.state = TSTATE_DATA;
             disk_buf.low_wm = DISK_BUF_LOW_WATERMARK;
+#ifdef HAVE_DISK_STORAGE
             rb->storage_sleep();
+#endif
             break;
         }
 
@@ -209,7 +213,9 @@ static inline void disk_buf_buffer(void)
             {
                 /* Error or end of stream */
                 disk_buf.state = TSTATE_EOS;
+#ifdef HAVE_DISK_STORAGE
                 rb->storage_sleep();
+#endif
                 break;
             }
 
diff --git a/apps/plugins/video.c b/apps/plugins/video.c
index 6b0a47c7c6..8ead0a72f3 100644
--- a/apps/plugins/video.c
+++ b/apps/plugins/video.c
@@ -681,7 +681,9 @@ int PlayTick(int fd)
 #endif
             )
         {
+#ifdef HAVE_DISK_STORAGE
             rb->storage_sleep(); /* no point in leaving the disk run til timeout */
+#endif
             gPlay.bDiskSleep = true;
         }
 
diff --git a/apps/plugins/wavplay.c b/apps/plugins/wavplay.c
index 368d8e3475..9cb784b54d 100644
--- a/apps/plugins/wavplay.c
+++ b/apps/plugins/wavplay.c
@@ -3596,7 +3596,9 @@ int play_file(char* filename)
             if (free_space <= 0)
             {
                 filling = false;
+#ifdef HAVE_DISK_STORAGE
                 rb->storage_sleep();
+#endif
             }
             else
             {