summaryrefslogtreecommitdiffstats
path: root/sys/isa
diff options
context:
space:
mode:
authordwmalone <dwmalone@FreeBSD.org>2007-07-23 09:42:32 +0000
committerdwmalone <dwmalone@FreeBSD.org>2007-07-23 09:42:32 +0000
commite8276674f3dc77e497ee2600cd45f51e731c6dab (patch)
tree9e35e0b6e5b6c0c6047ac01c3aa7bf287ef1c85d /sys/isa
parent9f42d6219fe8097ea3b6faf2beb93af539c11208 (diff)
downloadFreeBSD-src-e8276674f3dc77e497ee2600cd45f51e731c6dab.zip
FreeBSD-src-e8276674f3dc77e497ee2600cd45f51e731c6dab.tar.gz
If clock_ct_to_ts fails to convert time time from the real time clock,
print a one line error message. Add some comments on not being able to trust the day of week field (I'll act on these comments in a follow up commit). Approved by: re MFC after: 3 weeks
Diffstat (limited to 'sys/isa')
-rw-r--r--sys/isa/atrtc.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c
index f8e1c4e..a519a9e 100644
--- a/sys/isa/atrtc.c
+++ b/sys/isa/atrtc.c
@@ -679,8 +679,7 @@ inittodr(time_t base)
/* Look if we have a RTC present and the time is valid */
if (!(rtcin(RTC_STATUSD) & RTCSD_PWR)) {
- printf("Invalid time in real time clock.\n");
- printf("Check and reset the date immediately!\n");
+ printf("Invalid time in clock: check and reset the date!\n");
return;
}
@@ -704,7 +703,11 @@ inittodr(time_t base)
#else
ct.year += 2000;
#endif
- clock_ct_to_ts(&ct, &ts);
+ /* Should we set dow = -1 because some clocks don't set it correctly? */
+ if (clock_ct_to_ts(&ct, &ts)) {
+ printf("Invalid time in clock: check and reset the date!\n");
+ return;
+ }
ts.tv_sec += utc_offset();
tc_setclock(&ts);
}
OpenPOWER on IntegriCloud