diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-22 15:24:30 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-01-22 15:24:30 +0000 |
| commit | 337c389c5c1d5bd367cc8468ba7a0783fe707a06 (patch) | |
| tree | 8aee43cccb5560dee404ecf92b6ac02c4fd7de78 | |
| parent | 9aa1d492e0529dcfaa20c3d299490c05afede407 (diff) | |
Finally update the todclock on shutdown, if we are using a level 6 clock.
| -rw-r--r-- | sys/arch/mac68k/mac68k/machdep.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/sys/arch/mac68k/mac68k/machdep.c b/sys/arch/mac68k/mac68k/machdep.c index b3c362c9dc4..477a8656944 100644 --- a/sys/arch/mac68k/mac68k/machdep.c +++ b/sys/arch/mac68k/mac68k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.128 2006/01/22 13:53:16 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.129 2006/01/22 15:24:29 miod Exp $ */ /* $NetBSD: machdep.c,v 1.207 1998/07/08 04:39:34 thorpej Exp $ */ /* @@ -623,21 +623,22 @@ boot(howto) waittime = 0; vfs_shutdown(); - /* - * If we've been adjusting the clock, the todr - * will be out of synch; adjust it now unless - * the system was sitting in ddb. - */ - if ((howto & RB_TIMEBAD) == 0) { -#ifdef notyet - resettodr(); -#else + if (mac68k_machine.aux_interrupts != 0) { + /* + * If we've been adjusting the clock, the todr + * will be out of synch; adjust it now unless + * the system was sitting in ddb. + */ + if ((howto & RB_TIMEBAD) == 0) { + resettodr(); + } else { + printf("WARNING: not updating battery clock\n"); + } + } else { #ifdef DIAGNOSTIC - printf("OpenBSD/mac68k does not trust itself to update the clock on shutdown.\n"); + printf("OpenBSD/mac68k does not trust itself to update" + " the clock on shutdown on this machine.\n"); #endif -#endif - } else { - printf("WARNING: not updating battery clock\n"); } } |