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

4 files changed, 8 insertions, 6 deletions

diff --git a/apps/alarm_menu.c b/apps/alarm_menu.c
index d7377c20d6..47c28c43f4 100644
--- a/apps/alarm_menu.c
+++ b/apps/alarm_menu.c
@@ -18,7 +18,7 @@
  ****************************************************************************/
 #include "config.h"
 
-#ifdef HAVE_ALARM_MOD
+#ifdef HAVE_RTC_ALARM
 
 #include <stdbool.h>
 
@@ -165,4 +165,4 @@ bool alarm_screen(void)
     return false;
 }
 
-#endif /* HAVE_ALARM_MOD */
+#endif /* HAVE_RTC_ALARM */
diff --git a/apps/lang/english.lang b/apps/lang/english.lang
index c081e53ea7..08f06ba56b 100644
--- a/apps/lang/english.lang
+++ b/apps/lang/english.lang
@@ -5356,9 +5356,11 @@
   user:
   <source>
     *: "PLAY=Set OFF=Cancel"
+    ipod*: "SELECT=Set MENU=Cancel"
   </source>
   <dest>
     *: "PLAY=Set OFF=Cancel"
+    ipod*: "SELECT=Set MENU=Cancel"
   </dest>
   <voice>
     *: ""
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,
diff --git a/apps/tree.c b/apps/tree.c
index a8eaea6aa6..78fb1db76d 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -486,7 +486,7 @@ static void start_resume(bool just_powered_on)
                global_status.resume_index,
                global_status.resume_offset);
 
-#ifdef HAVE_ALARM_MOD
+#ifdef HAVE_RTC_ALARM
         if ( rtc_check_alarm_started(true) ) {
            rtc_enable_alarm(false);
            do_resume = true;