Use RB_TIMEBAD in boot() to know not to update the battery backed up clock

via resettodr().  Make Sun3-only command "machine reboot" only print
a warning that the command is obsolete and that you should use the "boot"
command instead.

3 files changed, 13 insertions, 5 deletions

diff --git a/sys/arch/sun3/sun3/db_machdep.c b/sys/arch/sun3/sun3/db_machdep.c
index 15859331f52..9828cbf06ba 100644
--- a/sys/arch/sun3/sun3/db_machdep.c
+++ b/sys/arch/sun3/sun3/db_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: db_machdep.c,v 1.8 1997/01/16 04:04:16 kstailey Exp $	*/
+/*	$OpenBSD: db_machdep.c,v 1.9 1997/01/16 08:08:39 kstailey Exp $	*/
 /*	$NetBSD: db_machdep.c,v 1.8 1996/11/20 18:57:27 gwr Exp $	*/
 
 /*-
@@ -42,6 +42,7 @@
  */
 
 #include <sys/param.h>
+#include <sys/systm.h>
 #include <sys/proc.h>
 
 #include <vm/vm.h>
@@ -112,7 +113,7 @@ db_mach_pagemap(addr, have_addr, count, modif)
  * Machine-specific ddb commands for the sun3:
  *    abort:	Drop into monitor via abort (allows continue)
  *    halt: 	Exit to monitor as in halt(8)
- *    reboot:	Reboot the machine as in reboot(8)
+ *    reboot:	Reboot the machine as in reboot(8) XXX obsolete, use "boot" cmd
  *    pgmap:	Given addr, Print addr, segmap, pagemap, pte
  */
 
@@ -146,7 +147,11 @@ db_mach_reboot(addr, have_addr, count, modif)
         char *          modif;
 {
 
+#if 0 /* XXX */
         sun3_mon_reboot("");
+#else
+	db_printf("`machine reboot' command is obsolete, use `boot' command\n");
+#endif
 }
 
 struct db_command db_machine_cmds[] = {
diff --git a/sys/arch/sun3/sun3/machdep.c b/sys/arch/sun3/sun3/machdep.c
index 6f397c00a64..3c17165695b 100644
--- a/sys/arch/sun3/sun3/machdep.c
+++ b/sys/arch/sun3/sun3/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.12 1997/01/16 04:22:49 kstailey Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.13 1997/01/16 08:08:40 kstailey Exp $	*/
 /*	$NetBSD: machdep.c,v 1.77 1996/10/13 03:47:51 christos Exp $	*/
 
 /*
@@ -820,6 +820,9 @@ reboot2(howto, user_boot_string)
 		 */
 		if ((howto & RB_TIMEBAD) == 0) {
 			resettodr();
+		} else {
+			printf("WARNING: not updating battery clock\n");
+		}
 	}
 
 	/* Disable interrupts. */
diff --git a/sys/arch/sun3/sun3/sun3_startup.c b/sys/arch/sun3/sun3/sun3_startup.c
index 8cc867be464..9f9ed0b70b0 100644
--- a/sys/arch/sun3/sun3/sun3_startup.c
+++ b/sys/arch/sun3/sun3/sun3_startup.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sun3_startup.c,v 1.8 1997/01/16 04:04:33 kstailey Exp $	*/
+/*	$OpenBSD: sun3_startup.c,v 1.9 1997/01/16 08:08:41 kstailey Exp $	*/
 /*	$NetBSD: sun3_startup.c,v 1.55 1996/11/20 18:57:38 gwr Exp $	*/
 
 /*-
@@ -386,7 +386,7 @@ sun3_vm_init(kehp)
 	 */
 	avail_start = virtual_avail - KERNBASE;
 	if (romp->romvecVersion < 1) {
-		mon_printf("Warning: ancient PROM version=%d\n",
+		mon_printf("WARNING: ancient PROM version=%d\n",
 				   romp->romvecVersion);
 		/* Guess that PROM version 0.X used two pages. */
 		avail_end = *romp->memorySize - (2*NBPG);