summaryrefslogtreecommitdiff
path: root/apps/plugins
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2009-07-17 16:34:34 +0000
committerRafaël Carré <rafael.carre@gmail.com>2009-07-17 16:34:34 +0000
commitbdb5974c0ef05ca548beabdd2ece0512a60024f9 (patch)
tree3d0fe4215ab3f1fdb2b0588f4d034e5d514874ea /apps/plugins
parentcf9935d6362dd52e4b2f33dd19fff0a0860814d7 (diff)
downloadrockbox-bdb5974c0ef05ca548beabdd2ece0512a60024f9.zip
rockbox-bdb5974c0ef05ca548beabdd2ece0512a60024f9.tar.gz
rockbox-bdb5974c0ef05ca548beabdd2ece0512a60024f9.tar.bz2
rockbox-bdb5974c0ef05ca548beabdd2ece0512a60024f9.tar.xz
Revert r21912 : "Storage API : remove undeeded target-specific functions"
After a discussion mixed on mailing list and irc, it was agreed that more abstraction for plugins is better (so developers don't have to add a check to HAVE_DISK_STORAGE when writing disk-specific code) git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21923 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r--apps/plugins/clock/clock_settings.c2
-rw-r--r--apps/plugins/jpeg/jpeg.c2
-rw-r--r--apps/plugins/mpegplayer/disk_buf.c6
-rw-r--r--apps/plugins/video.c2
-rw-r--r--apps/plugins/wavplay.c2
5 files changed, 0 insertions, 14 deletions
diff --git a/apps/plugins/clock/clock_settings.c b/apps/plugins/clock/clock_settings.c
index ef3114a..d765cbb 100644
--- a/apps/plugins/clock/clock_settings.c
+++ b/apps/plugins/clock/clock_settings.c
@@ -173,9 +173,7 @@ 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 685122b..fc98834 100644
--- a/apps/plugins/jpeg/jpeg.c
+++ b/apps/plugins/jpeg/jpeg.c
@@ -1038,9 +1038,7 @@ 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 4328606..defd8ef 100644
--- a/apps/plugins/mpegplayer/disk_buf.c
+++ b/apps/plugins/mpegplayer/disk_buf.c
@@ -172,9 +172,7 @@ 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;
}
@@ -189,9 +187,7 @@ 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;
}
@@ -213,9 +209,7 @@ 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 8ead0a7..6b0a47c 100644
--- a/apps/plugins/video.c
+++ b/apps/plugins/video.c
@@ -681,9 +681,7 @@ 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 9cb784b..368d8e3 100644
--- a/apps/plugins/wavplay.c
+++ b/apps/plugins/wavplay.c
@@ -3596,9 +3596,7 @@ int play_file(char* filename)
if (free_space <= 0)
{
filling = false;
-#ifdef HAVE_DISK_STORAGE
rb->storage_sleep();
-#endif
}
else
{