From 8c800cf59af23eaa22b97e89556640f63998b9bd Mon Sep 17 00:00:00 2001 From: Dave Chapman 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 --- firmware/export/config-fmrecorder.h | 5 +---- firmware/export/config-gmini120.h | 5 +---- firmware/export/config-recorder.h | 5 +---- firmware/export/config-recorderv2.h | 5 +---- firmware/export/rtc.h | 4 ++-- 5 files changed, 6 insertions(+), 18 deletions(-) (limited to 'firmware/export') diff --git a/firmware/export/config-fmrecorder.h b/firmware/export/config-fmrecorder.h index 221472a..a96da0a 100644 --- a/firmware/export/config-fmrecorder.h +++ b/firmware/export/config-fmrecorder.h @@ -13,14 +13,11 @@ #define CONFIG_KEYPAD RECORDER_PAD /* define this if you have a real-time clock */ -#define HAVE_RTC 1 +#define CONFIG_RTC RTC_M41ST84W /* 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 a756664..29066ec 100644 --- a/firmware/export/config-gmini120.h +++ b/firmware/export/config-gmini120.h @@ -8,14 +8,11 @@ #define HAVE_LCD_BITMAP 1 /* define this if you have a real-time clock */ -#define HAVE_RTC 1 +#define CONFIG_RTC RTC_M41ST84W /* 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 97062c1..fee2b2a 100644 --- a/firmware/export/config-recorder.h +++ b/firmware/export/config-recorder.h @@ -13,14 +13,11 @@ #define CONFIG_KEYPAD RECORDER_PAD /* define this if you have a real-time clock */ -#define HAVE_RTC 1 +#define CONFIG_RTC RTC_M41ST84W /* 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 21fe0b2..dd0f550 100644 --- a/firmware/export/config-recorderv2.h +++ b/firmware/export/config-recorderv2.h @@ -13,14 +13,11 @@ #define CONFIG_KEYPAD RECORDER_PAD /* define this if you have a real-time clock */ -#define HAVE_RTC 1 +#define CONFIG_RTC RTC_M41ST84W /* 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/rtc.h b/firmware/export/rtc.h index fd793bc..88413c7 100644 --- a/firmware/export/rtc.h +++ b/firmware/export/rtc.h @@ -21,7 +21,7 @@ #include -#ifdef HAVE_RTC +#ifdef CONFIG_RTC void rtc_init(void); int rtc_read(unsigned char address); int rtc_read_multiple(unsigned char address, unsigned char *buf, int numbytes); @@ -35,6 +35,6 @@ bool rtc_check_alarm_started(bool release_alarm); bool rtc_check_alarm_flag(void); #endif /* HAVE_ALARM_MOD */ -#endif /* HAVE_RTC */ +#endif /* CONFIG_RTC */ #endif -- cgit v1.1