Nuke whitespace at EOL

20 files changed, 59 insertions, 60 deletions

diff --git a/sys/arch/mvme88k/stand/bootsd/Makefile b/sys/arch/mvme88k/stand/bootsd/Makefile
index 8b26e2dc675..6a698de726a 100644
--- a/sys/arch/mvme88k/stand/bootsd/Makefile
+++ b/sys/arch/mvme88k/stand/bootsd/Makefile
@@ -1,9 +1,8 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.12 2006/01/10 07:20:09 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.13 2006/05/16 22:52:24 miod Exp $
 
-      
 S=	${.CURDIR}/../../../..
-DEFS= 
+DEFS=
 INCPATH=-I${.CURDIR} -I${.CURDIR}/../libsa -I${.CURDIR}/../libbug \
 	-I${.CURDIR}/../../include -I${S} -I${S}/lib/libsa
 CFLAGS+=${INCPATH} ${DEFS} ${COPTS}
@@ -21,8 +20,8 @@ LIBS=	${LIBSA} ${LIBBUG} ${LIBZ}
 
 OBJS= ${SRCS:N*.h:R:S/$/.o/g}
 
-BOOTS=	bootsd 
-ALL=	${BOOTS} 
+BOOTS=	bootsd
+ALL=	${BOOTS}
 
 all: ${ALL}
 
diff --git a/sys/arch/mvme88k/stand/bootst/Makefile b/sys/arch/mvme88k/stand/bootst/Makefile
index 44e4fe2867c..bc167bb87b7 100644
--- a/sys/arch/mvme88k/stand/bootst/Makefile
+++ b/sys/arch/mvme88k/stand/bootst/Makefile
@@ -1,5 +1,5 @@
 #	from: @(#)Makefile	8.1 (Berkeley) 6/10/93
-#	$OpenBSD: Makefile,v 1.11 2005/09/11 13:36:00 deraadt Exp $
+#	$OpenBSD: Makefile,v 1.12 2006/05/16 22:52:26 miod Exp $
 
 SIZE?=	size
 
@@ -24,7 +24,7 @@ LIBS=	${LIBSA} ${LIBBUG} ${LIBZ}
 OBJS= ${SRCS:N*.h:R:S/$/.o/g}
 
 BOOTS=	bootst stboot
-ALL=	${BOOTS} 
+ALL=	${BOOTS}
 
 all: ${ALL}
 
diff --git a/sys/arch/mvme88k/stand/libsa/clock.c b/sys/arch/mvme88k/stand/libsa/clock.c
index 92c1e9f1e43..1612654819f 100644
--- a/sys/arch/mvme88k/stand/libsa/clock.c
+++ b/sys/arch/mvme88k/stand/libsa/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.3 2001/07/04 08:09:29 niklas Exp $	*/
+/*	$OpenBSD: clock.c,v 1.4 2006/05/16 22:52:26 miod Exp $	*/
 
 
 #include <sys/types.h>
@@ -60,6 +60,6 @@ getsecs()
 	struct mvmeprom_time m;
 
 	mvmeprom_rtc_rd(&m);
-	return (chiptotime(m.sec_BCD, m.min_BCD, m.hour_BCD, m.day_BCD, 
+	return (chiptotime(m.sec_BCD, m.min_BCD, m.hour_BCD, m.day_BCD,
 			m.month_BCD, m.year_BCD));
 }
diff --git a/sys/arch/mvme88k/stand/libsa/libsa.h b/sys/arch/mvme88k/stand/libsa/libsa.h
index 62a71ed3c2d..e844d483870 100644
--- a/sys/arch/mvme88k/stand/libsa/libsa.h
+++ b/sys/arch/mvme88k/stand/libsa/libsa.h
@@ -1,7 +1,7 @@
-/*	$OpenBSD: libsa.h,v 1.3 2002/03/14 01:26:40 millert Exp $	*/
+/*	$OpenBSD: libsa.h,v 1.4 2006/05/16 22:52:26 miod Exp $	*/
 
 /*
- * libsa prototypes 
+ * libsa prototypes
  */
 
 #include "libbug.h"
diff --git a/sys/arch/mvme88k/stand/netboot/if_le.c b/sys/arch/mvme88k/stand/netboot/if_le.c
index 8108724da93..2b0353f01d1 100644
--- a/sys/arch/mvme88k/stand/netboot/if_le.c
+++ b/sys/arch/mvme88k/stand/netboot/if_le.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: if_le.c,v 1.5 2003/06/04 16:36:15 deraadt Exp $ */
+/*	$OpenBSD: if_le.c,v 1.6 2006/05/16 22:52:26 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/sys/arch/mvme88k/stand/prtvid/Makefile b/sys/arch/mvme88k/stand/prtvid/Makefile
index 23d8dd87bb4..4357d948db1 100644
--- a/sys/arch/mvme88k/stand/prtvid/Makefile
+++ b/sys/arch/mvme88k/stand/prtvid/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1998/08/22 08:49:15 smurph Exp $ 
+#	$OpenBSD: Makefile,v 1.3 2006/05/16 22:52:26 miod Exp $
 PROG=	prtvid
 NOMAN=
 
diff --git a/sys/arch/mvme88k/stand/prtvid/prtvid.c b/sys/arch/mvme88k/stand/prtvid/prtvid.c
index 02b747b235a..11c376e3fa1 100644
--- a/sys/arch/mvme88k/stand/prtvid/prtvid.c
+++ b/sys/arch/mvme88k/stand/prtvid/prtvid.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: prtvid.c,v 1.3 2004/12/27 15:23:46 drahn Exp $ */
+/*	$OpenBSD: prtvid.c,v 1.4 2006/05/16 22:52:26 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Dale Rahn <drahn@openbsd.org>
@@ -45,7 +45,7 @@ main(argc, argv)
 	    (char *)&(pvid->vid_osa_u) - (char *)pvid);
 	printf("vid_osa_l	%x	%x\n", pvid->vid_osa_l,
 	    (char *)&(pvid->vid_osa_l) - (char *)pvid);
-	printf("vid_vd 		%x	%x\n", pvid->vid_vd, 
+	printf("vid_vd 		%x	%x\n", pvid->vid_vd,
 	    (char *)&(pvid->vid_vd) - (char *)pvid);
 	printf("vid_cas		%x	%x\n", pvid->vid_cas,
 	    (char *)&(pvid->vid_cas) - (char *)pvid);
diff --git a/sys/arch/mvme88k/stand/sboot/TODO b/sys/arch/mvme88k/stand/sboot/TODO
index ec0a659fda2..e2a21dbc37c 100644
--- a/sys/arch/mvme88k/stand/sboot/TODO
+++ b/sys/arch/mvme88k/stand/sboot/TODO
@@ -1,3 +1,3 @@
 This needs some work.  It is still the mvme68k code.
-Anybody want to jump in?  S-records are cool because 
+Anybody want to jump in?  S-records are cool because
 one could boot from a terminal session.  SLOW though.
diff --git a/sys/arch/mvme88k/stand/sboot/XBUG.S b/sys/arch/mvme88k/stand/sboot/XBUG.S
index 0c31bf25904..2ddf3454eea 100644
--- a/sys/arch/mvme88k/stand/sboot/XBUG.S
+++ b/sys/arch/mvme88k/stand/sboot/XBUG.S
@@ -1,8 +1,8 @@
-/*	$OpenBSD: XBUG.S,v 1.4 2003/06/04 16:36:15 deraadt Exp $	*/
+/*	$OpenBSD: XBUG.S,v 1.5 2006/05/16 22:52:26 miod Exp $	*/
 
 /*
  * Copyright (c) 1995 Theo de Raadt
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -28,7 +28,7 @@
 /*
  * Theo says: I wrote a bootrom for the MVME147 *years* ago. To write
  * this ROM I copied a few chunks from the old bootrom, like this piece:
- * 
+ *
  * "watch this, the moto bastard struck here, shouldn't have hired people
  * from intel I tried to tell them...
  *       "BOOT"
diff --git a/sys/arch/mvme88k/stand/sboot/XSRT0.S b/sys/arch/mvme88k/stand/sboot/XSRT0.S
index b5272eca8ba..589235811cd 100644
--- a/sys/arch/mvme88k/stand/sboot/XSRT0.S
+++ b/sys/arch/mvme88k/stand/sboot/XSRT0.S
@@ -1,8 +1,8 @@
-/*	$OpenBSD: XSRT0.S,v 1.3 2003/06/04 16:36:15 deraadt Exp $	*/
+/*	$OpenBSD: XSRT0.S,v 1.4 2006/05/16 22:52:26 miod Exp $	*/
 
 /*
  * Copyright (c) 1995 Theo de Raadt
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
diff --git a/sys/arch/mvme88k/stand/sboot/clock.c b/sys/arch/mvme88k/stand/sboot/clock.c
index 3eece5f0711..5ba228de2da 100644
--- a/sys/arch/mvme88k/stand/sboot/clock.c
+++ b/sys/arch/mvme88k/stand/sboot/clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: clock.c,v 1.3 2003/06/02 23:27:53 millert Exp $ */
+/*	$OpenBSD: clock.c,v 1.4 2006/05/16 22:52:26 miod Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -69,7 +69,7 @@ static struct clockreg *clockreg = (struct clockreg *) CLOCK_ADDR;
 const short dayyr[12] =
     {0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334};
 
-static u_long 
+static u_long
 chiptotime(sec, min, hour, day, mon, year)
 	register int sec, min, hour, day, mon, year;
 {
@@ -100,7 +100,7 @@ chiptotime(sec, min, hour, day, mon, year)
 /*
  * Set up the system's time, given a `reasonable' time value.
  */
-u_long 
+u_long
 time()
 {
 	register struct clockreg *cl = clockreg;
diff --git a/sys/arch/mvme88k/stand/sboot/etherfun.h b/sys/arch/mvme88k/stand/sboot/etherfun.h
index f229be43d16..e43043c3e4b 100644
--- a/sys/arch/mvme88k/stand/sboot/etherfun.h
+++ b/sys/arch/mvme88k/stand/sboot/etherfun.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: etherfun.h,v 1.2 2001/07/04 08:09:31 niklas Exp $	*/
+/*	$OpenBSD: etherfun.h,v 1.3 2006/05/16 22:52:26 miod Exp $	*/
 
 /*
  *
@@ -118,9 +118,9 @@ struct ether_arp *rarp = (struct ether_arp *)
 struct ip *iph = (struct ip *)(buf + sizeof(struct ether_header));
 struct udp *udph = (struct udp *)
 	(buf + sizeof(struct ether_header) + sizeof(struct ip));
-char *tftp_r = buf + sizeof(struct ether_header) + sizeof(struct ip) + 
+char *tftp_r = buf + sizeof(struct ether_header) + sizeof(struct ip) +
 	sizeof(struct udp);
-struct tftph *tftp_a = (struct tftph *)(buf + sizeof(struct ether_header) + 
+struct tftph *tftp_a = (struct tftph *)(buf + sizeof(struct ether_header) +
 	sizeof(struct ip) + sizeof(struct udp));
-struct tftphr *tftp = (struct tftphr *)(buf + sizeof(struct ether_header) + 
+struct tftphr *tftp = (struct tftphr *)(buf + sizeof(struct ether_header) +
 	sizeof(struct ip) + sizeof(struct udp));
diff --git a/sys/arch/mvme88k/stand/sboot/if_le.c b/sys/arch/mvme88k/stand/sboot/if_le.c
index 819c02a45da..10307d944ea 100644
--- a/sys/arch/mvme88k/stand/sboot/if_le.c
+++ b/sys/arch/mvme88k/stand/sboot/if_le.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: if_le.c,v 1.3 2003/06/04 16:36:15 deraadt Exp $ */
+/*	$OpenBSD: if_le.c,v 1.4 2006/05/16 22:52:26 miod Exp $ */
 
 /*
  * Copyright (c) 1995 Theo de Raadt
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -65,7 +65,7 @@ struct {
 	int     next_tmd;
 }       le_softc;
 
-void 
+void
 le_error(str, ler1)
 	char   *str;
 	struct lereg1 *ler1;
@@ -87,7 +87,7 @@ le_error(str, ler1)
 	}
 }
 
-void 
+void
 le_reset(myea)
 	u_char *myea;
 {
@@ -164,7 +164,7 @@ le_reset(myea)
 	ler1->ler1_rdp = LE_C0_STRT;
 }
 
-int 
+int
 le_poll(pkt, len)
 	void   *pkt;
 	int     len;
@@ -217,7 +217,7 @@ cleanup:
 	return length;
 }
 
-int 
+int
 le_put(pkt, len)
 	u_char *pkt;
 	size_t  len;
@@ -277,7 +277,7 @@ le_put(pkt, len)
 	return len;
 }
 
-int 
+int
 le_get(pkt, len, timeout)
 	u_char *pkt;
 	size_t  len;
@@ -312,7 +312,7 @@ le_get(pkt, len, timeout)
 	return cc;
 }
 
-void 
+void
 le_init()
 {
 	caddr_t addr;
@@ -340,7 +340,7 @@ le_init()
 	le_reset(myea);
 }
 
-void 
+void
 le_end()
 {
 	struct lereg1 *ler1 = le_softc.sc_r1;
diff --git a/sys/arch/mvme88k/stand/sboot/if_lereg.h b/sys/arch/mvme88k/stand/sboot/if_lereg.h
index 35c4a8901a9..28f068fd87f 100644
--- a/sys/arch/mvme88k/stand/sboot/if_lereg.h
+++ b/sys/arch/mvme88k/stand/sboot/if_lereg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_lereg.h,v 1.4 2003/06/02 23:27:53 millert Exp $ */
+/*	$OpenBSD: if_lereg.h,v 1.5 2006/05/16 22:52:26 miod Exp $ */
 
 /*-
  * Copyright (c) 1982, 1992, 1993
@@ -129,7 +129,7 @@ struct lereg2 {
 #define	LE_MODE_NORMAL	0		/* none of the above */
 
 
-/* Receive message descriptor 1 (rmd1_bits) */ 
+/* Receive message descriptor 1 (rmd1_bits) */
 #define	LE_R1_OWN	0x80		/* LANCE owns the packet */
 #define	LE_R1_ERR	0x40		/* error summary */
 #define	LE_R1_FRAM	0x20		/* framing error */
@@ -142,7 +142,7 @@ struct lereg2 {
 #define LE_R1_BITS \
     "\20\10OWN\7ERR\6FRAM\5OFLO\4CRC\3BUFF\2STP\1ENP"
 
-/* Transmit message descriptor 1 (tmd1_bits) */ 
+/* Transmit message descriptor 1 (tmd1_bits) */
 #define	LE_T1_OWN	0x80		/* LANCE owns the packet */
 #define	LE_T1_ERR	0x40		/* error summary */
 #define	LE_T1_MORE	0x10		/* multiple collisions */
@@ -154,7 +154,7 @@ struct lereg2 {
 #define LE_T1_BITS \
     "\20\10OWN\7ERR\6RES\5MORE\4ONE\3DEF\2STP\1ENP"
 
-/* Transmit message descriptor 3 (tmd3) */ 
+/* Transmit message descriptor 3 (tmd3) */
 #define	LE_T3_BUFF	0x8000		/* buffer error */
 #define	LE_T3_UFLO	0x4000		/* underflow error */
 #define	LE_T3_LCOL	0x1000		/* late collision */
diff --git a/sys/arch/mvme88k/stand/sboot/oc_cksum.S b/sys/arch/mvme88k/stand/sboot/oc_cksum.S
index 374120508a4..680dbef3f56 100644
--- a/sys/arch/mvme88k/stand/sboot/oc_cksum.S
+++ b/sys/arch/mvme88k/stand/sboot/oc_cksum.S
@@ -1,4 +1,4 @@
-|	$OpenBSD: oc_cksum.S,v 1.2 2000/03/03 00:54:54 todd Exp $
+|	$OpenBSD: oc_cksum.S,v 1.3 2006/05/16 22:52:26 miod Exp $
 
 | Copyright (c) 1988 Regents of the University of California.
 | All rights reserved.
@@ -73,14 +73,14 @@
 | that 16 was better than 8 for a count of 20.  It is not obvious to
 | me why.)  So, since 16 was good for both large and small counts,
 | the loop below is unrolled 16 times.
-| 
+|
 | The processors tested and their average time to checksum 1024 bytes
 | of random data were:
 | 	Sun 3/50 (15MHz)	190 us/KB
 | 	Sun 3/180 (16.6MHz)	175 us/KB
 | 	Sun 3/60 (20MHz)	134 us/KB
 | 	Sun 3/280 (25MHz)	 95 us/KB
-| 
+|
 | The cost of calling this routine was typically 10% of the per-
 | kilobyte cost.  E.g., checksumming zero bytes on a 3/60 cost 9us
 | and each additional byte cost 125ns.  With the high fixed cost,
diff --git a/sys/arch/mvme88k/stand/sboot/sboot.c b/sys/arch/mvme88k/stand/sboot/sboot.c
index cfe2ef605b3..4135a122c42 100644
--- a/sys/arch/mvme88k/stand/sboot/sboot.c
+++ b/sys/arch/mvme88k/stand/sboot/sboot.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: sboot.c,v 1.3 2003/06/04 16:36:15 deraadt Exp $	*/
+/*	$OpenBSD: sboot.c,v 1.4 2006/05/16 22:52:26 miod Exp $	*/
 
 /*
  * Copyright (c) 1995 Theo de Raadt
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -75,7 +75,7 @@ main()
 /*
  * exit to rom
  */
-void 
+void
 callrom()
 {
 	asm("trap #15; .word 0x0063");
@@ -84,7 +84,7 @@ callrom()
 /*
  * do_cmd: do a command
  */
-void 
+void
 do_cmd(buf)
 	char   *buf;
 {
diff --git a/sys/arch/mvme88k/stand/sboot/sboot.h b/sys/arch/mvme88k/stand/sboot/sboot.h
index f50701bfabf..cae5e14f282 100644
--- a/sys/arch/mvme88k/stand/sboot/sboot.h
+++ b/sys/arch/mvme88k/stand/sboot/sboot.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sboot.h,v 1.4 2002/03/15 01:20:04 millert Exp $	*/
+/*	$OpenBSD: sboot.h,v 1.5 2006/05/16 22:52:26 miod Exp $	*/
 
 /*
  * Copyright (c) 1995 Charles D. Cranor and Seth Widoff
@@ -70,12 +70,12 @@ int le_put(u_char *, size_t);
 
 /* etherfun */
 #define READ 0
-#define ACKN 1 
+#define ACKN 1
 void do_rev_arp(void);
 int get_rev_arp(void);
 int rev_arp(void);
 void do_send_tftp(int);
-int do_get_file(void); 
+int do_get_file(void);
 void tftp_file(char *, u_long);
 
 /* clock */
@@ -86,7 +86,7 @@ u_long oc_cksum(void *, u_long, u_long);
 
 #define CONS_ZS_ADDR (0xfffe3002)
 #define CLOCK_ADDR (0xfffe07f8)
-#define LOAD_ADDR 0x7000 
+#define LOAD_ADDR 0x7000
 
 unsigned char myea[6];                /* my ether addr */
 unsigned char myip[4];
diff --git a/sys/arch/mvme88k/stand/sboot/srec.c b/sys/arch/mvme88k/stand/sboot/srec.c
index 04458ecfcd6..88da9770543 100644
--- a/sys/arch/mvme88k/stand/sboot/srec.c
+++ b/sys/arch/mvme88k/stand/sboot/srec.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: srec.c,v 1.2 2001/04/30 00:06:34 miod Exp $	*/
+/*	$OpenBSD: srec.c,v 1.3 2006/05/16 22:52:26 miod Exp $	*/
 
 /*
  * Public domain, believed to be by Mike Price.
- * 
+ *
  * convert binary file to Srecord format
  */
 #include <stdio.h>
diff --git a/sys/arch/mvme88k/stand/wrtvid/Makefile b/sys/arch/mvme88k/stand/wrtvid/Makefile
index 2002be5fd9d..b5ef37617d8 100644
--- a/sys/arch/mvme88k/stand/wrtvid/Makefile
+++ b/sys/arch/mvme88k/stand/wrtvid/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.2 1998/08/22 08:52:53 smurph Exp $ 
+#	$OpenBSD: Makefile,v 1.3 2006/05/16 22:52:26 miod Exp $
 PROG=	wrtvid
 NOMAN=
 
diff --git a/sys/arch/mvme88k/stand/wrtvid/disklabel.h b/sys/arch/mvme88k/stand/wrtvid/disklabel.h
index 1e555020e1f..8f064316489 100644
--- a/sys/arch/mvme88k/stand/wrtvid/disklabel.h
+++ b/sys/arch/mvme88k/stand/wrtvid/disklabel.h
@@ -1,9 +1,9 @@
-/*	$OpenBSD: disklabel.h,v 1.4 2003/06/03 21:09:01 deraadt Exp $ */
+/*	$OpenBSD: disklabel.h,v 1.5 2006/05/16 22:52:26 miod Exp $ */
 /*
  * Copyright (c) 1996 Nivas Madhur
  * Copyright (c) 1995 Dale Rahn.
  * All rights reserved.
- *   
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -25,7 +25,7 @@
  * 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.
- */  
+ */
 
 #ifndef _MACHINE_DISKLABEL_H_
 #define _MACHINE_DISKLABEL_H_
@@ -40,7 +40,7 @@
 #define MAXPARTITIONS	(1 << PARTITIONSHIFT)	/* number of partitions */
 #define RAW_PART	2			/* raw partition: xx?c */
 
-/* 
+/*
  * used to encode disk minor numbers
  * this should probably be moved to sys/disklabel.h
  */