diff options
| author | Nils Wallménius <nils@rockbox.org> | 2007-08-01 08:50:44 +0000 |
|---|---|---|
| committer | Nils Wallménius <nils@rockbox.org> | 2007-08-01 08:50:44 +0000 |
| commit | 0bfa3e76ce8f2c5465ff568b7f4dcf7b5fbb462f (patch) | |
| tree | d84ec59c3b9fc00ce46329c01a66b8da46b0e204 /apps/plugins | |
| parent | 3b3fd4997ee32cf5b0bc7cf07b3ac9a73cbcb388 (diff) | |
| download | rockbox-0bfa3e76ce8f2c5465ff568b7f4dcf7b5fbb462f.zip rockbox-0bfa3e76ce8f2c5465ff568b7f4dcf7b5fbb462f.tar.gz rockbox-0bfa3e76ce8f2c5465ff568b7f4dcf7b5fbb462f.tar.bz2 rockbox-0bfa3e76ce8f2c5465ff568b7f4dcf7b5fbb462f.tar.xz | |
Disable 'Disk spindown' and 'Anti skip buffer' settings and some related stuff for flash storage targets as they make no sense
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14110 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
| -rw-r--r-- | apps/plugins/battery_bench.c | 10 | ||||
| -rw-r--r-- | apps/plugins/jpeg.c | 4 | ||||
| -rw-r--r-- | apps/plugins/video.c | 7 |
3 files changed, 13 insertions, 8 deletions
diff --git a/apps/plugins/battery_bench.c b/apps/plugins/battery_bench.c index 3d8eadb..8c71f0e 100644 --- a/apps/plugins/battery_bench.c +++ b/apps/plugins/battery_bench.c @@ -188,15 +188,17 @@ void thread(void) #if CONFIG_CHARGING || defined(HAVE_USB_POWER) unsigned int last_state = 0; #endif - long sleep_time; + long sleep_time = 5 * HZ; struct event ev; buffelements = sizeof(bat)/sizeof(struct batt_info); - sleep_time = (rb->global_settings->disk_spindown > 1) ? - (rb->global_settings->disk_spindown - 1) * HZ : 5 * HZ; - +#ifndef HAVE_FLASH_STORAGE + if(rb->global_settings->disk_spindown > 1) + sleep_time = (rb->global_settings->disk_spindown - 1) * HZ; +#endif + do { if(!in_usb_mode && got_info && diff --git a/apps/plugins/jpeg.c b/apps/plugins/jpeg.c index 54c8c6c..ad56475 100644 --- a/apps/plugins/jpeg.c +++ b/apps/plugins/jpeg.c @@ -2541,7 +2541,7 @@ int show_menu(void) /* return 1 to quit */ break; } -#ifndef SIMULATOR +#if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE) /* change ata spindown time based on slideshow time setting */ immediate_ata_off = false; rb->ata_spindown(rb->global_settings->disk_spindown); @@ -3325,7 +3325,7 @@ enum plugin_status plugin_start(struct plugin_api* api, void* parameter) } #endif -#ifndef SIMULATOR +#if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE) /* set back ata spindown time in case we changed it */ rb->ata_spindown(rb->global_settings->disk_spindown); #endif diff --git a/apps/plugins/video.c b/apps/plugins/video.c index b56a9d0..aca960f 100644 --- a/apps/plugins/video.c +++ b/apps/plugins/video.c @@ -650,8 +650,11 @@ int PlayTick(int fd) * gFileHdr.bps_peak / 8 / HZ; } - if (!gPlay.bRefilling - && rb->global_settings->disk_spindown < 20) /* condition for test only */ + if (!gPlay.bRefilling +#ifndef HAVE_FLASH_STORAGE + && rb->global_settings->disk_spindown < 20 /* condition for test only */ +#endif + ) { rb->ata_sleep(); /* no point in leaving the disk run til timeout */ gPlay.bDiskSleep = true; |