diff options
author | Thom Johansen <thomj@rockbox.org> | 2007-02-28 21:55:11 +0000 |
---|---|---|
committer | Thom Johansen <thomj@rockbox.org> | 2007-02-28 21:55:11 +0000 |
commit | 8fd6d658a1caeddc0a84dd69ffe45739bd466e74 (patch) | |
tree | 91f79d4d40d898a303998710a18ae62d8b8c7082 /apps/menus | |
parent | ab66955664f8987d064247dc6d585b5618745d29 (diff) |
Add wake on alarm support for Ipods. Rename HAVE_ALARM_MOD to HAVE_ALARM_RTC since it's not always a mod. Make Ipod PCF driver keep other flags in OOCC1 that have been set instead of overwriting them.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12522 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/settings_menu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 818271b623..92c169e43a 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c @@ -35,7 +35,7 @@ #include "talk.h" #include "sprintf.h" #include "powermgmt.h" -#ifdef HAVE_ALARM_MOD +#ifdef HAVE_RTC_ALARM #include "alarm_menu.h" #endif #ifdef CONFIG_RTC @@ -250,7 +250,7 @@ static int sleep_timer(void) MENUITEM_FUNCTION(sleep_timer_call, ID2P(LANG_SLEEP_TIMER), sleep_timer, NULL, bitmap_icons_6x8[Icon_Menu_setting]); /* make it look like a setting to the user */ -#ifdef HAVE_ALARM_MOD +#ifdef HAVE_RTC_ALARM MENUITEM_FUNCTION(alarm_screen_call, ID2P(LANG_ALARM_MOD_ALARM_MENU), (menu_function)alarm_screen, rtc_detect_callback, NOICON); #endif @@ -295,7 +295,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM), #endif &poweroff, &sleep_timer_call, -#ifdef HAVE_ALARM_MOD +#ifdef HAVE_RTC_ALARM &alarm_screen_call, #endif &limits_menu, |