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

9 files changed, 38 insertions, 5 deletions

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 */
diff --git a/firmware/SOURCES b/firmware/SOURCES
index aba4e3b622..086501cc30 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -98,8 +98,10 @@ drivers/mas.c
 drivers/pcf50606.c
 #endif
 #ifdef HAVE_RTC
+#if CONFIG_RTC == RTC_M41ST84W
 drivers/rtc.c
 #endif
+#endif
 drivers/serial.c
 #endif /* !SIMULATOR */
 #ifdef HAVE_LCD_BITMAP
diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h
index 28d8239c22..221472a179 100644
--- a/firmware/export/config-fmrecorder.h
+++ b/firmware/export/config-fmrecorder.h
@@ -15,6 +15,12 @@
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
 
+/* define this if you have RTC RAM available for settings */
+#define HAVE_RTC_RAM 1
+
+/* define this to the type of RTC hardware */
+#define CONFIG_RTC RTC_M41ST84W
+
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
 
diff --git a/firmware/export/config-gmini120.h b/firmware/export/config-gmini120.h
index c833435dea..a7566649b5 100644
--- a/firmware/export/config-gmini120.h
+++ b/firmware/export/config-gmini120.h
@@ -10,6 +10,12 @@
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
 
+/* define this if you have RTC RAM available for settings */
+#define HAVE_RTC_RAM 1
+
+/* define this to the type of RTC hardware */
+#define CONFIG_RTC RTC_M41ST84W
+
 /* LCD dimensions */
 #define LCD_WIDTH  128
 #define LCD_HEIGHT 64
diff --git a/firmware/export/config-recorder.h b/firmware/export/config-recorder.h
index 32c29b2ec5..97062c168c 100644
--- a/firmware/export/config-recorder.h
+++ b/firmware/export/config-recorder.h
@@ -15,6 +15,12 @@
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
 
+/* define this if you have RTC RAM available for settings */
+#define HAVE_RTC_RAM 1
+
+/* define this to the type of RTC hardware */
+#define CONFIG_RTC RTC_M41ST84W
+
 /* The number of bytes reserved for loadable plugins */
 #define PLUGIN_BUFFER_SIZE 0x8000
 
diff --git a/firmware/export/config-recorderv2.h b/firmware/export/config-recorderv2.h
index fbe99812dc..21fe0b20c2 100644
--- a/firmware/export/config-recorderv2.h
+++ b/firmware/export/config-recorderv2.h
@@ -15,6 +15,12 @@
 /* define this if you have a real-time clock */
 #define HAVE_RTC 1
 
+/* define this if you have RTC RAM available for settings */
+#define HAVE_RTC_RAM 1
+
+/* define this to the type of RTC hardware */
+#define CONFIG_RTC RTC_M41ST84W
+
 /* Define this if you have a software controlled poweroff */
 #define HAVE_SW_POWEROFF
 
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 9764afde05..555e062eb4 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -100,6 +100,11 @@
 /* CONFIG_LED */
 #define LED_REAL     1 /* SW controlled LED (Archos recorders, player, Gmini) */
 #define LED_VIRTUAL  2 /* Virtual LED (icon) (Archos Ondio) */
+
+/* CONFIG_RTC */
+#define RTC_M41ST84W 1
+#define RTC_PCF50606 2
+
 /* else                   HW controlled LED (iRiver H1x0) */
 
 /* now go and pick yours */