spacing

4 files changed, 34 insertions, 39 deletions

diff --git a/sys/arch/sgi/sgi/autoconf.c b/sys/arch/sgi/sgi/autoconf.c
index 2017a22d6f9..a30d73ee7ec 100644
--- a/sys/arch/sgi/sgi/autoconf.c
+++ b/sys/arch/sgi/sgi/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.2 2004/08/09 10:11:37 miod Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.3 2004/08/10 18:47:22 deraadt Exp $	*/
 /*
  * Copyright (c) 1996 Per Fogelstrom
  * Copyright (c) 1995 Theo de Raadt
@@ -37,11 +37,6 @@
  * 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.
- *
- * from: Utah Hdr: autoconf.c 1.31 91/01/21
- *
- *	from: @(#)autoconf.c	8.1 (Berkeley) 6/10/93
- *      $Id: autoconf.c,v 1.2 2004/08/09 10:11:37 miod Exp $
  */
 
 /*
@@ -131,7 +126,7 @@ swapconf()
 	}
 }
 
-/*                                                                        
+/*
  * the rest of this file was influenced/copied from Theo de Raadt's
  * code in the sparc port to nuke the "options GENERIC" stuff.
  */
@@ -173,7 +168,7 @@ getdisk(str, len, defpart, devp)
 				printf(" %s[a-p]", dv->dv_xname);
 #ifdef NFSCLIENT
 			if (dv->dv_class == DV_IFNET)
-				printf(" %s", dv->dv_xname); 
+				printf(" %s", dv->dv_xname);
 #endif
 		}
 		printf("\n");
@@ -359,7 +354,7 @@ gotswap:
 		else {
 			/*
 			 *  Root and Swap are on net.
-			 */	
+			 */
 			nswapdev = dumpdev = NODEV;
 		}
 		swdevt[0].sw_dev = nswapdev;
diff --git a/sys/arch/sgi/sgi/clock_md.c b/sys/arch/sgi/sgi/clock_md.c
index d7ad1190302..60a3f60709f 100644
--- a/sys/arch/sgi/sgi/clock_md.c
+++ b/sys/arch/sgi/sgi/clock_md.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: clock_md.c,v 1.3 2004/08/09 21:13:29 pefo Exp $ */
+/*	$OpenBSD: clock_md.c,v 1.4 2004/08/10 18:47:22 deraadt Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -42,8 +42,8 @@
 extern void clock_int5_init(struct clock_softc *);
 extern int clock_started;
 
-#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))
 
 void	md_clk_attach(struct device *parent, struct device *self, void *aux);
 
@@ -61,7 +61,7 @@ md_clk_attach(parent, self, aux)
 
 	ca = aux;
 
-        switch (sys_config.system_type) {
+	switch (sys_config.system_type) {
 	case SGI_O2:
 		sc->sc_clock.clk_get = ds1687_get;
 		sc->sc_clock.clk_set = ds1687_set;
diff --git a/sys/arch/sgi/sgi/conf.c b/sys/arch/sgi/sgi/conf.c
index 3e80a9b71a3..1d323994518 100644
--- a/sys/arch/sgi/sgi/conf.c
+++ b/sys/arch/sgi/sgi/conf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: conf.c,v 1.1 2004/08/06 21:12:19 pefo Exp $ */
+/*	$OpenBSD: conf.c,v 1.2 2004/08/10 18:47:22 deraadt Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)conf.c	8.2 (Berkeley) 11/14/93
- *      $Id: conf.c,v 1.1 2004/08/06 21:12:19 pefo Exp $
+ *      $Id: conf.c,v 1.2 2004/08/10 18:47:22 deraadt Exp $
  */
 
 #include <sys/param.h>
@@ -181,16 +181,16 @@ struct cdevsw	cdevsw[] =
 	cdev_tty_init(NPTY,pts),	/* 20: pseudo-tty slave */
 	cdev_ptc_init(NPTY,ptc),	/* 21: pseudo-tty master */
 	cdev_disk_init(NRD,rd),		/* 22: ramdisk device */
-	cdev_disk_init(NCCD,ccd),       /* 23: concatenated disk driver */
+	cdev_disk_init(NCCD,ccd),	/* 23: concatenated disk driver */
 	cdev_notdef(),			/* 24: */
 cdev_wsdisplay_init(NWSDISPLAY, wsdisplay),	/* 25: */
 	cdev_mouse_init(NWSKBD, wskbd),	/* 26: */
 	cdev_mouse_init(NWSMOUSE, wsmouse),	/* 27: */
 	cdev_mouse_init(NWSMUX, wsmux),	/* 28: */
 #ifdef USER_PCICONF
-        cdev_pci_init(NPCI,pci),        /* 29: PCI user */
+	cdev_pci_init(NPCI,pci),	/* 29: PCI user */
 #else
-        cdev_notdef(),			/* 29 */
+	cdev_notdef(),			/* 29 */
 #endif
 	cdev_notdef(),			/* 30: */
 	cdev_pf_init(NPF,pf),		/* 31: packet filter */
@@ -266,7 +266,7 @@ getnulldev()
 
 
 int chrtoblktbl[] =  {
-      /* VCHR */      /* VBLK */
+	/* VCHR         VBLK */
 	/* 0 */		NODEV,
 	/* 1 */		NODEV,
 	/* 2 */		NODEV,
diff --git a/sys/arch/sgi/sgi/machdep.c b/sys/arch/sgi/sgi/machdep.c
index a27489ee8f9..58b8d0b8240 100644
--- a/sys/arch/sgi/sgi/machdep.c
+++ b/sys/arch/sgi/sgi/machdep.c
@@ -1,8 +1,8 @@
-/*	$OpenBSD: machdep.c,v 1.3 2004/08/10 12:32:14 pefo Exp $ */
+/*	$OpenBSD: machdep.c,v 1.4 2004/08/10 18:47:22 deraadt Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ -72,7 +72,7 @@
 #include <machine/memconf.h>
 #include <machine/regnum.h>
 
-#include <machine/rm7000.h> 
+#include <machine/rm7000.h>
 
 #include <sys/exec_ecoff.h>
 
@@ -140,7 +140,7 @@ caddr_t	ekern;
 
 struct phys_mem_desc mem_layout[MAXMEMSEGS];
 
-caddr_t mips_init(int, int32_t *);	
+caddr_t mips_init(int, int32_t *);
 void initcpu(void);
 void dumpsys(void);
 void dumpconf(void);
@@ -262,7 +262,7 @@ mips_init(int argc, int32_t *argv)
 			fp = lastkernpage + 1;
 
 		if (fp <= lp)
-			uvm_page_physload(fp, lp, fp, lp, VM_FREELIST_DEFAULT); 
+			uvm_page_physload(fp, lp, fp, lp, VM_FREELIST_DEFAULT);
 	}
 
 	/*
@@ -333,8 +333,9 @@ mips_init(int argc, int32_t *argv)
 	tlb_set_wired(0);
 	tlb_flush(sys_config.cpu[0].tlbsize);
 	tlb_set_wired(sys_config.cpu[0].tlbwired);
-	
-/* XXX Save the following as an example on how to optimize I/O mapping */
+
+	/* XXX Save the following as an example on how to optimize I/O mapping */
+
 	/*
 	 *  Set up some fixed mappings. These are so frequently
 	 *  used so faulting them in will waste to many cycles.
@@ -388,8 +389,8 @@ mips_init(int argc, int32_t *argv)
 	 * Allocate system data structures.
 	 */
 	i = (vsize_t)allocsys(NULL);
-        sd = (caddr_t)pmap_steal_memory(i, NULL, NULL);
-        allocsys(sd);
+	sd = (caddr_t)pmap_steal_memory(i, NULL, NULL);
+	allocsys(sd);
 
 	/*
 	 * Bootstrap VM system.
@@ -474,7 +475,7 @@ allocsys(caddr_t v)
 		bufpages = nbuf * MAXBSIZE / PAGE_SIZE;
 	}
 
-	if (nswbuf == 0) { 
+	if (nswbuf == 0) {
 		nswbuf = (nbuf / 2) &~ 1;	/* even */
 		if (nswbuf > 256) {
 			nswbuf = 256;
@@ -711,14 +712,14 @@ setregs(p, pack, stack, retval)
 	extern struct proc *machFPCurProcPtr;
 #if 0
 /* XXX should check validity of header and perhaps be 32/64 indep. */
-        Elf64_Ehdr *eh = pack->ep_hdr;
+	Elf64_Ehdr *eh = pack->ep_hdr;
 
-        if ((((eh->e_flags & EF_MIPS_ABI) != E_MIPS_ABI_NONE) &&
-            ((eh->e_flags & EF_MIPS_ABI) != E_MIPS_ABI_O32)) ||
-            ((eh->e_flags & EF_MIPS_ARCH) >= E_MIPS_ARCH_3) ||
-            (eh->e_ident[EI_CLASS] != ELFCLASS32)) {
+	if ((((eh->e_flags & EF_MIPS_ABI) != E_MIPS_ABI_NONE) &&
+	    ((eh->e_flags & EF_MIPS_ABI) != E_MIPS_ABI_O32)) ||
+	    ((eh->e_flags & EF_MIPS_ARCH) >= E_MIPS_ARCH_3) ||
+	    (eh->e_ident[EI_CLASS] != ELFCLASS32)) {
 		p->p_md.md_flags |= MDP_O32;
-        }
+	}
 #endif
 
 #if !defined(_LP64)
@@ -968,7 +969,7 @@ atoi(const char *s, int b, const char **o)
 		val = -val;
 	if (o != NULL)
 		*o = s - 1;
-	return val;	
+	return val;
 }
 
 /*
@@ -987,7 +988,7 @@ rm7k_perfcntr(cmd, arg1, arg2, arg3)
 
 	switch(cmd) {
 	case PCNT_FNC_SELECT:
-		if((arg1 & 0xff) > PCNT_SRC_MAX || 
+		if((arg1 & 0xff) > PCNT_SRC_MAX ||
 		   (arg1 & ~(PCNT_CE|PCNT_UM|PCNT_KM|0xff)) != 0) {
 			result = EINVAL;
 			break;
@@ -1029,7 +1030,6 @@ rm7k_perfintr(trapframe)
 	if(p != NULL) {
 		p->p_md.md_pc_spill++;
 	}
-	
 }
 
 int