forked from len0rd/rockbox
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
This commit is contained in:
parent
0ea71be348
commit
8c800cf59a
27 changed files with 48 additions and 62 deletions
|
@ -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 */
|
||||
|
|
|
@ -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
|
||||
{
|
||||
|
|
|
@ -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) {
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue