Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 29747
b: refs/heads/master
c: 8232212
h: refs/heads/master
i:
  29745: edf79c4
  29743: e7d0f14
v: v3
  • Loading branch information
Andrew Victor authored and Linus Torvalds committed Jun 25, 2006
1 parent 009f43a commit b88f856
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 362600fe60fd18a25b4de8ec544b9e24e77e1484
refs/heads/master: 8232212e0b4ee4eb3e407f5a9b098f6377820164
19 changes: 19 additions & 0 deletions trunk/drivers/rtc/rtc-lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,34 @@ static const unsigned char rtc_days_in_month[] = {
31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31
};

static const unsigned short rtc_ydays[2][13] = {
/* Normal years */
{ 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334, 365 },
/* Leap years */
{ 0, 31, 60, 91, 121, 152, 182, 213, 244, 274, 305, 335, 366 }
};

#define LEAPS_THRU_END_OF(y) ((y)/4 - (y)/100 + (y)/400)
#define LEAP_YEAR(year) ((!(year % 4) && (year % 100)) || !(year % 400))

/*
* The number of days in the month.
*/
int rtc_month_days(unsigned int month, unsigned int year)
{
return rtc_days_in_month[month] + (LEAP_YEAR(year) && month == 1);
}
EXPORT_SYMBOL(rtc_month_days);

/*
* The number of days since January 1. (0 to 365)
*/
int rtc_year_days(unsigned int day, unsigned int month, unsigned int year)
{
return rtc_ydays[LEAP_YEAR(year)][month] + day-1;
}
EXPORT_SYMBOL(rtc_year_days);

/*
* Convert seconds since 01-01-1970 00:00:00 to Gregorian date.
*/
Expand Down
1 change: 1 addition & 0 deletions trunk/include/linux/rtc.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ struct rtc_pll_info {
#include <linux/interrupt.h>

extern int rtc_month_days(unsigned int month, unsigned int year);
extern int rtc_year_days(unsigned int day, unsigned int month, unsigned int year);
extern int rtc_valid_tm(struct rtc_time *tm);
extern int rtc_tm_to_time(struct rtc_time *tm, unsigned long *time);
extern void rtc_time_to_tm(unsigned long time, struct rtc_time *tm);
Expand Down

0 comments on commit b88f856

Please sign in to comment.