diff options
| author | ache <ache@FreeBSD.org> | 1994-10-04 13:59:44 +0000 |
|---|---|---|
| committer | ache <ache@FreeBSD.org> | 1994-10-04 13:59:44 +0000 |
| commit | 7625b88d8313fe9bc89cf0117531c41861286150 (patch) | |
| tree | 02c85f8f723eff6cd45077dbebc7e89252252653 | |
| parent | 2745117c81d4d4116cfd520ca52051fd3fdda1cf (diff) | |
| download | FreeBSD-src-7625b88d8313fe9bc89cf0117531c41861286150.zip FreeBSD-src-7625b88d8313fe9bc89cf0117531c41861286150.tar.gz | |
RTC_CENTURY usage ifdefed out by USE_RTC_CENTURY compile option,
pointed by Bruce
| -rw-r--r-- | sys/amd64/amd64/tsc.c | 10 | ||||
| -rw-r--r-- | sys/amd64/isa/clock.c | 10 | ||||
| -rw-r--r-- | sys/i386/i386/tsc.c | 10 | ||||
| -rw-r--r-- | sys/i386/isa/clock.c | 10 | ||||
| -rw-r--r-- | sys/isa/atrtc.c | 10 |
5 files changed, 45 insertions, 5 deletions
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index d6409f2..4e0aaf8 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.21 1994/09/20 21:20:46 bde Exp $ + * $Id: clock.c,v 1.22 1994/09/29 08:24:45 sos Exp $ */ /* @@ -420,7 +420,13 @@ inittodr(time_t base) while (rtcin(RTC_STATUSA) & RTCSA_TUP); days = 0; +#ifdef USE_RTC_CENTURY year = readrtc(RTC_YEAR) + readrtc(RTC_CENTURY) * 100; +#else + year = readrtc(RTC_YEAR) + 1900; + if (year < 1970) + year += 100; +#endif if (year < 1970) goto wrong_time; month = readrtc(RTC_MONTH); @@ -484,7 +490,9 @@ void resettodr() /* Now we have the years in y and the day-of-the-year in tm */ writertc(RTC_YEAR, int2bcd(y%100)); /* Write back Year */ +#ifdef USE_RTC_CENTURY writertc(RTC_CENTURY, int2bcd(y/100)); /* ... and Century */ +#endif if (LEAPYEAR(y) && (tm >= 31+29)) tm--; /* Subtract Feb-29 */ for (m=1;; m++) diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index d6409f2..4e0aaf8 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.21 1994/09/20 21:20:46 bde Exp $ + * $Id: clock.c,v 1.22 1994/09/29 08:24:45 sos Exp $ */ /* @@ -420,7 +420,13 @@ inittodr(time_t base) while (rtcin(RTC_STATUSA) & RTCSA_TUP); days = 0; +#ifdef USE_RTC_CENTURY year = readrtc(RTC_YEAR) + readrtc(RTC_CENTURY) * 100; +#else + year = readrtc(RTC_YEAR) + 1900; + if (year < 1970) + year += 100; +#endif if (year < 1970) goto wrong_time; month = readrtc(RTC_MONTH); @@ -484,7 +490,9 @@ void resettodr() /* Now we have the years in y and the day-of-the-year in tm */ writertc(RTC_YEAR, int2bcd(y%100)); /* Write back Year */ +#ifdef USE_RTC_CENTURY writertc(RTC_CENTURY, int2bcd(y/100)); /* ... and Century */ +#endif if (LEAPYEAR(y) && (tm >= 31+29)) tm--; /* Subtract Feb-29 */ for (m=1;; m++) diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index d6409f2..4e0aaf8 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.21 1994/09/20 21:20:46 bde Exp $ + * $Id: clock.c,v 1.22 1994/09/29 08:24:45 sos Exp $ */ /* @@ -420,7 +420,13 @@ inittodr(time_t base) while (rtcin(RTC_STATUSA) & RTCSA_TUP); days = 0; +#ifdef USE_RTC_CENTURY year = readrtc(RTC_YEAR) + readrtc(RTC_CENTURY) * 100; +#else + year = readrtc(RTC_YEAR) + 1900; + if (year < 1970) + year += 100; +#endif if (year < 1970) goto wrong_time; month = readrtc(RTC_MONTH); @@ -484,7 +490,9 @@ void resettodr() /* Now we have the years in y and the day-of-the-year in tm */ writertc(RTC_YEAR, int2bcd(y%100)); /* Write back Year */ +#ifdef USE_RTC_CENTURY writertc(RTC_CENTURY, int2bcd(y/100)); /* ... and Century */ +#endif if (LEAPYEAR(y) && (tm >= 31+29)) tm--; /* Subtract Feb-29 */ for (m=1;; m++) diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index d6409f2..4e0aaf8 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.21 1994/09/20 21:20:46 bde Exp $ + * $Id: clock.c,v 1.22 1994/09/29 08:24:45 sos Exp $ */ /* @@ -420,7 +420,13 @@ inittodr(time_t base) while (rtcin(RTC_STATUSA) & RTCSA_TUP); days = 0; +#ifdef USE_RTC_CENTURY year = readrtc(RTC_YEAR) + readrtc(RTC_CENTURY) * 100; +#else + year = readrtc(RTC_YEAR) + 1900; + if (year < 1970) + year += 100; +#endif if (year < 1970) goto wrong_time; month = readrtc(RTC_MONTH); @@ -484,7 +490,9 @@ void resettodr() /* Now we have the years in y and the day-of-the-year in tm */ writertc(RTC_YEAR, int2bcd(y%100)); /* Write back Year */ +#ifdef USE_RTC_CENTURY writertc(RTC_CENTURY, int2bcd(y/100)); /* ... and Century */ +#endif if (LEAPYEAR(y) && (tm >= 31+29)) tm--; /* Subtract Feb-29 */ for (m=1;; m++) diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index d6409f2..4e0aaf8 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)clock.c 7.2 (Berkeley) 5/12/91 - * $Id: clock.c,v 1.21 1994/09/20 21:20:46 bde Exp $ + * $Id: clock.c,v 1.22 1994/09/29 08:24:45 sos Exp $ */ /* @@ -420,7 +420,13 @@ inittodr(time_t base) while (rtcin(RTC_STATUSA) & RTCSA_TUP); days = 0; +#ifdef USE_RTC_CENTURY year = readrtc(RTC_YEAR) + readrtc(RTC_CENTURY) * 100; +#else + year = readrtc(RTC_YEAR) + 1900; + if (year < 1970) + year += 100; +#endif if (year < 1970) goto wrong_time; month = readrtc(RTC_MONTH); @@ -484,7 +490,9 @@ void resettodr() /* Now we have the years in y and the day-of-the-year in tm */ writertc(RTC_YEAR, int2bcd(y%100)); /* Write back Year */ +#ifdef USE_RTC_CENTURY writertc(RTC_CENTURY, int2bcd(y/100)); /* ... and Century */ +#endif if (LEAPYEAR(y) && (tm >= 31+29)) tm--; /* Subtract Feb-29 */ for (m=1;; m++) |
