forked from len0rd/rockbox
add HAVE_DISK_STORAGE, and use that instead of HAVE_FLASH_STORAGE when checking for an actual disk (i.e. related to spindown, skipping,...)
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18735 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
23b7e95770
commit
46573019a5
43 changed files with 142 additions and 26 deletions
|
@ -2633,7 +2633,7 @@ int show_menu(void) /* return 1 to quit */
|
|||
break;
|
||||
}
|
||||
|
||||
#if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE)
|
||||
#if !defined(SIMULATOR) && defined(HAVE_DISK_STORAGE)
|
||||
/* change ata spindown time based on slideshow time setting */
|
||||
immediate_ata_off = false;
|
||||
rb->ata_spindown(rb->global_settings->disk_spindown);
|
||||
|
@ -3412,7 +3412,7 @@ enum plugin_status plugin_start(const struct plugin_api* api, const void* parame
|
|||
ARRAYLEN(jpeg_config), JPEG_SETTINGS_VERSION);
|
||||
}
|
||||
|
||||
#if !defined(SIMULATOR) && !defined(HAVE_FLASH_STORAGE)
|
||||
#if !defined(SIMULATOR) && defined(HAVE_DISK_STORAGE)
|
||||
/* set back ata spindown time in case we changed it */
|
||||
rb->ata_spindown(rb->global_settings->disk_spindown);
|
||||
#endif
|
||||
|
|
|
@ -152,7 +152,7 @@ static inline bool stream_can_seek(void)
|
|||
/* Keep the disk spinning (for seeking and browsing) */
|
||||
static inline void stream_keep_disk_active(void)
|
||||
{
|
||||
#ifndef HAVE_FLASH_STORAGE
|
||||
#ifdef HAVE_DISK_STORAGE
|
||||
rb->ata_spin();
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -656,7 +656,7 @@ int PlayTick(int fd)
|
|||
}
|
||||
|
||||
if (!gPlay.bRefilling
|
||||
#ifndef HAVE_FLASH_STORAGE
|
||||
#ifdef HAVE_DISK_STORAGE
|
||||
&& rb->global_settings->disk_spindown < 20 /* condition for test only */
|
||||
#endif
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue