mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-27 16:39:08 +00:00
RTC_CENTURY usage ifdefed out by USE_RTC_CENTURY compile option,
pointed by Bruce
This commit is contained in:
Andrey A. Chernov
parent
8baf4dac64
commit
3bbe7b72df
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=3355
@ -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++)
|
||||
|
||||
@ -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++)
|
||||
|
||||
@ -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++)
|
||||
|
||||
@ -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++)
|
||||
|
||||
@ -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++)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user