diff options
author | Boris Gjenero <dreamlayers@rockbox.org> | 2011-12-15 21:38:23 +0000 |
---|---|---|
committer | Boris Gjenero <dreamlayers@rockbox.org> | 2011-12-15 21:38:23 +0000 |
commit | 871c7bd34c48c74b2ac6df9a46c6b51f118f4b21 (patch) | |
tree | e9c86677bc5e1a96801b1e1b2a2b2ef9bbbba657 | |
parent | 213b8ce74b1d677014a07993ca6268cacccfe211 (diff) | |
download | rockbox-871c7bd34c48c74b2ac6df9a46c6b51f118f4b21.tar.gz rockbox-871c7bd34c48c74b2ac6df9a46c6b51f118f4b21.zip |
Add conditionals around functions that are only needed when RTC is present.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31301 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/common/timefuncs.c | 4 | ||||
-rw-r--r-- | firmware/include/timefuncs.h | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/firmware/common/timefuncs.c b/firmware/common/timefuncs.c index 7d385949b5..cffdb3951a 100644 --- a/firmware/common/timefuncs.c +++ b/firmware/common/timefuncs.c | |||
@@ -44,6 +44,7 @@ static void fill_default_tm(struct tm *tm) | |||
44 | } | 44 | } |
45 | #endif /* !CONFIG_RTC */ | 45 | #endif /* !CONFIG_RTC */ |
46 | 46 | ||
47 | #if CONFIG_RTC | ||
47 | bool valid_time(const struct tm *tm) | 48 | bool valid_time(const struct tm *tm) |
48 | { | 49 | { |
49 | if (tm->tm_hour < 0 || tm->tm_hour > 23 || | 50 | if (tm->tm_hour < 0 || tm->tm_hour > 23 || |
@@ -57,6 +58,7 @@ bool valid_time(const struct tm *tm) | |||
57 | else | 58 | else |
58 | return true; | 59 | return true; |
59 | } | 60 | } |
61 | #endif /* CONFIG_RTC */ | ||
60 | 62 | ||
61 | struct tm *get_time(void) | 63 | struct tm *get_time(void) |
62 | { | 64 | { |
@@ -103,6 +105,7 @@ int set_time(const struct tm *tm) | |||
103 | #endif /* RTC */ | 105 | #endif /* RTC */ |
104 | } | 106 | } |
105 | 107 | ||
108 | #if CONFIG_RTC | ||
106 | void set_day_of_week(struct tm *tm) | 109 | void set_day_of_week(struct tm *tm) |
107 | { | 110 | { |
108 | int y=tm->tm_year+1900; | 111 | int y=tm->tm_year+1900; |
@@ -113,4 +116,5 @@ void set_day_of_week(struct tm *tm) | |||
113 | if(m == 0 || m == 1) y--; | 116 | if(m == 0 || m == 1) y--; |
114 | tm->tm_wday = (d + mo[m] + y + y/4 - y/100 + y/400) % 7; | 117 | tm->tm_wday = (d + mo[m] + y + y/4 - y/100 + y/400) % 7; |
115 | } | 118 | } |
119 | #endif /* CONFIG_RTC */ | ||
116 | 120 | ||
diff --git a/firmware/include/timefuncs.h b/firmware/include/timefuncs.h index 86a41a516b..4c5f0fbb42 100644 --- a/firmware/include/timefuncs.h +++ b/firmware/include/timefuncs.h | |||
@@ -28,8 +28,10 @@ | |||
28 | 28 | ||
29 | struct tm *get_time(void); | 29 | struct tm *get_time(void); |
30 | int set_time(const struct tm *tm); | 30 | int set_time(const struct tm *tm); |
31 | #if CONFIG_RTC | ||
31 | bool valid_time(const struct tm *tm); | 32 | bool valid_time(const struct tm *tm); |
32 | void set_day_of_week(struct tm *tm); | 33 | void set_day_of_week(struct tm *tm); |
34 | #endif | ||
33 | 35 | ||
34 | #endif /* _TIMEFUNCS_H_ */ | 36 | #endif /* _TIMEFUNCS_H_ */ |
35 | 37 | ||