diff options
| author | Jens Arnold <amiconn@rockbox.org> | 2004-10-09 22:04:47 +0000 |
|---|---|---|
| committer | Jens Arnold <amiconn@rockbox.org> | 2004-10-09 22:04:47 +0000 |
| commit | dd937dcfaf99a0eee4f9b37fe350fba10d757ba8 (patch) | |
| tree | 3839ee4944433a13cfc567f5430a864925eee0f5 /apps | |
| parent | ae4d51199f09f9361d823205dcfa9aeadbe2241c (diff) | |
| download | rockbox-dd937dcfaf99a0eee4f9b37fe350fba10d757ba8.zip rockbox-dd937dcfaf99a0eee4f9b37fe350fba10d757ba8.tar.gz rockbox-dd937dcfaf99a0eee4f9b37fe350fba10d757ba8.tar.bz2 rockbox-dd937dcfaf99a0eee4f9b37fe350fba10d757ba8.tar.xz | |
Removed disk settings menu for Ondio
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5239 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/settings.c | 2 | ||||
| -rw-r--r-- | apps/settings_menu.c | 24 |
2 files changed, 17 insertions, 9 deletions
diff --git a/apps/settings.c b/apps/settings.c index 09e15b3..3b6a048 100644 --- a/apps/settings.c +++ b/apps/settings.c @@ -268,10 +268,12 @@ static const struct bit_entry hd_bits[] = {4, S_O(ff_rewind_accel), 3, "scan accel", NULL }, {3, S_O(buffer_margin), 0, "antiskip", NULL }, /* disk */ +#ifndef HAVE_MMC #ifdef HAVE_ATA_POWER_OFF {1, S_O(disk_poweroff), false, "disk poweroff", off_on }, #endif {8, S_O(disk_spindown), 5, "disk spindown", NULL }, +#endif /* browser */ {2, S_O(dirfilter), SHOW_MUSIC, "show files", "all,supported,music,playlists" }, diff --git a/apps/settings_menu.c b/apps/settings_menu.c index 35bc932..61d2519 100644 --- a/apps/settings_menu.c +++ b/apps/settings_menu.c @@ -773,6 +773,7 @@ static bool timeformat_set(void) } #endif +#ifndef HAVE_MMC static bool spindown(void) { return set_int(str(LANG_SPINDOWN), "s", UNIT_SEC, @@ -780,15 +781,6 @@ static bool spindown(void) ata_spindown, 1, 3, 254 ); } -#if CONFIG_HWCODEC == MAS3507D -static bool line_in(void) -{ - bool rc = set_bool(str(LANG_LINE_IN), &global_settings.line_in); - dac_line_in(global_settings.line_in); - return rc; -} -#endif - #ifdef HAVE_ATA_POWER_OFF static bool poweroff(void) { @@ -796,6 +788,16 @@ static bool poweroff(void) ata_poweroff(global_settings.disk_poweroff); return rc; } +#endif /* HAVE_ATA_POWEROFF */ +#endif /* !HAVE_MMC */ + +#if CONFIG_HWCODEC == MAS3507D +static bool line_in(void) +{ + bool rc = set_bool(str(LANG_LINE_IN), &global_settings.line_in); + dac_line_in(global_settings.line_in); + return rc; +} #endif static bool max_files_in_dir(void) @@ -1250,6 +1252,7 @@ static bool battery_settings_menu(void) return result; } +#ifndef HAVE_MMC static bool disk_settings_menu(void) { int m; @@ -1268,6 +1271,7 @@ static bool disk_settings_menu(void) menu_exit(m); return result; } +#endif /* !HAVE_MMC */ #ifdef HAVE_RTC static bool time_settings_menu(void) @@ -1332,7 +1336,9 @@ static bool system_settings_menu(void) static const struct menu_item items[] = { { ID2P(LANG_BATTERY_MENU), battery_settings_menu }, +#ifndef HAVE_MMC { ID2P(LANG_DISK_MENU), disk_settings_menu }, +#endif #ifdef HAVE_RTC { ID2P(LANG_TIME_MENU), time_settings_menu }, #endif |