diff options
author | Dave Chapman <dave@dchapman.com> | 2005-12-04 15:23:47 +0000 |
---|---|---|
committer | Dave Chapman <dave@dchapman.com> | 2005-12-04 15:23:47 +0000 |
commit | 8c800cf59af23eaa22b97e89556640f63998b9bd (patch) | |
tree | 96115da5d0597b7625c637158364866d365258e1 /apps/plugins | |
parent | 0ea71be34895a225e137af20faea2adc9f113853 (diff) | |
download | rockbox-8c800cf59af23eaa22b97e89556640f63998b9bd.tar.gz rockbox-8c800cf59af23eaa22b97e89556640f63998b9bd.zip |
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
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/SOURCES | 4 | ||||
-rw-r--r-- | apps/plugins/battery_test.c | 2 | ||||
-rw-r--r-- | apps/plugins/bounce.c | 8 | ||||
-rw-r--r-- | apps/plugins/calendar.c | 6 | ||||
-rw-r--r-- | apps/plugins/clock.c | 2 |
5 files changed, 11 insertions, 11 deletions
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 | |||
56 | #endif | 56 | #endif |
57 | vu_meter.c | 57 | vu_meter.c |
58 | 58 | ||
59 | #ifdef HAVE_RTC /* Recorder models only */ | 59 | #ifdef CONFIG_RTC /* Recorder models only */ |
60 | calendar.c | 60 | calendar.c |
61 | clock.c | 61 | clock.c |
62 | #endif /* #ifdef HAVE_RTC */ | 62 | #endif /* #ifdef CONFIG_RTC */ |
63 | 63 | ||
64 | #if CONFIG_KEYPAD != ONDIO_PAD | 64 | #if CONFIG_KEYPAD != ONDIO_PAD |
65 | /* gradually bring in the ones not working yet */ | 65 | /* 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) | |||
87 | rb->splash(HZ, true, "Failed creating /battery.log"); | 87 | rb->splash(HZ, true, "Failed creating /battery.log"); |
88 | break; | 88 | break; |
89 | } | 89 | } |
90 | #ifdef HAVE_RTC | 90 | #ifdef CONFIG_RTC |
91 | t = rb->get_time(); | 91 | t = rb->get_time(); |
92 | #else | 92 | #else |
93 | { | 93 | { |
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[]={ | |||
230 | {"ydist", -6}, | 230 | {"ydist", -6}, |
231 | }; | 231 | }; |
232 | 232 | ||
233 | #ifdef HAVE_RTC | 233 | #ifdef CONFIG_RTC |
234 | static unsigned char yminute[]={ | 234 | static unsigned char yminute[]={ |
235 | 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, | 235 | 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, |
236 | }; | 236 | }; |
@@ -277,7 +277,7 @@ static void addclock(void) | |||
277 | yminute[(i+1)%60]); | 277 | yminute[(i+1)%60]); |
278 | } | 278 | } |
279 | } | 279 | } |
280 | #endif /* HAVE_RTC */ | 280 | #endif /* CONFIG_RTC */ |
281 | 281 | ||
282 | #define DRAW_WIDTH (LCD_WIDTH + LETTER_WIDTH*2) | 282 | #define DRAW_WIDTH (LCD_WIDTH + LETTER_WIDTH*2) |
283 | 283 | ||
@@ -330,7 +330,7 @@ static int scrollit(void) | |||
330 | yy += YADD; | 330 | yy += YADD; |
331 | xx+= DRAW_WIDTH/LETTERS_ON_SCREEN; | 331 | xx+= DRAW_WIDTH/LETTERS_ON_SCREEN; |
332 | } | 332 | } |
333 | #ifdef HAVE_RTC | 333 | #ifdef CONFIG_RTC |
334 | addclock(); | 334 | addclock(); |
335 | #endif | 335 | #endif |
336 | rb->lcd_update(); | 336 | rb->lcd_update(); |
@@ -385,7 +385,7 @@ static int loopit(void) | |||
385 | x+= speed[xsanke&15] + values[NUM_XADD].num; | 385 | x+= speed[xsanke&15] + values[NUM_XADD].num; |
386 | 386 | ||
387 | rb->lcd_clear_display(); | 387 | rb->lcd_clear_display(); |
388 | #ifdef HAVE_RTC | 388 | #ifdef CONFIG_RTC |
389 | addclock(); | 389 | addclock(); |
390 | #endif | 390 | #endif |
391 | if(timeout) { | 391 | 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 @@ | |||
19 | ****************************************************************************/ | 19 | ****************************************************************************/ |
20 | #include "plugin.h" | 20 | #include "plugin.h" |
21 | 21 | ||
22 | #if defined(HAVE_LCD_BITMAP) && defined(HAVE_RTC) | 22 | #if defined(HAVE_LCD_BITMAP) && defined(CONFIG_RTC) |
23 | 23 | ||
24 | #include <timefuncs.h> | 24 | #include <timefuncs.h> |
25 | 25 | ||
@@ -69,7 +69,7 @@ static int calc_weekday( struct shown *shown ) | |||
69 | static void calendar_init(struct today *today, struct shown *shown) | 69 | static void calendar_init(struct today *today, struct shown *shown) |
70 | { | 70 | { |
71 | int w,h; | 71 | int w,h; |
72 | #ifdef HAVE_RTC | 72 | #ifdef CONFIG_RTC |
73 | struct tm *tm; | 73 | struct tm *tm; |
74 | #else | 74 | #else |
75 | (void)today; | 75 | (void)today; |
@@ -81,7 +81,7 @@ static void calendar_init(struct today *today, struct shown *shown) | |||
81 | use_system_font = true; | 81 | use_system_font = true; |
82 | } | 82 | } |
83 | rb->lcd_clear_display(); | 83 | rb->lcd_clear_display(); |
84 | #ifdef HAVE_RTC | 84 | #ifdef CONFIG_RTC |
85 | tm = rb->get_time(); | 85 | tm = rb->get_time(); |
86 | today->mon = tm->tm_mon +1; | 86 | today->mon = tm->tm_mon +1; |
87 | today->year = 2000+tm->tm_year%100; | 87 | 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. | |||
78 | #include "plugin.h" | 78 | #include "plugin.h" |
79 | #include "time.h" | 79 | #include "time.h" |
80 | 80 | ||
81 | #if defined(HAVE_LCD_BITMAP) && defined(HAVE_RTC) | 81 | #if defined(HAVE_LCD_BITMAP) && defined(CONFIG_RTC) |
82 | 82 | ||
83 | #define CLOCK_VERSION "2.60" | 83 | #define CLOCK_VERSION "2.60" |
84 | 84 | ||