diff options
| author | Rafaël Carré <rafael.carre@gmail.com> | 2009-07-17 00:09:14 +0000 |
|---|---|---|
| committer | Rafaël Carré <rafael.carre@gmail.com> | 2009-07-17 00:09:14 +0000 |
| commit | 8eba69f91ba361b49cec5b546496f6251a638c47 (patch) | |
| tree | 3dc49543ddb1bb7a44a5b1dd2e2beea2ee3a500d /apps/plugins | |
| parent | 20f8666b89f2ec7290d195732d5dc33d20cf3580 (diff) | |
| download | rockbox-8eba69f91ba361b49cec5b546496f6251a638c47.zip rockbox-8eba69f91ba361b49cec5b546496f6251a638c47.tar.gz rockbox-8eba69f91ba361b49cec5b546496f6251a638c47.tar.bz2 rockbox-8eba69f91ba361b49cec5b546496f6251a638c47.tar.xz | |
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
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/clock/clock_settings.c | 2 | ||||
| -rw-r--r-- | apps/plugins/jpeg/jpeg.c | 2 | ||||
| -rw-r--r-- | apps/plugins/mpegplayer/disk_buf.c | 6 | ||||
| -rw-r--r-- | apps/plugins/video.c | 2 | ||||
| -rw-r--r-- | apps/plugins/wavplay.c | 2 |
5 files changed, 14 insertions, 0 deletions
diff --git a/apps/plugins/clock/clock_settings.c b/apps/plugins/clock/clock_settings.c index d765cbb..ef3114a 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 fc98834..685122b 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 defd8ef..4328606 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 6b0a47c..8ead0a7 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 368d8e3..9cb784b 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 { |