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
|
|
@ -173,7 +173,7 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
|
|||
#endif
|
||||
);
|
||||
/* Disk */
|
||||
#ifndef HAVE_FLASH_STORAGE
|
||||
#ifdef HAVE_DISK_STORAGE
|
||||
MENUITEM_SETTING(disk_spindown, &global_settings.disk_spindown, NULL);
|
||||
#endif
|
||||
#ifdef HAVE_DIRCACHE
|
||||
|
|
@ -200,9 +200,9 @@ static int dircache_callback(int action,const struct menu_item_ex *this_item)
|
|||
}
|
||||
MENUITEM_SETTING(dircache, &global_settings.dircache, dircache_callback);
|
||||
#endif
|
||||
#if defined(HAVE_DIRCACHE) || !defined(HAVE_FLASH_STORAGE)
|
||||
#if defined(HAVE_DIRCACHE) || defined(HAVE_DISK_STORAGE)
|
||||
MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON,
|
||||
#ifndef HAVE_FLASH_STORAGE
|
||||
#ifdef HAVE_DISK_STORAGE
|
||||
&disk_spindown,
|
||||
#endif
|
||||
#ifdef HAVE_DIRCACHE
|
||||
|
|
@ -374,7 +374,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
|
|||
#if (BATTERY_CAPACITY_INC > 0) || (BATTERY_TYPES_COUNT > 1)
|
||||
&battery_menu,
|
||||
#endif
|
||||
#if defined(HAVE_DIRCACHE) || !defined(HAVE_FLASH_STORAGE)
|
||||
#if defined(HAVE_DIRCACHE) || defined(HAVE_DISK_STORAGE)
|
||||
&disk_menu,
|
||||
#endif
|
||||
#if CONFIG_RTC
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue