The UI sim simulates the RTC, so there is no need to disable it - affects all ipod sims.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12836 a1c6a512-1295-4272-9138-f99709370657

7 files changed, 28 insertions, 14 deletions

diff --git a/firmware/export/config-ipod3g.h b/firmware/export/config-ipod3g.h
index 58776b0..a920442 100644
--- a/firmware/export/config-ipod3g.h
+++ b/firmware/export/config-ipod3g.h
@@ -46,9 +46,8 @@
 #define CONFIG_CODEC SWCODEC
 
 /* define this if you have a real-time clock */
-#if !defined(BOOTLOADER) && !defined(SIMULATOR)
+#if !defined(BOOTLOADER)
 #define CONFIG_RTC RTC_PCF50605
-#define HAVE_RTC_ALARM
 #endif
 
 /* Define this if you have a software controlled poweroff */
@@ -121,6 +120,9 @@
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
 
+/* Define if the device can wake from an RTC alarm */
+#define HAVE_RTC_ALARM 
+
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config-ipod4g.h b/firmware/export/config-ipod4g.h
index 91f2285..74a378c 100644
--- a/firmware/export/config-ipod4g.h
+++ b/firmware/export/config-ipod4g.h
@@ -52,9 +52,8 @@
 #define CONFIG_CODEC SWCODEC
 
 /* define this if you have a real-time clock */
-#if !defined(BOOTLOADER) && !defined(SIMULATOR)
+#if !defined(BOOTLOADER)
 #define CONFIG_RTC RTC_PCF50605
-#define HAVE_RTC_ALARM
 #endif
 
 /* Define this if you have a software controlled poweroff */
@@ -130,6 +129,9 @@
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
 
+/* Define if the device can wake from an RTC alarm */
+#define HAVE_RTC_ALARM 
+
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config-ipodcolor.h b/firmware/export/config-ipodcolor.h
index eacdbe6..c7211c7 100644
--- a/firmware/export/config-ipodcolor.h
+++ b/firmware/export/config-ipodcolor.h
@@ -43,9 +43,8 @@
 #define CONFIG_CODEC SWCODEC
 
 /* define this if you have a real-time clock */
-#if !defined(BOOTLOADER) && !defined(SIMULATOR)
+#if !defined(BOOTLOADER)
 #define CONFIG_RTC RTC_PCF50605
-#define HAVE_RTC_ALARM
 #endif
 
 /* Define this if you have a software controlled poweroff */
@@ -121,6 +120,9 @@
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
 
+/* Define if the device can wake from an RTC alarm */
+#define HAVE_RTC_ALARM 
+
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config-ipodmini.h b/firmware/export/config-ipodmini.h
index e84ebfe..e8fbfeb 100644
--- a/firmware/export/config-ipodmini.h
+++ b/firmware/export/config-ipodmini.h
@@ -46,9 +46,8 @@
 #define CONFIG_CODEC SWCODEC
 
 /* define this if you have a real-time clock */
-#if !defined(BOOTLOADER) && !defined(SIMULATOR)
+#if !defined(BOOTLOADER)
 #define CONFIG_RTC RTC_PCF50605
-#define HAVE_RTC_ALARM
 #endif
 
 /* Define this if you have a software controlled poweroff */
@@ -127,6 +126,9 @@
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
 
+/* Define if the device can wake from an RTC alarm */
+#define HAVE_RTC_ALARM 
+
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config-ipodmini2g.h b/firmware/export/config-ipodmini2g.h
index f6aefc5..47523fb 100644
--- a/firmware/export/config-ipodmini2g.h
+++ b/firmware/export/config-ipodmini2g.h
@@ -46,9 +46,8 @@
 #define CONFIG_CODEC SWCODEC
 
 /* define this if you have a real-time clock */
-#if !defined(BOOTLOADER) && !defined(SIMULATOR)
+#if !defined(BOOTLOADER)
 #define CONFIG_RTC RTC_PCF50605
-#define HAVE_RTC_ALARM
 #endif
 
 /* Define this if you have a software controlled poweroff */
@@ -130,6 +129,9 @@
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
 
+/* Define if the device can wake from an RTC alarm */
+#define HAVE_RTC_ALARM 
+
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config-ipodnano.h b/firmware/export/config-ipodnano.h
index b1e7c4f..e64e651 100644
--- a/firmware/export/config-ipodnano.h
+++ b/firmware/export/config-ipodnano.h
@@ -43,9 +43,8 @@
 #define CONFIG_CODEC SWCODEC
 
 /* define this if you have a real-time clock */
-#if !defined(BOOTLOADER) && !defined(SIMULATOR)
+#if !defined(BOOTLOADER)
 #define CONFIG_RTC RTC_PCF50605
-#define HAVE_RTC_ALARM
 #endif
 
 /* Define this if you have a software controlled poweroff */
@@ -126,6 +125,9 @@
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
 
+/* Define if the device can wake from an RTC alarm */
+#define HAVE_RTC_ALARM 
+
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ
 
diff --git a/firmware/export/config-ipodvideo.h b/firmware/export/config-ipodvideo.h
index 8c53b38..fbdeb51 100644
--- a/firmware/export/config-ipodvideo.h
+++ b/firmware/export/config-ipodvideo.h
@@ -43,9 +43,8 @@
 #define CONFIG_CODEC SWCODEC
 
 /* define this if you have a real-time clock */
-#if !defined(BOOTLOADER) && !defined(SIMULATOR)
+#if !defined(BOOTLOADER)
 #define CONFIG_RTC RTC_PCF50605
-#define HAVE_RTC_ALARM
 #endif
 
 /* Define this if you have a software controlled poweroff */
@@ -126,6 +125,9 @@
 /* Virtual LED (icon) */
 #define CONFIG_LED LED_VIRTUAL
 
+/* Define if the device can wake from an RTC alarm */
+#define HAVE_RTC_ALARM 
+
 /* Define this if you have adjustable CPU frequency */
 #define HAVE_ADJUSTABLE_CPU_FREQ