add OpenBSD header

76 files changed, 361 insertions, 336 deletions

diff --git a/sys/arch/mvme68k/stand/bootsd/Makefile b/sys/arch/mvme68k/stand/bootsd/Makefile
index 779cbea0989..fc9b2523ea1 100644
--- a/sys/arch/mvme68k/stand/bootsd/Makefile
+++ b/sys/arch/mvme68k/stand/bootsd/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	     $Id: Makefile,v 1.2 1995/12/06 10:54:54 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/04/28 10:48:15 deraadt Exp $
 
 RELOC=0x3F0000 
 
diff --git a/sys/arch/mvme68k/stand/bootsd/boot.c b/sys/arch/mvme68k/stand/bootsd/boot.c
index e649328f1ee..b8f3e793ad3 100644
--- a/sys/arch/mvme68k/stand/bootsd/boot.c
+++ b/sys/arch/mvme68k/stand/bootsd/boot.c
@@ -1,4 +1,4 @@
-/*	$Id: boot.c,v 1.6 1996/02/16 00:13:18 rahnds Exp $ */
+/*	$OpenBSD: boot.c,v 1.7 1996/04/28 10:48:17 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/bootsd/bugdev.c b/sys/arch/mvme68k/stand/bootsd/bugdev.c
index 82776ab4c3a..b351549703f 100644
--- a/sys/arch/mvme68k/stand/bootsd/bugdev.c
+++ b/sys/arch/mvme68k/stand/bootsd/bugdev.c
@@ -1,4 +1,4 @@
-/*	$Id: bugdev.c,v 1.4 1995/12/06 10:54:55 deraadt Exp $ */
+/*	$OpenBSD: bugdev.c,v 1.5 1996/04/28 10:48:18 deraadt Exp $ */
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
diff --git a/sys/arch/mvme68k/stand/bootsd/filesystem.c b/sys/arch/mvme68k/stand/bootsd/filesystem.c
index 2f821cd81ba..e61da90466d 100644
--- a/sys/arch/mvme68k/stand/bootsd/filesystem.c
+++ b/sys/arch/mvme68k/stand/bootsd/filesystem.c
@@ -1,4 +1,4 @@
-/*	$Id: filesystem.c,v 1.2 1995/11/07 08:50:37 deraadt Exp $ */
+/*	$OpenBSD: filesystem.c,v 1.3 1996/04/28 10:48:19 deraadt Exp $ */
 
 /*
  * Copyright (c) 1993 Philip A. Nelson.
diff --git a/sys/arch/mvme68k/stand/bootsd/version.c b/sys/arch/mvme68k/stand/bootsd/version.c
index c30b7d2320e..dcb2a18ddf0 100644
--- a/sys/arch/mvme68k/stand/bootsd/version.c
+++ b/sys/arch/mvme68k/stand/bootsd/version.c
@@ -1,8 +1,8 @@
-/*	$Id: version.c,v 1.3 1995/12/06 10:54:56 deraadt Exp $ */
+/*	$OpenBSD: version.c,v 1.4 1996/04/28 10:48:19 deraadt Exp $ */
 
 /*
  * make a random change to this file when you want the bootblock
  * revision to increase. like change this x to a y, or something.
  */
 
-char *version = "$Revision: 1.3 $";
+char *version = "$Revision: 1.4 $";
diff --git a/sys/arch/mvme68k/stand/bootst/Makefile b/sys/arch/mvme68k/stand/bootst/Makefile
index 22a542722ae..07f4b4eaab1 100644
--- a/sys/arch/mvme68k/stand/bootst/Makefile
+++ b/sys/arch/mvme68k/stand/bootst/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	     $Id: Makefile,v 1.2 1995/10/23 03:38:29 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/04/28 10:48:23 deraadt Exp $
 
 RELOC=0x3F0000 
 
diff --git a/sys/arch/mvme68k/stand/bootst/bootst.c b/sys/arch/mvme68k/stand/bootst/bootst.c
index c07d07c7866..bc221143550 100644
--- a/sys/arch/mvme68k/stand/bootst/bootst.c
+++ b/sys/arch/mvme68k/stand/bootst/bootst.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: bootst.c,v 1.4 1996/04/28 10:48:24 deraadt Exp $ */
+
 #include <sys/types.h>
 #include <sys/param.h>
 #include <sys/reboot.h>
diff --git a/sys/arch/mvme68k/stand/bugcrt/Makefile b/sys/arch/mvme68k/stand/bugcrt/Makefile
index 6348eb31d5d..77f0238b762 100644
--- a/sys/arch/mvme68k/stand/bugcrt/Makefile
+++ b/sys/arch/mvme68k/stand/bugcrt/Makefile
@@ -1,4 +1,4 @@
-#    $Id: Makefile,v 1.2 1995/12/06 10:55:03 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/04/28 10:48:26 deraadt Exp $
 
 CFLAGS+=-I${.CURDIR}/../../include -O2
 
diff --git a/sys/arch/mvme68k/stand/bugcrt/Makefile.inc b/sys/arch/mvme68k/stand/bugcrt/Makefile.inc
index f2bae6c888c..76f65d824a2 100644
--- a/sys/arch/mvme68k/stand/bugcrt/Makefile.inc
+++ b/sys/arch/mvme68k/stand/bugcrt/Makefile.inc
@@ -1,3 +1,5 @@
+#	$OpenBSD: Makefile.inc,v 1.2 1996/04/28 10:48:27 deraadt Exp $
+
 BUG_CRT_DIR=${S}/arch/${MACHINE}/stand/bugcrt
 
 BUGCRT_DIR!= cd ${BUG_CRT_DIR}; \
diff --git a/sys/arch/mvme68k/stand/bugcrt/m68k/bugcrt.c b/sys/arch/mvme68k/stand/bugcrt/m68k/bugcrt.c
index dae7b3667dc..37641e2e7e1 100644
--- a/sys/arch/mvme68k/stand/bugcrt/m68k/bugcrt.c
+++ b/sys/arch/mvme68k/stand/bugcrt/m68k/bugcrt.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: bugcrt.c,v 1.3 1996/04/28 10:48:29 deraadt Exp $ */
+
 #include <sys/types.h>
 #include <machine/prom.h>
 
diff --git a/sys/arch/mvme68k/stand/bugcrt/m88k/bugcrt.c b/sys/arch/mvme68k/stand/bugcrt/m88k/bugcrt.c
index 711b4fe2035..09a34fbc410 100644
--- a/sys/arch/mvme68k/stand/bugcrt/m88k/bugcrt.c
+++ b/sys/arch/mvme68k/stand/bugcrt/m88k/bugcrt.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: bugcrt.c,v 1.3 1996/04/28 10:48:30 deraadt Exp $ */
+
 #include <sys/types.h>
 #include <machine/prom.h>
 
diff --git a/sys/arch/mvme68k/stand/libbug/Makefile b/sys/arch/mvme68k/stand/libbug/Makefile
index ba775e5693d..b0c606e5ad5 100644
--- a/sys/arch/mvme68k/stand/libbug/Makefile
+++ b/sys/arch/mvme68k/stand/libbug/Makefile
@@ -1,3 +1,5 @@
+#	$OpenBSD: Makefile,v 1.2 1996/04/28 10:48:33 deraadt Exp $
+
 LIB=bug
 
 NOPIC=
diff --git a/sys/arch/mvme68k/stand/libbug/Makefile.inc b/sys/arch/mvme68k/stand/libbug/Makefile.inc
index dc1ad6b04c8..1d08d0f59fd 100644
--- a/sys/arch/mvme68k/stand/libbug/Makefile.inc
+++ b/sys/arch/mvme68k/stand/libbug/Makefile.inc
@@ -1,3 +1,5 @@
+#	$OpenBSD: Makefile.inc,v 1.2 1996/04/28 10:48:34 deraadt Exp $
+
 LIB_BUG_DIR=${S}/arch/${MACHINE}/stand/libbug
 
 LIBBUG_DIR!= cd ${LIB_BUG_DIR}; \
diff --git a/sys/arch/mvme68k/stand/libbug/m68k/delay.c b/sys/arch/mvme68k/stand/libbug/m68k/delay.c
index a5c1f620084..570bf07f1fb 100644
--- a/sys/arch/mvme68k/stand/libbug/m68k/delay.c
+++ b/sys/arch/mvme68k/stand/libbug/m68k/delay.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: delay.c,v 1.2 1996/04/28 10:48:36 deraadt Exp $ */
+
 /*
  * bug routines -- assumes that the necessary sections of memory
  * are preserved.
diff --git a/sys/arch/mvme68k/stand/libbug/m68k/diskrd.c b/sys/arch/mvme68k/stand/libbug/m68k/diskrd.c
index b0ebde49624..60436fbee60 100644
--- a/sys/arch/mvme68k/stand/libbug/m68k/diskrd.c
+++ b/sys/arch/mvme68k/stand/libbug/m68k/diskrd.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: diskrd.c,v 1.2 1996/04/28 10:48:37 deraadt Exp $ */
+
 /*
  * bug routines -- assumes that the necessary sections of memory
  * are preserved.
diff --git a/sys/arch/mvme68k/stand/libbug/m68k/diskwr.c b/sys/arch/mvme68k/stand/libbug/m68k/diskwr.c
index 962b947ccb3..985d473de6a 100644
--- a/sys/arch/mvme68k/stand/libbug/m68k/diskwr.c
+++ b/sys/arch/mvme68k/stand/libbug/m68k/diskwr.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: diskwr.c,v 1.2 1996/04/28 10:48:38 deraadt Exp $ */
+
 /*
  * bug routines -- assumes that the necessary sections of memory
  * are preserved.
diff --git a/sys/arch/mvme68k/stand/libbug/m68k/getbrdid.c b/sys/arch/mvme68k/stand/libbug/m68k/getbrdid.c
index ded49ac3155..3854755919e 100644
--- a/sys/arch/mvme68k/stand/libbug/m68k/getbrdid.c
+++ b/sys/arch/mvme68k/stand/libbug/m68k/getbrdid.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: getbrdid.c,v 1.2 1996/04/28 10:48:39 deraadt Exp $ */
+
 /*
  * bug routines -- assumes that the necessary sections of memory
  * are preserved.
diff --git a/sys/arch/mvme68k/stand/libbug/m68k/instat.c b/sys/arch/mvme68k/stand/libbug/m68k/instat.c
index 5e2f2d3e69e..b533cfff873 100644
--- a/sys/arch/mvme68k/stand/libbug/m68k/instat.c
+++ b/sys/arch/mvme68k/stand/libbug/m68k/instat.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: instat.c,v 1.2 1996/04/28 10:48:43 deraadt Exp $ */
+
 /*
  * bug routines -- assumes that the necessary sections of memory
  * are preserved.
diff --git a/sys/arch/mvme68k/stand/libbug/m68k/outln.c b/sys/arch/mvme68k/stand/libbug/m68k/outln.c
index 344f0ed01f1..784c0ed7e6c 100644
--- a/sys/arch/mvme68k/stand/libbug/m68k/outln.c
+++ b/sys/arch/mvme68k/stand/libbug/m68k/outln.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: outln.c,v 1.2 1996/04/28 10:48:44 deraadt Exp $ */
+
 /*
  * bug routines -- assumes that the necessary sections of memory
  * are preserved.
diff --git a/sys/arch/mvme68k/stand/libbug/m68k/outstr.c b/sys/arch/mvme68k/stand/libbug/m68k/outstr.c
index b0a7c9ebc92..3cf9f4d69d5 100644
--- a/sys/arch/mvme68k/stand/libbug/m68k/outstr.c
+++ b/sys/arch/mvme68k/stand/libbug/m68k/outstr.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: outstr.c,v 1.2 1996/04/28 10:48:45 deraadt Exp $ */
+
 /*
  * bug routines -- assumes that the necessary sections of memory
  * are preserved.
diff --git a/sys/arch/mvme68k/stand/libbug/m68k/return.c b/sys/arch/mvme68k/stand/libbug/m68k/return.c
index 00206a16c48..230bb6a025c 100644
--- a/sys/arch/mvme68k/stand/libbug/m68k/return.c
+++ b/sys/arch/mvme68k/stand/libbug/m68k/return.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: return.c,v 1.2 1996/04/28 10:48:46 deraadt Exp $ */
+
 /*
  * bug routines -- assumes that the necessary sections of memory
  * are preserved.
diff --git a/sys/arch/mvme68k/stand/libbug/m68k/rtc_rd.c b/sys/arch/mvme68k/stand/libbug/m68k/rtc_rd.c
index 7b075c4fd9f..0f73e7b52ba 100644
--- a/sys/arch/mvme68k/stand/libbug/m68k/rtc_rd.c
+++ b/sys/arch/mvme68k/stand/libbug/m68k/rtc_rd.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: rtc_rd.c,v 1.2 1996/04/28 10:48:47 deraadt Exp $ */
+
 /*
  * bug routines -- assumes that the necessary sections of memory
  * are preserved.
diff --git a/sys/arch/mvme68k/stand/libbug/m88k/delay.c b/sys/arch/mvme68k/stand/libbug/m88k/delay.c
index 68b1db12106..8ff9478183c 100644
--- a/sys/arch/mvme68k/stand/libbug/m88k/delay.c
+++ b/sys/arch/mvme68k/stand/libbug/m88k/delay.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: delay.c,v 1.2 1996/04/28 10:48:49 deraadt Exp $ */
+
 /*
  * bug routines -- assumes that the necessary sections of memory
  * are preserved.
diff --git a/sys/arch/mvme68k/stand/libbug/ppc/bug.c b/sys/arch/mvme68k/stand/libbug/ppc/bug.c
index 02a1b1fd15b..205571aa325 100644
--- a/sys/arch/mvme68k/stand/libbug/ppc/bug.c
+++ b/sys/arch/mvme68k/stand/libbug/ppc/bug.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: bug.c,v 1.2 1996/04/28 10:48:50 deraadt Exp $ */
+
 /*
  * bug routines -- assumes that the necessary sections of memory
  * are preserved.
diff --git a/sys/arch/mvme68k/stand/libsa/Makefile b/sys/arch/mvme68k/stand/libsa/Makefile
index aa66902cd5e..0b56069a653 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile
+++ b/sys/arch/mvme68k/stand/libsa/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.7 1995/12/26 17:46:28 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.8 1996/04/28 10:48:52 deraadt Exp $
 
 LIB=sa
 
diff --git a/sys/arch/mvme68k/stand/libsa/Makefile.inc b/sys/arch/mvme68k/stand/libsa/Makefile.inc
index c402951fa76..acdd0379be9 100644
--- a/sys/arch/mvme68k/stand/libsa/Makefile.inc
+++ b/sys/arch/mvme68k/stand/libsa/Makefile.inc
@@ -1,3 +1,5 @@
+#	$OpenBSD: Makefile.inc,v 1.2 1996/04/28 10:48:53 deraadt Exp $
+
 LIB_SA_DIR=${S}/arch/${MACHINE}/stand/libsa
 
 LIBSA_DIR!= cd ${LIB_SA_DIR}; \
diff --git a/sys/arch/mvme68k/stand/libsa/SRT0.S b/sys/arch/mvme68k/stand/libsa/SRT0.S
index 922c21a2bf7..a938029049d 100644
--- a/sys/arch/mvme68k/stand/libsa/SRT0.S
+++ b/sys/arch/mvme68k/stand/libsa/SRT0.S
@@ -1,4 +1,4 @@
-|	$Id: SRT0.S,v 1.4 1995/11/17 22:05:43 deraadt Exp $
+|	$OpenBSD: SRT0.S,v 1.5 1996/04/28 10:48:54 deraadt Exp $
 
 | Copyright (c) 1995 Theo de Raadt
 | 
diff --git a/sys/arch/mvme68k/stand/libsa/SRT1.c b/sys/arch/mvme68k/stand/libsa/SRT1.c
index 7469db57cfb..d065cc6920a 100644
--- a/sys/arch/mvme68k/stand/libsa/SRT1.c
+++ b/sys/arch/mvme68k/stand/libsa/SRT1.c
@@ -1,4 +1,4 @@
-/*	$Id: SRT1.c,v 1.2 1995/11/07 08:50:41 deraadt Exp $ */
+/*	$OpenBSD: SRT1.c,v 1.3 1996/04/28 10:48:55 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/libsa/bug.c b/sys/arch/mvme68k/stand/libsa/bug.c
index e0ac46017bf..2dc7f537e60 100644
--- a/sys/arch/mvme68k/stand/libsa/bug.c
+++ b/sys/arch/mvme68k/stand/libsa/bug.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: bug.c,v 1.3 1996/04/28 10:48:56 deraadt Exp $ */
+
 /*
  * Copyright (c) 1995 Theo de Raadt
  * All rights reserved.
diff --git a/sys/arch/mvme68k/stand/libsa/clock.c b/sys/arch/mvme68k/stand/libsa/clock.c
index c937a90085d..f56085c83ba 100644
--- a/sys/arch/mvme68k/stand/libsa/clock.c
+++ b/sys/arch/mvme68k/stand/libsa/clock.c
@@ -1,79 +1,30 @@
-/*	$NetBSD: clock.c,v 1.1.1.1 1995/07/25 23:12:22 chuck Exp $ */
-
-/*
- * Copyright (c) 1992, 1993
- *	The Regents of the University of California.  All rights reserved.
- * Copyright (c) 1994 Gordon W. Ross
- * Copyright (c) 1993 Adam Glass
- *
- * This software was developed by the Computer Systems Engineering group
- * at Lawrence Berkeley Laboratory under DARPA contract BG 91-66 and
- * contributed to Berkeley.
- *
- * All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Lawrence Berkeley Laboratory.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This product includes software developed by the University of
- *	California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *	@(#)clock.c	8.1 (Berkeley) 6/11/93
- */
-
-/*
- * Clock driver.  
- */
+/*	$OpenBSD: clock.c,v 1.2 1996/04/28 10:48:57 deraadt Exp $ */
 
 #include <sys/types.h>
-#include "clockreg.h"
-static struct clockreg *clockreg = (struct clockreg *) CLOCK_ADDR;
 
-int hz = 1; /* XXX ? */
+#include "clockreg.h"
+#include "config.h"
+#include "clock.h"
 
 /*
  * BCD to decimal and decimal to BCD.
  */
-#define	FROMBCD(x)	(((x) >> 4) * 10 + ((x) & 0xf))
-#define	TOBCD(x)	(((x) / 10 * 16) + ((x) % 10))
+#define FROMBCD(x)      (((x) >> 4) * 10 + ((x) & 0xf))
+#define TOBCD(x)        (((x) / 10 * 16) + ((x) % 10))
 
-#define	SECDAY		(24 * 60 * 60)
-#define	SECYR		(SECDAY * 365)
-#define	LEAPYEAR(y)	(((y) & 3) == 0)
+#define SECDAY          (24 * 60 * 60)
+#define SECYR           (SECDAY * 365)
+#define LEAPYEAR(y)     (((y) & 3) == 0)
 
 /*
  * This code is defunct after 2068.
  * Will Unix still be here then??
  */
 const short dayyr[12] =
-    { 0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334 };
+{0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
 
-static u_long chiptotime(sec, min, hour, day, mon, year)
+static  u_long
+chiptotime(sec, min, hour, day, mon, year)
 	register int sec, min, hour, day, mon, year;
 {
 	register int days, yr;
@@ -84,7 +35,8 @@ static u_long chiptotime(sec, min, hour, day, mon, year)
 	day = FROMBCD(day);
 	mon = FROMBCD(mon);
 	year = FROMBCD(year) + YEAR0;
-	if (year < 70) year = 70;
+	if (year < 70)
+		year = 70;
 
 	/* simple sanity checks */
 	if (year < 70 || mon < 1 || mon > 12 || day < 1 || day > 31)
@@ -99,30 +51,31 @@ static u_long chiptotime(sec, min, hour, day, mon, year)
 	return (days * SECDAY + hour * 3600 + min * 60 + sec);
 }
 
-/*
- * Set up the system's time, given a `reasonable' time value.
- */
-time_t getsecs()
+time_t
+getsecs()
 {
-	register struct clockreg *cl = clockreg;
-	int sec, min, hour, day, mon, year;
+	extern int cputyp;
+	register struct clockreg *cl;
+	int     sec, min, hour, day, mon, year;
+
+	if (cputyp == CPU_147)
+		cl = (struct clockreg *) CLOCK_ADDR_147;
+	else
+		cl = (struct clockreg *) CLOCK_ADDR_16x;
 
-	cl->cl_csr |= CLK_READ;		/* enable read (stop time) */
+	cl->cl_csr |= CLK_READ; /* enable read (stop time) */
 	sec = cl->cl_sec;
 	min = cl->cl_min;
 	hour = cl->cl_hour;
 	day = cl->cl_mday;
 	mon = cl->cl_month;
 	year = cl->cl_year;
-	cl->cl_csr &= ~CLK_READ;	/* time wears on */
-	return(chiptotime(sec, min, hour, day, mon, year));
+	cl->cl_csr &= ~CLK_READ;/* time wears on */
+	return (chiptotime(sec, min, hour, day, mon, year));
 }
 
-/*
- * delay
- */
-
-int getticks()
+int
+getticks()
 {
-	return((int)getsecs());
+	return getsecs() * 100;
 }
diff --git a/sys/arch/mvme68k/stand/libsa/clock.h b/sys/arch/mvme68k/stand/libsa/clock.h
index d61bc9b03b8..f9958f65e05 100644
--- a/sys/arch/mvme68k/stand/libsa/clock.h
+++ b/sys/arch/mvme68k/stand/libsa/clock.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: clock.h,v 1.2 1996/04/28 10:48:58 deraadt Exp $ */
 
 extern int hz;
 
diff --git a/sys/arch/mvme68k/stand/libsa/clockreg.h b/sys/arch/mvme68k/stand/libsa/clockreg.h
index 0d3824186c7..86552700cf5 100644
--- a/sys/arch/mvme68k/stand/libsa/clockreg.h
+++ b/sys/arch/mvme68k/stand/libsa/clockreg.h
@@ -1,4 +1,4 @@
-/*	$Id: clockreg.h,v 1.2 1995/11/07 08:50:44 deraadt Exp $ */
+/*	$OpenBSD: clockreg.h,v 1.3 1996/04/28 10:48:58 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
diff --git a/sys/arch/mvme68k/stand/libsa/config.h b/sys/arch/mvme68k/stand/libsa/config.h
index d416250b56d..b29745edae3 100644
--- a/sys/arch/mvme68k/stand/libsa/config.h
+++ b/sys/arch/mvme68k/stand/libsa/config.h
@@ -1,4 +1,4 @@
-/*	$Id: config.h,v 1.2 1995/11/07 08:50:45 deraadt Exp $ */
+/*	$OpenBSD: config.h,v 1.3 1996/04/28 10:48:59 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/libsa/dev_disk.c b/sys/arch/mvme68k/stand/libsa/dev_disk.c
index fcb7a1a15b1..c204ebd094c 100644
--- a/sys/arch/mvme68k/stand/libsa/dev_disk.c
+++ b/sys/arch/mvme68k/stand/libsa/dev_disk.c
@@ -1,4 +1,4 @@
-/*	$Id: dev_disk.c,v 1.2 1995/11/07 08:50:46 deraadt Exp $ */
+/*	$OpenBSD: dev_disk.c,v 1.3 1996/04/28 10:49:00 deraadt Exp $ */
 
 /*
  * Copyright (c) 1993 Paul Kranenburg
diff --git a/sys/arch/mvme68k/stand/libsa/dev_disk.h b/sys/arch/mvme68k/stand/libsa/dev_disk.h
index 9f05f74bd82..442d400a78b 100644
--- a/sys/arch/mvme68k/stand/libsa/dev_disk.h
+++ b/sys/arch/mvme68k/stand/libsa/dev_disk.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: dev_disk.h,v 1.2 1996/04/28 10:49:01 deraadt Exp $ */
 
 int	disk_open __P((struct open_file *, ...));
 int	disk_close __P((struct open_file *));
diff --git a/sys/arch/mvme68k/stand/libsa/devopen.c b/sys/arch/mvme68k/stand/libsa/devopen.c
index 92c083983cb..9fe1f4e6dd6 100644
--- a/sys/arch/mvme68k/stand/libsa/devopen.c
+++ b/sys/arch/mvme68k/stand/libsa/devopen.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: devopen.c,v 1.3 1996/04/28 10:49:02 deraadt Exp $ */
 
 #include <sys/param.h>
 #include <stand.h>
diff --git a/sys/arch/mvme68k/stand/libsa/dvma.c b/sys/arch/mvme68k/stand/libsa/dvma.c
index 11526106c2a..bc7965e14d5 100644
--- a/sys/arch/mvme68k/stand/libsa/dvma.c
+++ b/sys/arch/mvme68k/stand/libsa/dvma.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: dvma.c,v 1.2 1996/04/28 10:49:03 deraadt Exp $ */
 
 /*
  * The easiest way to deal with the need for DVMA mappings is
diff --git a/sys/arch/mvme68k/stand/libsa/dvma.h b/sys/arch/mvme68k/stand/libsa/dvma.h
index 2b8be37cbe0..b99b9702f53 100644
--- a/sys/arch/mvme68k/stand/libsa/dvma.h
+++ b/sys/arch/mvme68k/stand/libsa/dvma.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: dvma.h,v 1.2 1996/04/28 10:49:03 deraadt Exp $ */
 
 char * dvma_mapin(char *pkt, int len);
 void dvma_mapout(char *dmabuf, int len);
diff --git a/sys/arch/mvme68k/stand/libsa/exec_sun.c b/sys/arch/mvme68k/stand/libsa/exec_sun.c
index 887330e6715..424406f20df 100644
--- a/sys/arch/mvme68k/stand/libsa/exec_sun.c
+++ b/sys/arch/mvme68k/stand/libsa/exec_sun.c
@@ -1,4 +1,4 @@
-/*	$Id: exec_sun.c,v 1.2 1995/11/07 08:50:47 deraadt Exp $ */
+/*	$OpenBSD: exec_sun.c,v 1.3 1996/04/28 10:49:04 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/libsa/gets.c b/sys/arch/mvme68k/stand/libsa/gets.c
index 455cbcddf85..b1e32ce2602 100644
--- a/sys/arch/mvme68k/stand/libsa/gets.c
+++ b/sys/arch/mvme68k/stand/libsa/gets.c
@@ -1,4 +1,4 @@
-/*	$Id: gets.c,v 1.2 1995/11/07 08:50:48 deraadt Exp $ */
+/*	$OpenBSD: gets.c,v 1.3 1996/04/28 10:49:05 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/libsa/netif_sun.c b/sys/arch/mvme68k/stand/libsa/netif_sun.c
index 28d2b742c26..a6887911c1a 100644
--- a/sys/arch/mvme68k/stand/libsa/netif_sun.c
+++ b/sys/arch/mvme68k/stand/libsa/netif_sun.c
@@ -1,4 +1,4 @@
-/*	$Id: netif_sun.c,v 1.2 1995/11/07 08:50:49 deraadt Exp $ */
+/*	$OpenBSD: netif_sun.c,v 1.3 1996/04/28 10:49:06 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
diff --git a/sys/arch/mvme68k/stand/libsa/panic.c b/sys/arch/mvme68k/stand/libsa/panic.c
index f7c83a6d8e7..6c035aabe11 100644
--- a/sys/arch/mvme68k/stand/libsa/panic.c
+++ b/sys/arch/mvme68k/stand/libsa/panic.c
@@ -1,3 +1,4 @@
+/*	$OpenBSD: panic.c,v 1.3 1996/04/28 10:49:07 deraadt Exp $ */
 
 #include <stdarg.h>
 #include "stand.h"
diff --git a/sys/arch/mvme68k/stand/libsa/promboot.c b/sys/arch/mvme68k/stand/libsa/promboot.c
index 2cc28a5b0cf..daff57fb861 100644
--- a/sys/arch/mvme68k/stand/libsa/promboot.c
+++ b/sys/arch/mvme68k/stand/libsa/promboot.c
@@ -1,4 +1,4 @@
-/*	$Id: promboot.c,v 1.2 1995/11/07 08:50:50 deraadt Exp $ */
+/*	$OpenBSD: promboot.c,v 1.3 1996/04/28 10:49:08 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/libsa/promboot.h b/sys/arch/mvme68k/stand/libsa/promboot.h
index 86b5aace21c..e96c103b773 100644
--- a/sys/arch/mvme68k/stand/libsa/promboot.h
+++ b/sys/arch/mvme68k/stand/libsa/promboot.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: promboot.h,v 1.2 1996/04/28 10:49:09 deraadt Exp $ */
 
 extern char prom_bootdev[];
 extern char prom_bootfile[];
diff --git a/sys/arch/mvme68k/stand/libsa/promcons.c b/sys/arch/mvme68k/stand/libsa/promcons.c
index 49e790f984d..01ae60ce576 100644
--- a/sys/arch/mvme68k/stand/libsa/promcons.c
+++ b/sys/arch/mvme68k/stand/libsa/promcons.c
@@ -1,4 +1,4 @@
-/*	$Id: promcons.c,v 1.2 1995/11/07 08:50:51 deraadt Exp $ */
+/*	$OpenBSD: promcons.c,v 1.3 1996/04/28 10:49:11 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/libsa/promdev.c b/sys/arch/mvme68k/stand/libsa/promdev.c
index 82c1ce50243..6362fcdcf01 100644
--- a/sys/arch/mvme68k/stand/libsa/promdev.c
+++ b/sys/arch/mvme68k/stand/libsa/promdev.c
@@ -1,4 +1,4 @@
-/*	$Id: promdev.c,v 1.2 1995/11/07 08:50:52 deraadt Exp $ */
+/*	$OpenBSD: promdev.c,v 1.3 1996/04/28 10:49:13 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
diff --git a/sys/arch/mvme68k/stand/libsa/promdev.h b/sys/arch/mvme68k/stand/libsa/promdev.h
index e3ae5ba2d7c..2a5bd89bffe 100644
--- a/sys/arch/mvme68k/stand/libsa/promdev.h
+++ b/sys/arch/mvme68k/stand/libsa/promdev.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: promdev.h,v 1.2 1996/04/28 10:49:14 deraadt Exp $ */
 
 int prom_iopen(struct saioreq **sipp);
 void prom_iclose(struct saioreq *sip);
diff --git a/sys/arch/mvme68k/stand/netboot/Makefile b/sys/arch/mvme68k/stand/netboot/Makefile
index 6ecfe3d04b8..fe6b0792bab 100644
--- a/sys/arch/mvme68k/stand/netboot/Makefile
+++ b/sys/arch/mvme68k/stand/netboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1995/11/07 08:50:55 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/04/28 10:49:16 deraadt Exp $
 
 RELOC=0x3F0000
 
diff --git a/sys/arch/mvme68k/stand/netboot/boot.c b/sys/arch/mvme68k/stand/netboot/boot.c
index eedbab78d9e..ba095695b77 100644
--- a/sys/arch/mvme68k/stand/netboot/boot.c
+++ b/sys/arch/mvme68k/stand/netboot/boot.c
@@ -1,4 +1,4 @@
-/*	$Id: boot.c,v 1.3 1995/11/07 08:50:57 deraadt Exp $ */
+/*	$OpenBSD: boot.c,v 1.4 1996/04/28 10:49:17 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/netboot/conf.c b/sys/arch/mvme68k/stand/netboot/conf.c
index 5af003e69f8..10c7f647710 100644
--- a/sys/arch/mvme68k/stand/netboot/conf.c
+++ b/sys/arch/mvme68k/stand/netboot/conf.c
@@ -1,4 +1,4 @@
-/*	$Id: conf.c,v 1.3 1995/11/07 08:50:58 deraadt Exp $ */
+/*	$OpenBSD: conf.c,v 1.4 1996/04/28 10:49:18 deraadt Exp $ */
 
 #include <sys/types.h>
 #include <netinet/in.h>
diff --git a/sys/arch/mvme68k/stand/netboot/dev_net.c b/sys/arch/mvme68k/stand/netboot/dev_net.c
index 3f0cef24cff..3242f28646f 100644
--- a/sys/arch/mvme68k/stand/netboot/dev_net.c
+++ b/sys/arch/mvme68k/stand/netboot/dev_net.c
@@ -1,4 +1,4 @@
-/*	$Id: dev_net.c,v 1.4 1995/11/17 22:13:11 deraadt Exp $ */
+/*	$OpenBSD: dev_net.c,v 1.5 1996/04/28 10:49:19 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Gordon W. Ross
diff --git a/sys/arch/mvme68k/stand/netboot/dev_net.h b/sys/arch/mvme68k/stand/netboot/dev_net.h
index 093ba193bfd..b6d35c84269 100644
--- a/sys/arch/mvme68k/stand/netboot/dev_net.h
+++ b/sys/arch/mvme68k/stand/netboot/dev_net.h
@@ -1,3 +1,4 @@
+/*	$OpenBSD: dev_net.h,v 1.2 1996/04/28 10:49:20 deraadt Exp $ */
 
 int	net_open __P((struct open_file *, ...));
 int	net_close __P((struct open_file *));
diff --git a/sys/arch/mvme68k/stand/netboot/i82586.h b/sys/arch/mvme68k/stand/netboot/i82586.h
index 9efae561a11..989fa89acfc 100644
--- a/sys/arch/mvme68k/stand/netboot/i82586.h
+++ b/sys/arch/mvme68k/stand/netboot/i82586.h
@@ -1,4 +1,4 @@
-/*	$Id: i82586.h,v 1.2 1995/11/07 08:51:00 deraadt Exp $ */
+/*	$OpenBSD: i82586.h,v 1.3 1996/04/28 10:49:21 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/netboot/if_ie.c b/sys/arch/mvme68k/stand/netboot/if_ie.c
index df5fabc8383..273463be844 100644
--- a/sys/arch/mvme68k/stand/netboot/if_ie.c
+++ b/sys/arch/mvme68k/stand/netboot/if_ie.c
@@ -1,4 +1,4 @@
-/*	$Id: if_ie.c,v 1.3 1995/11/07 08:51:00 deraadt Exp $ */
+/*	$OpenBSD: if_ie.c,v 1.4 1996/04/28 10:49:22 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/netboot/if_iereg.h b/sys/arch/mvme68k/stand/netboot/if_iereg.h
index a1ea9c3f228..cf2aa11038e 100644
--- a/sys/arch/mvme68k/stand/netboot/if_iereg.h
+++ b/sys/arch/mvme68k/stand/netboot/if_iereg.h
@@ -1,4 +1,4 @@
-/*	$Id: if_iereg.h,v 1.2 1995/11/07 08:51:01 deraadt Exp $ */
+/*	$OpenBSD: if_iereg.h,v 1.3 1996/04/28 10:49:23 deraadt Exp $ */
 
 /*
  * if_sunie.h
diff --git a/sys/arch/mvme68k/stand/netboot/if_le.c b/sys/arch/mvme68k/stand/netboot/if_le.c
index 36295a6e03c..bebb67774b2 100644
--- a/sys/arch/mvme68k/stand/netboot/if_le.c
+++ b/sys/arch/mvme68k/stand/netboot/if_le.c
@@ -1,4 +1,4 @@
-/*	$Id: if_le.c,v 1.4 1995/12/26 17:44:43 deraadt Exp $ */
+/*	$OpenBSD: if_le.c,v 1.5 1996/04/28 10:49:24 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/netboot/if_lereg.h b/sys/arch/mvme68k/stand/netboot/if_lereg.h
index 2af99f78c4d..685de369934 100644
--- a/sys/arch/mvme68k/stand/netboot/if_lereg.h
+++ b/sys/arch/mvme68k/stand/netboot/if_lereg.h
@@ -1,4 +1,4 @@
-/*	$Id: if_lereg.h,v 1.2 1995/11/07 08:51:03 deraadt Exp $ */
+/*	$OpenBSD: if_lereg.h,v 1.3 1996/04/28 10:49:25 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1982, 1992, 1993
diff --git a/sys/arch/mvme68k/stand/netboot/version.c b/sys/arch/mvme68k/stand/netboot/version.c
index 9d30196a20c..f1bb43abf9d 100644
--- a/sys/arch/mvme68k/stand/netboot/version.c
+++ b/sys/arch/mvme68k/stand/netboot/version.c
@@ -1,4 +1,4 @@
-/*	$Id: version.c,v 1.2 1995/11/07 08:51:04 deraadt Exp $ */
+/*	$OpenBSD: version.c,v 1.3 1996/04/28 10:49:26 deraadt Exp $ */
 
 /*
  *	NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.
@@ -6,4 +6,4 @@
  *	1.1
  */
 
-char *version = "$Revision: 1.2 $";
+char *version = "$Revision: 1.3 $";
diff --git a/sys/arch/mvme68k/stand/prtvid/Makefile b/sys/arch/mvme68k/stand/prtvid/Makefile
index f6a6d3e1e1a..67ceebda479 100644
--- a/sys/arch/mvme68k/stand/prtvid/Makefile
+++ b/sys/arch/mvme68k/stand/prtvid/Makefile
@@ -1,3 +1,5 @@
+#	$OpenBSD: Makefile,v 1.2 1996/04/28 10:49:28 deraadt Exp $
+
 PROG=	prtvid
 NOMAN=
 
diff --git a/sys/arch/mvme68k/stand/prtvid/prtvid.c b/sys/arch/mvme68k/stand/prtvid/prtvid.c
index 32784ff0dfa..d6c775875bc 100644
--- a/sys/arch/mvme68k/stand/prtvid/prtvid.c
+++ b/sys/arch/mvme68k/stand/prtvid/prtvid.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: prtvid.c,v 1.2 1996/04/28 10:49:29 deraadt Exp $ */
+
 #include <stdio.h>
 #define __DBINTERFACE_PRIVATE
 #include <db.h>
diff --git a/sys/arch/mvme68k/stand/sboot/Makefile b/sys/arch/mvme68k/stand/sboot/Makefile
index 990d05aeb7c..3f31cf3d1d3 100644
--- a/sys/arch/mvme68k/stand/sboot/Makefile
+++ b/sys/arch/mvme68k/stand/sboot/Makefile
@@ -1,4 +1,4 @@
-#	$Id: Makefile,v 1.2 1995/11/07 08:51:06 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.3 1996/04/28 10:49:31 deraadt Exp $
 
 S=	${.CURDIR}/../../../..
 INCL?= -I${.CURDIR} -I${.CURDIR}/../libsa -I${S}/lib/libsa -I${S}
diff --git a/sys/arch/mvme68k/stand/sboot/XBUG.S b/sys/arch/mvme68k/stand/sboot/XBUG.S
index 288f1427b21..e3016b8ad0c 100644
--- a/sys/arch/mvme68k/stand/sboot/XBUG.S
+++ b/sys/arch/mvme68k/stand/sboot/XBUG.S
@@ -1,3 +1,5 @@
+/*	$OpenBSD: XBUG.S,v 1.3 1996/04/28 10:49:32 deraadt Exp $ */
+
 /*
  * Copyright (c) 1995 Theo de Raadt
  * 
diff --git a/sys/arch/mvme68k/stand/sboot/XSRT0.S b/sys/arch/mvme68k/stand/sboot/XSRT0.S
index 805528203f2..793413eb2ed 100644
--- a/sys/arch/mvme68k/stand/sboot/XSRT0.S
+++ b/sys/arch/mvme68k/stand/sboot/XSRT0.S
@@ -1,3 +1,5 @@
+/*	$OpenBSD: XSRT0.S,v 1.3 1996/04/28 10:49:33 deraadt Exp $ */
+
 /*
  * Copyright (c) 1995 Theo de Raadt
  * 
diff --git a/sys/arch/mvme68k/stand/sboot/clock.c b/sys/arch/mvme68k/stand/sboot/clock.c
index 41598b07c0e..9f2300d53b2 100644
--- a/sys/arch/mvme68k/stand/sboot/clock.c
+++ b/sys/arch/mvme68k/stand/sboot/clock.c
@@ -1,4 +1,4 @@
-/*	$Id: clock.c,v 1.2 1995/11/07 08:51:08 deraadt Exp $ */
+/*	$OpenBSD: clock.c,v 1.3 1996/04/28 10:49:34 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
diff --git a/sys/arch/mvme68k/stand/sboot/clockreg.h b/sys/arch/mvme68k/stand/sboot/clockreg.h
index e39c1d30d42..cfd00fb2a78 100644
--- a/sys/arch/mvme68k/stand/sboot/clockreg.h
+++ b/sys/arch/mvme68k/stand/sboot/clockreg.h
@@ -1,4 +1,4 @@
-/*	$Id: clockreg.h,v 1.2 1995/11/07 08:51:09 deraadt Exp $ */
+/*	$OpenBSD: clockreg.h,v 1.3 1996/04/28 10:49:35 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
diff --git a/sys/arch/mvme68k/stand/sboot/etherfun.c b/sys/arch/mvme68k/stand/sboot/etherfun.c
index 7c107b00e8a..37b920a79b8 100644
--- a/sys/arch/mvme68k/stand/sboot/etherfun.c
+++ b/sys/arch/mvme68k/stand/sboot/etherfun.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: etherfun.c,v 1.2 1996/04/28 10:49:36 deraadt Exp $ */
+
 /*
  *
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
@@ -31,183 +33,185 @@
  */
 /* etherfun.c */
 
+#include <sys/cdefs.h>
 #include "sboot.h"
 #include "etherfun.h"
 
 /* Construct and send a rev arp packet */
 void
-do_rev_arp () 
+do_rev_arp()
 {
-  int i;
-  
-  for ( i = 0; i < 6; i++ ) {
-    eh->ether_dhost[i] = 0xff;
-  }
-  bcopy(myea, eh->ether_shost, 6);
-  eh->ether_type = ETYPE_RARP;
-  
-  rarp->ar_hrd = 1;              /* hardware type is 1 */
-  rarp->ar_pro = PTYPE_IP;
-  rarp->ar_hln = 6;              /* length of hardware address is 6 bytes */
-  rarp->ar_pln = 4;              /* length of ip address is 4 byte */
-  rarp->ar_op = OPCODE_RARP;
-  bcopy(myea, rarp->arp_sha, sizeof(myea));
-  bcopy(myea, rarp->arp_tha, sizeof(myea));
-  for ( i = 0; i < 4; i++ ) {
-    rarp->arp_spa[i] = rarp->arp_tpa[i] = 0x00;
-  }
-
-  le_put(buf, 76);
+	int     i;
+
+	for (i = 0; i < 6; i++)
+		eh->ether_dhost[i] = 0xff;
+
+	bcopy(myea, eh->ether_shost, 6);
+	eh->ether_type = ETYPE_RARP;
+
+	rarp->ar_hrd = 1;	/* hardware type is 1 */
+	rarp->ar_pro = PTYPE_IP;
+	rarp->ar_hln = 6;	/* length of hardware address is 6 bytes */
+	rarp->ar_pln = 4;	/* length of ip address is 4 byte */
+	rarp->ar_op = OPCODE_RARP;
+	bcopy(myea, rarp->arp_sha, sizeof(myea));
+	bcopy(myea, rarp->arp_tha, sizeof(myea));
+	for (i = 0; i < 4; i++)
+		rarp->arp_spa[i] = rarp->arp_tpa[i] = 0x00;
+
+	le_put(buf, 76);
 }
-  
-/* Recieve and disassemble the rev_arp reply */
 
+/* Receive and disassemble the rev_arp reply */
 int
-get_rev_arp () 
+get_rev_arp()
 {
-  le_get(buf, sizeof(buf), 6);
-  if ( eh->ether_type == ETYPE_RARP && rarp->ar_op == OPCODE_REPLY ) {
-    bcopy(rarp->arp_tpa, myip,  sizeof(rarp->arp_tpa));
-    bcopy(rarp->arp_spa, servip, sizeof(rarp->arp_spa));
-    bcopy(rarp->arp_sha, servea, sizeof(rarp->arp_sha));
-    return 1;
-  }
-  return 0;
+	le_get(buf, sizeof(buf), 6);
+	if (eh->ether_type == ETYPE_RARP && rarp->ar_op == OPCODE_REPLY) {
+		bcopy(rarp->arp_tpa, myip, sizeof(rarp->arp_tpa));
+		bcopy(rarp->arp_spa, servip, sizeof(rarp->arp_spa));
+		bcopy(rarp->arp_sha, servea, sizeof(rarp->arp_sha));
+		return (1);
+	}
+	return (0);
 }
 
 /* Try to get a reply to a rev arp request */
-
-int 
-rev_arp () 
-{
-  int tries = 0;
-  while ( tries < 5 ) {
-    do_rev_arp();
-    if ( get_rev_arp() ) {
-      return 1;
-    }
-    tries++;
-  }
-  return 0;
-} 
-
-/* Send a tftp read request or acknowledgement 
-   mesgtype 0 is a read request, 1 is an aknowledgement */
-
-void 
-do_send_tftp ( int mesgtype ) 
+int
+rev_arp()
 {
-  u_long res, iptmp, lcv;
-  char *tot;
-
-  if ( mesgtype == 0 ) {
-    tot = tftp_r + (sizeof(MSG)-1);
-    myport = (u_short)time();
-    if (myport < 1000) myport += 1000;
-    servport = FTP_PORT; /* to start */
-  } else {
-    tot = (char *)tftp_a + 4;
-  }
-
-  bcopy (servea, eh->ether_dhost, sizeof(servea));
-  bcopy (myea, eh->ether_shost, sizeof(myea));
-  eh->ether_type = ETYPE_IP;
-  
-  iph->ip_v = IP_VERSION;
-  iph->ip_hl = IP_HLEN;   
-  iph->ip_tos = 0;         /* type of service is 0 */
-  iph->ip_id = 0;          /* id field is 0 */
-  iph->ip_off = IP_DF;
-  iph->ip_ttl = 3;         /* time to live is 3 seconds/hops */
-  iph->ip_p = IPP_UDP;
-  bcopy(myip, iph->ip_src, sizeof(myip));
-  bcopy(servip, iph->ip_dst, sizeof(servip));
-  iph->ip_sum = 0;
-  iph->ip_len = tot - (char *)iph;
-  res = oc_cksum(iph, sizeof(struct ip), 0);
-  iph->ip_sum = 0xffff & ~res;
-  udph->uh_sport = myport;
-  udph->uh_dport = servport;
-  udph->uh_sum = 0;
-  
-  if ( mesgtype )  {
-    tftp_a->op_code = FTPOP_ACKN;
-    tftp_a->block = (u_short)(mesgtype);
-  } else {
-    bcopy (myip, &iptmp, sizeof(iptmp));
-    bcopy(MSG, tftp_r, (sizeof(MSG)-1));
-    for (lcv = 9; lcv >= 2; lcv--) {
-      tftp_r[lcv] = "0123456789ABCDEF"[iptmp & 0xF];
-      
-      iptmp = iptmp >> 4;
-    }
-  }
-
-  udph->uh_ulen = tot - (char *)udph;
-
-  le_put( buf, tot - buf);
+	int     tries = 0;
+	while (tries < 5) {
+		do_rev_arp();
+		if (get_rev_arp())
+			return (1);
+		tries++;
+	}
+	return (0);
 }
 
-/* Attempt to tftp a file and read it into memory */
-
-int
-do_get_file () 
+/*
+ * Send a tftp read request or acknowledgement
+ * mesgtype 0 is a read request, 1 is an
+ * acknowledgement
+ */
+void
+do_send_tftp(mesgtype)
+	int mesgtype;
 {
-  int fail = 0, oldlen;
-  char *loadat = (char *)LOAD_ADDR;
-  last_ack = 0;
-
-  do_send_tftp( READ );
-  while (1) {
-    if ( le_get(buf, sizeof(buf), 5) == 0) { /* timeout occured */
-      if ( last_ack ) {                          
-	do_send_tftp( last_ack );
-      } else {
-	do_send_tftp( READ );
-      }
-      fail++;
-      if ( fail > 5 ) {
-        printf("\n");
-	return 1;
-      }
-    } else {
-      printf("%x \r", tftp->info.block*512);
-      if ((eh->ether_type != ETYPE_IP) || (iph->ip_p != IPP_UDP)) {
-	fail++;
-	continue;
-      }
-      if (servport == FTP_PORT) servport = udph->uh_sport;
-      if (tftp->info.op_code == FTPOP_ERR) {
-	printf("TFTP: Download error %d: %s\n", 
-	       tftp->info.block, tftp->data);
-        return 1;
-      }
-      if (tftp->info.block != last_ack + 1) { /* we recieved the wrong block */
-	if (tftp->info.block < last_ack +1) {
-	  do_send_tftp(tftp->info.block); /* ackn whatever we recieved */
+	u_long  res, iptmp, lcv;
+	char   *tot;
+
+	if (mesgtype == 0) {
+		tot = tftp_r + (sizeof(MSG) - 1);
+		myport = (u_short) time();
+		if (myport < 1000)
+			myport += 1000;
+		servport = FTP_PORT;	/* to start */
+	} else {
+		tot = (char *) tftp_a + 4;
+	}
+
+	bcopy(servea, eh->ether_dhost, sizeof(servea));
+	bcopy(myea, eh->ether_shost, sizeof(myea));
+	eh->ether_type = ETYPE_IP;
+
+	iph->ip_v = IP_VERSION;
+	iph->ip_hl = IP_HLEN;
+	iph->ip_tos = 0;	/* type of service is 0 */
+	iph->ip_id = 0;		/* id field is 0 */
+	iph->ip_off = IP_DF;
+	iph->ip_ttl = 3;	/* time to live is 3 seconds/hops */
+	iph->ip_p = IPP_UDP;
+	bcopy(myip, iph->ip_src, sizeof(myip));
+	bcopy(servip, iph->ip_dst, sizeof(servip));
+	iph->ip_sum = 0;
+	iph->ip_len = tot - (char *) iph;
+	res = oc_cksum(iph, sizeof(struct ip), 0);
+	iph->ip_sum = 0xffff & ~res;
+	udph->uh_sport = myport;
+	udph->uh_dport = servport;
+	udph->uh_sum = 0;
+
+	if (mesgtype) {
+		tftp_a->op_code = FTPOP_ACKN;
+		tftp_a->block = (u_short) (mesgtype);
 	} else {
-	  do_send_tftp( last_ack );       /* ackn the last confirmed block */
-        }
-	fail++;
-      } else {                /* we got the right block */
-	fail = 0;
-	last_ack++;
-        oldlen = udph->uh_ulen;
-	do_send_tftp( last_ack );
-	/*printf("bcopy %x %x %d\n", &tftp->data, loadat, oldlen - 12);*/
-	bcopy(&tftp->data, loadat, oldlen - 12);
-	loadat += oldlen - 12;
-	if (oldlen < (8 + 4 + 512)) {
-          printf("\n");
-	  return 0;
-        }
-      }
-    }
-  }
-  printf("\n");
-  return 0;
-} 
+		bcopy(myip, &iptmp, sizeof(iptmp));
+		bcopy(MSG, tftp_r, (sizeof(MSG) - 1));
+		for (lcv = 9; lcv >= 2; lcv--) {
+			tftp_r[lcv] = "0123456789ABCDEF"[iptmp & 0xF];
 
+			iptmp = iptmp >> 4;
+		}
+	}
 
+	udph->uh_ulen = tot - (char *) udph;
 
+	le_put(buf, tot - buf);
+}
 
+/* Attempt to tftp a file and read it into memory */
+int
+do_get_file()
+{
+	int     fail = 0, oldlen;
+	char   *loadat = (char *) LOAD_ADDR;
+	last_ack = 0;
+
+	do_send_tftp(READ);
+	while (1) {
+		if (le_get(buf, sizeof(buf), 5) == 0) {
+			/* timeout occured */
+			if (last_ack)
+				do_send_tftp(last_ack);
+			else
+				do_send_tftp(READ);
+
+			fail++;
+			if (fail > 5) {
+				printf("\n");
+				return (1);
+			}
+		} else {
+			printf("%x \r", tftp->info.block * 512);
+			if ((eh->ether_type != ETYPE_IP) || (iph->ip_p != IPP_UDP)) {
+				fail++;
+				continue;
+			}
+			if (servport == FTP_PORT)
+				servport = udph->uh_sport;
+			if (tftp->info.op_code == FTPOP_ERR) {
+				printf("TFTP: Download error %d: %s\n",
+				    tftp->info.block, tftp->data);
+				return (1);
+			}
+			if (tftp->info.block != last_ack + 1) {
+				/* we received the wrong block */
+				if (tftp->info.block < last_ack + 1) {
+					/* nack whatever we received */
+					do_send_tftp(tftp->info.block);
+				} else {
+					/* nack the last confirmed block */
+					do_send_tftp(last_ack);
+				}
+				fail++;
+			} else {/* we got the right block */
+				fail = 0;
+				last_ack++;
+				oldlen = udph->uh_ulen;
+				do_send_tftp(last_ack);
+				/* printf("bcopy %x %x %d\n", &tftp->data,
+				 * loadat, oldlen - 12); */
+				bcopy(&tftp->data, loadat, oldlen - 12);
+				loadat += oldlen - 12;
+				if (oldlen < (8 + 4 + 512)) {
+					printf("\n");
+					return (0);
+				}
+			}
+		}
+	}
+	printf("\n");
+	return (0);
+}
diff --git a/sys/arch/mvme68k/stand/sboot/etherfun.h b/sys/arch/mvme68k/stand/sboot/etherfun.h
index 2b6a14d69a5..97e3924d552 100644
--- a/sys/arch/mvme68k/stand/sboot/etherfun.h
+++ b/sys/arch/mvme68k/stand/sboot/etherfun.h
@@ -1,3 +1,5 @@
+/*	$OpenBSD: etherfun.h,v 1.2 1996/04/28 10:49:37 deraadt Exp $ */
+
 /*
  *
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
@@ -42,83 +44,83 @@
 #define OPCODE_REPLY 4     /* Optype is REVARP reply   */
 
 /* ip header */
-#define  IPP_UDP 17        /* IP Protocol is UDP       */
-#define  IP_VERSION 4      /* IP version number        */
-#define  IP_HLEN 5         /* IP header length is a fixed 50 bytes */
+#define  IPP_UDP 17	/* IP Protocol is UDP       */
+#define  IP_VERSION 4      /* IP version number	*/
+#define  IP_HLEN 5	 /* IP header length is a fixed 50 bytes */
 #define N 1536
 
 /* tftp header */
 #define FTPOP_ACKN 4      /* Opcode is acknowledge     */
 #define FTPOP_ERR 5       /* Opcode is Error	       */
 #define FTP_PORT 69       /* Standard TFTP port number */
-#define MSG "\0\1xxxxxxxx.147\0octet\0" /* implicit NULL */
+#define MSG "\0\1xxxxxxxx.mvme68k\0octet\0" /* implicit NULL */
 
 /* data structures */
 
 struct  ether_header {
-        u_char  ether_dhost[6];
-        u_char  ether_shost[6];
-        u_short ether_type;
+	u_char  ether_dhost[6];
+	u_char  ether_shost[6];
+	u_short ether_type;
 };
 
 struct  ether_arp {
-        u_short ar_hrd;       /* format of hardware address */
-	u_short ar_pro;       /* format of protocol address */
-        u_char  ar_hln;       /* length of hardware address */
-        u_char  ar_pln;       /* length of protocol address */
-        u_short ar_op;
-        u_char  arp_sha[6];     /* sender hardware address */
-        u_char  arp_spa[4];     /* sender protocol address */
-        u_char  arp_tha[6];     /* target hardware address */
-        u_char  arp_tpa[4];     /* target protocol address */
+	u_short ar_hrd;		/* format of hardware address */
+	u_short ar_pro;		/* format of protocol address */
+	u_char  ar_hln;		/* length of hardware address */
+	u_char  ar_pln;		/* length of protocol address */
+	u_short ar_op;
+	u_char  arp_sha[6];	/* sender hardware address */
+	u_char  arp_spa[4];	/* sender protocol address */
+	u_char  arp_tha[6];	/* target hardware address */
+	u_char  arp_tpa[4];	/* target protocol address */
 };
 
 struct ip {
-        u_char  ip_v:4,                 /* version */
-                ip_hl:4;                /* header length */
-        u_char  ip_tos;                 /* type of service */
-        short   ip_len;                 /* total length */
-        u_short ip_id;                  /* identification */
-        short   ip_off;                 /* fragment offset field */
-#define IP_DF 0x4000                    /* dont fragment flag */
-#define IP_MF 0x2000                    /* more fragments flag */
-#define IP_OFFMASK 0x1fff               /* mask for fragmenting bits */
-        u_char  ip_ttl;                 /* time to live */
-        u_char  ip_p;                   /* protocol */
-        u_short ip_sum;                 /* checksum */
+	u_char  ip_v:4,		/* version */
+		ip_hl:4;	/* header length */
+	u_char  ip_tos;		/* type of service */
+	short   ip_len;		/* total length */
+	u_short ip_id;		/* identification */
+	short   ip_off;		/* fragment offset field */
+#define IP_DF 0x4000		/* dont fragment flag */
+#define IP_MF 0x2000		/* more fragments flag */
+#define IP_OFFMASK 0x1fff	/* mask for fragmenting bits */
+	u_char  ip_ttl;		/* time to live */
+	u_char  ip_p;		/* protocol */
+	u_short ip_sum;		/* checksum */
 	u_char  ip_src[4];
-        u_char  ip_dst[4];              /* source and dest address */
+	u_char  ip_dst[4];	/* source and dest address */
 };
 
 struct udp {
-        u_short uh_sport;
+	u_short uh_sport;
 	u_short uh_dport;
 	short uh_ulen;
 	u_short uh_sum;
 };
 
 struct tftph {
-  u_short op_code;
-  u_short block;
+	u_short	op_code;
+	u_short	block;
 };
 
 struct tftphr {
-  struct tftph info;
-  char data[1];
+	struct tftph info;
+	char	data[1];
 };
 
 /* globals */
 int last_ack;
 char buf[N];
 struct ether_header *eh = (struct ether_header *)buf;
-struct ether_arp *rarp = 
-  (struct ether_arp *)(buf + sizeof(struct ether_header));
+struct ether_arp *rarp = (struct ether_arp *)
+	(buf + sizeof(struct ether_header));
 struct ip *iph = (struct ip *)(buf + sizeof(struct ether_header));
-struct udp *udph = (struct udp *)(buf + sizeof(struct ether_header) + 
-  sizeof(struct ip));
+struct udp *udph = (struct udp *)
+	(buf + sizeof(struct ether_header) + sizeof(struct ip));
 char *tftp_r = buf + sizeof(struct ether_header) + sizeof(struct ip) + 
-  sizeof(struct udp);
+	sizeof(struct udp);
 struct tftph *tftp_a = (struct tftph *)(buf + sizeof(struct ether_header) + 
-  sizeof(struct ip) + sizeof(struct udp));
+	sizeof(struct ip) + sizeof(struct udp));
 struct tftphr *tftp = (struct tftphr *)(buf + sizeof(struct ether_header) + 
-  sizeof(struct ip) + sizeof(struct udp));
+	sizeof(struct ip) + sizeof(struct udp));
diff --git a/sys/arch/mvme68k/stand/sboot/if_le.c b/sys/arch/mvme68k/stand/sboot/if_le.c
index ea39732ec4b..c20992ab39c 100644
--- a/sys/arch/mvme68k/stand/sboot/if_le.c
+++ b/sys/arch/mvme68k/stand/sboot/if_le.c
@@ -1,4 +1,4 @@
-/*	$Id: if_le.c,v 1.2 1995/11/07 08:51:10 deraadt Exp $ */
+/*	$OpenBSD: if_le.c,v 1.3 1996/04/28 10:49:38 deraadt Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
diff --git a/sys/arch/mvme68k/stand/sboot/if_lereg.h b/sys/arch/mvme68k/stand/sboot/if_lereg.h
index 3c6f534e1e9..aad70679480 100644
--- a/sys/arch/mvme68k/stand/sboot/if_lereg.h
+++ b/sys/arch/mvme68k/stand/sboot/if_lereg.h
@@ -1,4 +1,4 @@
-/*	$Id: if_lereg.h,v 1.2 1995/11/07 08:51:10 deraadt Exp $ */
+/*	$OpenBSD: if_lereg.h,v 1.3 1996/04/28 10:49:41 deraadt Exp $ */
 
 /*-
  * Copyright (c) 1982, 1992, 1993
diff --git a/sys/arch/mvme68k/stand/sboot/oc_cksum.S b/sys/arch/mvme68k/stand/sboot/oc_cksum.S
index b68af69a5a6..328bf77bab9 100644
--- a/sys/arch/mvme68k/stand/sboot/oc_cksum.S
+++ b/sys/arch/mvme68k/stand/sboot/oc_cksum.S
@@ -1,4 +1,4 @@
-|	$Id: oc_cksum.S,v 1.2 1995/11/07 08:51:11 deraadt Exp $
+|	$OpenBSD: oc_cksum.S,v 1.3 1996/04/28 10:49:42 deraadt Exp $
 
 | Copyright (c) 1988 Regents of the University of California.
 | All rights reserved.
diff --git a/sys/arch/mvme68k/stand/sboot/sboot.c b/sys/arch/mvme68k/stand/sboot/sboot.c
index 5b0f06b1a7e..5553227793e 100644
--- a/sys/arch/mvme68k/stand/sboot/sboot.c
+++ b/sys/arch/mvme68k/stand/sboot/sboot.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: sboot.c,v 1.4 1996/04/28 10:49:43 deraadt Exp $ */
+
 /*
  * Copyright (c) 1995 Theo de Raadt
  * 
diff --git a/sys/arch/mvme68k/stand/sboot/sboot.h b/sys/arch/mvme68k/stand/sboot/sboot.h
index 01085b17b90..0f79362de45 100644
--- a/sys/arch/mvme68k/stand/sboot/sboot.h
+++ b/sys/arch/mvme68k/stand/sboot/sboot.h
@@ -1,5 +1,6 @@
+/*	$OpenBSD: sboot.h,v 1.2 1996/04/28 10:49:44 deraadt Exp $ */
+
 /*
- *
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
  * All rights reserved.
  *
@@ -44,48 +45,48 @@ extern caddr_t end;
 
 #define NULL ((char *)0)
 
-void bcopy(const void *, void *, size_t); /* libc_sa */
-void *memset(void *, int, size_t); /* libc_sa */
-void printf(const char *, ...); /* libc_sa */
+void bcopy __P((const void *, void *, size_t));		/* libc_sa */
+void *memset __P((void *, int, size_t));		/* libc_sa */
+int printf __P((const char *, ...));			/* libc_sa */
 
 /* console */
-void puts(char *);
-void putchar(char);
-char cngetc();
-void ngets(char *, int);
+void puts __P((char *));
+void putchar __P((char));
+char cngetc __P((void));
+void ngets __P((char *, int));
 
 /* sboot */
-void callrom();
-void do_cmd(char *);
+void callrom __P((void));
+void do_cmd __P((char *));
 
 /* le */
 #define LANCE_ADDR 0xfffe0778
 #define ERAM_ADDR  0xfffe0774
 #define LANCE_REG_ADDR 0xfffe1800
-void le_end(void);
-void le_init(void);
-int le_get(u_char *, size_t, u_long);
-int le_put(u_char *, size_t);
+void le_end __P((void));
+void le_init __P((void));
+int le_get __P((u_char *, size_t, u_long));
+int le_put __P((u_char *, size_t));
 
 /* etherfun */
 #define READ 0
 #define ACKN 1 
-void do_rev_arp();
-int get_rev_arp();
-int rev_arp();
-void do_send_tftp( int );
-int do_get_file(); 
-void tftp_file(char *, u_long);
+void do_rev_arp __P((void));
+int get_rev_arp __P((void));
+int rev_arp __P((void));
+void do_send_tftp __P((int));
+int do_get_file __P((void)); 
+void tftp_file __P((char *, u_long));
 
 /* clock */
-u_long time(void);
+u_long time __P((void));
 
 /* checksum */
-u_long oc_cksum (void *, u_long, u_long);
+u_long oc_cksum __P((void *, u_long, u_long));
 
 #define CONS_ZS_ADDR (0xfffe3002)
 #define CLOCK_ADDR (0xfffe07f8)
-#define LOAD_ADDR 0x8000 
+#define LOAD_ADDR 0x7000 
 
 unsigned char myea[6];                /* my ether addr */
 unsigned char myip[4];
diff --git a/sys/arch/mvme68k/stand/sboot/srec.c b/sys/arch/mvme68k/stand/sboot/srec.c
index 164fb4b458c..93ee5e2e53f 100644
--- a/sys/arch/mvme68k/stand/sboot/srec.c
+++ b/sys/arch/mvme68k/stand/sboot/srec.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: srec.c,v 1.3 1996/04/28 10:49:45 deraadt Exp $ */
+
 /*
  * Public domain, believed to be by Mike Price.
  * 
diff --git a/sys/arch/mvme68k/stand/wrtvid/Makefile b/sys/arch/mvme68k/stand/wrtvid/Makefile
index 8b6cd97df7d..2cbd2a08407 100644
--- a/sys/arch/mvme68k/stand/wrtvid/Makefile
+++ b/sys/arch/mvme68k/stand/wrtvid/Makefile
@@ -1,3 +1,5 @@
+#	$OpenBSD: Makefile,v 1.2 1996/04/28 10:49:47 deraadt Exp $
+
 PROG=	wrtvid
 NOMAN=
 
diff --git a/sys/arch/mvme68k/stand/wrtvid/Makefile.inc b/sys/arch/mvme68k/stand/wrtvid/Makefile.inc
index a8c47af8bd7..7e546a06886 100644
--- a/sys/arch/mvme68k/stand/wrtvid/Makefile.inc
+++ b/sys/arch/mvme68k/stand/wrtvid/Makefile.inc
@@ -1,3 +1,5 @@
+#	$OpenBSD: Makefile.inc,v 1.2 1996/04/28 10:49:48 deraadt Exp $
+
 WRTVID_BASE_DIR=${S}/arch/${MACHINE}/stand/wrtvid
 
 WRTVID_DIR!= cd ${WRTVID_BASE_DIR}; \
diff --git a/sys/arch/mvme68k/stand/wrtvid/wrtvid.c b/sys/arch/mvme68k/stand/wrtvid/wrtvid.c
index b2a21ad4f18..fe4f65d9efd 100644
--- a/sys/arch/mvme68k/stand/wrtvid/wrtvid.c
+++ b/sys/arch/mvme68k/stand/wrtvid/wrtvid.c
@@ -1,3 +1,5 @@
+/*	$OpenBSD: wrtvid.c,v 1.3 1996/04/28 10:49:49 deraadt Exp $ */
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>