diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-09-27 21:10:48 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-09-27 21:10:48 +0000 |
| commit | 93a1c90f4944d663edfe37460a1d7bbabfcde86a (patch) | |
| tree | 5cedd9d6b7557b0614b7d5a639918ac0f1db3da7 /sys/arch | |
| parent | 781a8549c91f3a866d4fd39207cebde05258ba2a (diff) | |
make options TIMEZONE and DST work; from form
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amd64/isa/clock.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sys/arch/amd64/isa/clock.c b/sys/arch/amd64/isa/clock.c index 88d469685c9..43a7849f9a2 100644 --- a/sys/arch/amd64/isa/clock.c +++ b/sys/arch/amd64/isa/clock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clock.c,v 1.5 2004/06/28 01:52:26 deraadt Exp $ */ +/* $OpenBSD: clock.c,v 1.6 2005/09/27 21:10:47 deraadt Exp $ */ /* $NetBSD: clock.c,v 1.1 2003/04/26 18:39:50 fvdl Exp $ */ /*- @@ -743,7 +743,9 @@ inittodr(base) } } - time.tv_sec = clock_ymdhms_to_secs(&dt); + time.tv_sec = clock_ymdhms_to_secs(&dt) + tz.tz_minuteswest * 60; + if (tz.tz_dsttime) + time.tv_sec -= 3600; #ifdef DEBUG_CLOCK printf("readclock: %ld (%ld)\n", time.tv_sec, base); #endif @@ -779,8 +781,7 @@ resettodr() { mc_todregs rtclk; struct clock_ymdhms dt; - int century; - int s; + int century, diff, s; /* * We might have been called by boot() due to a crash early @@ -794,7 +795,10 @@ resettodr() memset(&rtclk, 0, sizeof(rtclk)); splx(s); - clock_secs_to_ymdhms(time.tv_sec, &dt); + diff = tz.tz_minuteswest * 60; + if (tz.tz_dsttime) + diff -= 3600; + clock_secs_to_ymdhms(time.tv_sec - diff, &dt); rtclk[MC_SEC] = bintobcd(dt.dt_sec); rtclk[MC_MIN] = bintobcd(dt.dt_min); |