From 8c800cf59af23eaa22b97e89556640f63998b9bd Mon Sep 17 00:00:00 2001
From: Dave Chapman <dave@dchapman.com>
Date: Sun, 4 Dec 2005 15:23:47 +0000
Subject: Replace references to HAVE_RTC with CONFIG_RTC and remove the
 HAVE_RTC defines from config-*.h

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8147 a1c6a512-1295-4272-9138-f99709370657
---
 apps/plugins/SOURCES        | 4 ++--
 apps/plugins/battery_test.c | 2 +-
 apps/plugins/bounce.c       | 8 ++++----
 apps/plugins/calendar.c     | 6 +++---
 apps/plugins/clock.c        | 2 +-
 5 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'apps/plugins')

diff --git a/apps/plugins/SOURCES b/apps/plugins/SOURCES
index b335a068f4..c2ddc3d42b 100644
--- a/apps/plugins/SOURCES
+++ b/apps/plugins/SOURCES
@@ -56,10 +56,10 @@ video.c
 #endif
 vu_meter.c
 
-#ifdef HAVE_RTC /* Recorder models only */
+#ifdef CONFIG_RTC /* Recorder models only */
 calendar.c
 clock.c
-#endif /* #ifdef HAVE_RTC */
+#endif /* #ifdef CONFIG_RTC */
 
 #if CONFIG_KEYPAD != ONDIO_PAD
 /* gradually bring in the ones not working yet */
diff --git a/apps/plugins/battery_test.c b/apps/plugins/battery_test.c
index adb1a2d86e..31ae801934 100644
--- a/apps/plugins/battery_test.c
+++ b/apps/plugins/battery_test.c
@@ -87,7 +87,7 @@ enum plugin_status loop(void)
             rb->splash(HZ, true, "Failed creating /battery.log");
             break;
         }
-#ifdef HAVE_RTC
+#ifdef CONFIG_RTC
         t = rb->get_time();
 #else
         {
diff --git a/apps/plugins/bounce.c b/apps/plugins/bounce.c
index 3a44a4cc46..487965a4cf 100644
--- a/apps/plugins/bounce.c
+++ b/apps/plugins/bounce.c
@@ -230,7 +230,7 @@ struct counter values[]={
   {"ydist", -6},
 };
 
-#ifdef HAVE_RTC
+#ifdef CONFIG_RTC
 static unsigned char yminute[]={
 53,53,52,52,51,50,49,47,46,44,42,40,38,36,34,32,29,27,25,23,21,19,17,16,14,13,12,11,11,10,10,10,11,11,12,13,14,16,17,19,21,23,25,27,29,31,34,36,38,40,42,44,46,47,49,50,51,52,52,53,
 };
@@ -277,7 +277,7 @@ static void addclock(void)
                           yminute[(i+1)%60]);
     }
 }
-#endif /* HAVE_RTC */
+#endif /* CONFIG_RTC */
 
 #define DRAW_WIDTH (LCD_WIDTH + LETTER_WIDTH*2)
 
@@ -330,7 +330,7 @@ static int scrollit(void)
             yy += YADD;
             xx+= DRAW_WIDTH/LETTERS_ON_SCREEN;
         }
-#ifdef HAVE_RTC
+#ifdef CONFIG_RTC
         addclock();
 #endif
         rb->lcd_update();
@@ -385,7 +385,7 @@ static int loopit(void)
         x+= speed[xsanke&15] + values[NUM_XADD].num;
 
         rb->lcd_clear_display();
-#ifdef HAVE_RTC
+#ifdef CONFIG_RTC
         addclock();
 #endif
         if(timeout) {
diff --git a/apps/plugins/calendar.c b/apps/plugins/calendar.c
index df23afd721..5cb04b565c 100644
--- a/apps/plugins/calendar.c
+++ b/apps/plugins/calendar.c
@@ -19,7 +19,7 @@
  ****************************************************************************/
 #include "plugin.h"
 
-#if defined(HAVE_LCD_BITMAP) && defined(HAVE_RTC)
+#if defined(HAVE_LCD_BITMAP) && defined(CONFIG_RTC)
 
 #include <timefuncs.h>
 
@@ -69,7 +69,7 @@ static int calc_weekday( struct shown *shown )
 static void calendar_init(struct today *today, struct shown *shown)
 {
     int w,h;
-#ifdef HAVE_RTC
+#ifdef CONFIG_RTC
     struct tm *tm;
 #else
     (void)today;
@@ -81,7 +81,7 @@ static void calendar_init(struct today *today, struct shown *shown)
         use_system_font = true;
     }
     rb->lcd_clear_display();
-#ifdef HAVE_RTC
+#ifdef CONFIG_RTC
     tm = rb->get_time();
     today->mon = tm->tm_mon +1;
     today->year = 2000+tm->tm_year%100;
diff --git a/apps/plugins/clock.c b/apps/plugins/clock.c
index 6b06b1a74e..9c940dc7c3 100644
--- a/apps/plugins/clock.c
+++ b/apps/plugins/clock.c
@@ -78,7 +78,7 @@ Original release, featuring analog / digital modes and a few options.
 #include "plugin.h"
 #include "time.h"
 
-#if defined(HAVE_LCD_BITMAP) && defined(HAVE_RTC)
+#if defined(HAVE_LCD_BITMAP) && defined(CONFIG_RTC)
 
 #define CLOCK_VERSION "2.60"
 
-- 
cgit v1.2.3