From 5009c9c1b82493421b6cec0fdf8b4f54ec4ff02c Mon Sep 17 00:00:00 2001
From: Dave Chapman <dave@dchapman.com>
Date: Sun, 4 Dec 2005 13:05:56 +0000
Subject: Split the HAVE_RTC define into HAVE_RTC, HAVE_RTC_RAM and CONFIG_RTC
 - in preparation for targets (H300, iPod) which have a clock (HAVE_RTC) but
 no general purpose RAM available for settings data (HAVE_RTC_RAM). 
 CONFIG_RTC is used to specify the low-level driver required.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8144 a1c6a512-1295-4272-9138-f99709370657
---
 apps/gui/gwps.c | 4 ++--
 apps/main.c     | 2 ++
 apps/settings.c | 6 +++---
 3 files changed, 7 insertions(+), 5 deletions(-)

(limited to 'apps')

diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index 6e0551745a..05c33a0568 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -135,7 +135,7 @@ long gui_wps_show(void)
                about to shut down. lets save the settings. */
             if (wps_state.paused) {
                 settings_save();
-#if !defined(HAVE_RTC) && !defined(HAVE_SW_POWEROFF)
+#if !defined(HAVE_RTC_RAM) && !defined(HAVE_SW_POWEROFF)
                 ata_flush();
 #endif
             }
@@ -293,7 +293,7 @@ long gui_wps_show(void)
                     else
                         audio_pause();
                     settings_save();
-#if !defined(HAVE_RTC) && !defined(HAVE_SW_POWEROFF)
+#if !defined(HAVE_RTC_RAM) && !defined(HAVE_SW_POWEROFF)
                     ata_flush();   /* make sure resume info is saved */
 #endif
                 }
diff --git a/apps/main.c b/apps/main.c
index f11706ef93..94d6f70577 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -228,6 +228,8 @@ void init(void)
 
 #ifdef HAVE_RTC
     rtc_init();
+#endif
+#ifdef HAVE_RTC_RAM
     settings_load(SETTINGS_RTC); /* early load parts of global_settings */
 #endif
 
diff --git a/apps/settings.c b/apps/settings.c
index 49423ab629..edcef4a271 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -574,7 +574,7 @@ static void init_config_buffer( void )
 static int save_config_buffer( void )
 {
     unsigned short chksum;
-#ifdef HAVE_RTC
+#ifdef HAVE_RTC_RAM
     unsigned int i;
 #endif
 
@@ -583,7 +583,7 @@ static int save_config_buffer( void )
     config_block[ RTC_BLOCK_SIZE - 2 ] = chksum >> 8;
     config_block[ RTC_BLOCK_SIZE - 1 ] = chksum & 0xff;
 
-#ifdef HAVE_RTC
+#ifdef HAVE_RTC_RAM
     /* FIXME: okay, it _would_ be cleaner and faster to implement rtc_write so
        that it would write a number of bytes at a time since the RTC chip
        supports that, but this will have to do for now 8-) */
@@ -637,7 +637,7 @@ static int load_config_buffer(int which)
         }
     }
 
-#ifdef HAVE_RTC
+#ifdef HAVE_RTC_RAM
     if(!correct)
     {
         /* If the disk sector was incorrect, reinit the buffer */
-- 
cgit v1.2.3