use the right capitalization for `SBus'

ok jmc@

16 files changed, 47 insertions, 47 deletions

diff --git a/sys/arch/sparc/conf/GENERIC b/sys/arch/sparc/conf/GENERIC
index 465502156cd..61bc21022b1 100644
--- a/sys/arch/sparc/conf/GENERIC
+++ b/sys/arch/sparc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.89 2006/12/10 16:14:20 miod Exp $
+#	$OpenBSD: GENERIC,v 1.90 2007/05/29 09:54:03 sobrado Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -244,7 +244,7 @@ wsdisplay* at bwtwo?
 cgtwo0	at vmes0 addr 0xff400000 level 4 vect 0xa8
 wsdisplay* at cgtwo?
 
-# Sun "cgthree" Sbus color framebuffer.
+# Sun "cgthree" SBus color framebuffer.
 cgthree* at sbus?
 wsdisplay* at cgthree?
 
diff --git a/sys/arch/sparc/conf/RAMDISK b/sys/arch/sparc/conf/RAMDISK
index 0be8564d799..274f14f24b3 100644
--- a/sys/arch/sparc/conf/RAMDISK
+++ b/sys/arch/sparc/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.61 2007/05/01 15:22:23 deraadt Exp $
+#	$OpenBSD: RAMDISK,v 1.62 2007/05/29 09:54:03 sobrado Exp $
 #	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -248,7 +248,7 @@ wsdisplay* at bwtwo?
 cgtwo0	at vmes0 addr 0xff400000 level 4 vect 0xa8
 wsdisplay* at cgtwo?
 
-# Sun "cgthree" Sbus color framebuffer.
+# Sun "cgthree" SBus color framebuffer.
 cgthree* at sbus?
 wsdisplay* at cgthree?
 
diff --git a/sys/arch/sparc/conf/SUN4C b/sys/arch/sparc/conf/SUN4C
index 258dd1a4ee3..71472d24be1 100644
--- a/sys/arch/sparc/conf/SUN4C
+++ b/sys/arch/sparc/conf/SUN4C
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4C,v 1.56 2006/12/09 20:06:46 miod Exp $
+#	$OpenBSD: SUN4C,v 1.57 2007/05/29 09:54:03 sobrado Exp $
 #	$NetBSD: GENERIC,v 1.48 1997/08/23 19:19:01 mjacob Exp $
 
 # Machine architecture; required by config(8)
@@ -113,7 +113,7 @@ bwtwo0	at sbus0					# sun4c on-board
 bwtwo*	at sbus?					# sun4c and sun4m
 wsdisplay* at bwtwo?
 
-# Sun "cgthree" Sbus color framebuffer.
+# Sun "cgthree" SBus color framebuffer.
 cgthree* at sbus?
 wsdisplay* at cgthree?
 
diff --git a/sys/arch/sparc/conf/SUN4M b/sys/arch/sparc/conf/SUN4M
index 70fe7dafef8..28a6ea0038c 100644
--- a/sys/arch/sparc/conf/SUN4M
+++ b/sys/arch/sparc/conf/SUN4M
@@ -1,4 +1,4 @@
-#	$OpenBSD: SUN4M,v 1.72 2006/12/09 20:06:46 miod Exp $
+#	$OpenBSD: SUN4M,v 1.73 2007/05/29 09:54:03 sobrado Exp $
 #	$NetBSD: GENERIC,v 1.28.2.1 1996/07/02 23:55:22 jtc Exp $
 
 # Machine architecture; required by config(8)
@@ -144,7 +144,7 @@ be*	at qec?
 bwtwo*	at sbus?				# sun4c and sun4m
 wsdisplay* at bwtwo?
 
-# Sun "cgthree" Sbus color framebuffer.
+# Sun "cgthree" SBus color framebuffer.
 cgthree* at sbus?
 wsdisplay* at cgthree?
 
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index bc63fdfa95f..00110dace96 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.77 2007/02/03 20:08:50 miod Exp $
+#	$OpenBSD: files.sparc,v 1.78 2007/05/29 09:54:03 sobrado Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -264,7 +264,7 @@ file	arch/sparc/dev/si.c		si | sw
 #attach	en at sbus with en_sbus
 #file	arch/sparc/dev/if_en_sbus.c	en_sbus
 
-# Qlogic ISP 10x0 (Sbus) family
+# Qlogic ISP 10x0 (SBus) family
 # device declaration in sys/conf/files
 attach	isp at sbus with isp_sbus
 file	arch/sparc/dev/isp_sbus.c	isp_sbus
diff --git a/sys/arch/sparc/dev/btreg.h b/sys/arch/sparc/dev/btreg.h
index 395e23747f1..e96a233396d 100644
--- a/sys/arch/sparc/dev/btreg.h
+++ b/sys/arch/sparc/dev/btreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: btreg.h,v 1.4 2003/06/02 23:27:53 millert Exp $	*/
+/*	$OpenBSD: btreg.h,v 1.5 2007/05/29 09:54:05 sobrado Exp $	*/
 /*	$NetBSD: btreg.h,v 1.4 1996/02/27 22:09:21 thorpej Exp $ */
 
 /*
@@ -105,7 +105,7 @@ struct bt_regs {
 
 
 /*
- * Sbus framebuffer control look like this (usually at offset 0x400000).
+ * SBus framebuffer control look like this (usually at offset 0x400000).
  */
 struct fbcontrol {
 	struct	bt_regs fbc_dac;
diff --git a/sys/arch/sparc/dev/dma.c b/sys/arch/sparc/dev/dma.c
index b39a1b4f6cf..e3bb248bd41 100644
--- a/sys/arch/sparc/dev/dma.c
+++ b/sys/arch/sparc/dev/dma.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dma.c,v 1.23 2007/04/10 17:47:54 miod Exp $	*/
+/*	$OpenBSD: dma.c,v 1.24 2007/05/29 09:54:07 sobrado Exp $	*/
 /*	$NetBSD: dma.c,v 1.46 1997/08/27 11:24:16 bouyer Exp $ */
 
 /*
@@ -347,7 +347,7 @@ dma_reset(sc, isledma)
 
 	csr |= D_RESET;				/* reset DMA */
 	DMACSR(sc) = csr;
-	DELAY(200);				/* > 10 Sbus clocks(?) */
+	DELAY(200);				/* > 10 SBus clocks(?) */
 
 	/*DMAWAIT1(sc); why was this here? */
 	DMACSR(sc) &= ~D_RESET;			/* de-assert reset line */
diff --git a/sys/arch/sparc/dev/obio.c b/sys/arch/sparc/dev/obio.c
index 745c07258ea..26295b24e15 100644
--- a/sys/arch/sparc/dev/obio.c
+++ b/sys/arch/sparc/dev/obio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: obio.c,v 1.16 2004/09/29 07:35:11 miod Exp $	*/
+/*	$OpenBSD: obio.c,v 1.17 2007/05/29 09:54:11 sobrado Exp $	*/
 /*	$NetBSD: obio.c,v 1.37 1997/07/29 09:58:11 fair Exp $	*/
 
 /*
@@ -218,7 +218,7 @@ obioattach(parent, self, args)
 		return;
 
 	/*
-	 * There is only one obio bus (it is in fact one of the Sbus slots)
+	 * There is only one obio bus (it is in fact one of the SBus slots)
 	 * How about VME?
 	 */
 	if (self->dv_unit > 0) {
diff --git a/sys/arch/sparc/dev/sbus.c b/sys/arch/sparc/dev/sbus.c
index c61107d8cdb..0357403db49 100644
--- a/sys/arch/sparc/dev/sbus.c
+++ b/sys/arch/sparc/dev/sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbus.c,v 1.15 2006/06/02 20:00:54 miod Exp $	*/
+/*	$OpenBSD: sbus.c,v 1.16 2007/05/29 09:54:13 sobrado Exp $	*/
 /*	$NetBSD: sbus.c,v 1.17 1997/06/01 22:10:39 pk Exp $ */
 
 /*
@@ -42,7 +42,7 @@
  */
 
 /*
- * Sbus stuff.
+ * SBus stuff.
  */
 
 #include <sys/param.h>
@@ -129,7 +129,7 @@ sbus_match(parent, vcf, aux)
 }
 
 /*
- * Attach an Sbus.
+ * Attach an SBus.
  */
 void
 sbus_attach(parent, self, aux)
@@ -146,7 +146,7 @@ sbus_attach(parent, self, aux)
 	int rlen;
 
 	/*
-	 * XXX there is only one Sbus, for now -- do not know how to
+	 * XXX there is only one SBus, for now -- do not know how to
 	 * address children on others
 	 */
 	if (sc->sc_dev.dv_unit > 0 && ca->ca_bustype != BUS_XBOX) {
@@ -218,7 +218,7 @@ sbus_translate(dev, ca)
 	register int i;
 
 	if (sc->sc_nrange == 0) {
-		/* Old-style Sbus configuration */
+		/* Old-style SBus configuration */
 		base = (int)ca->ca_ra.ra_paddr;
 		if (SBUS_ABS(base)) {
 			ca->ca_slot = SBUS_ABS_TO_SLOT(base);
diff --git a/sys/arch/sparc/dev/sbusreg.h b/sys/arch/sparc/dev/sbusreg.h
index 3a6cef35a4e..f6449311a5e 100644
--- a/sys/arch/sparc/dev/sbusreg.h
+++ b/sys/arch/sparc/dev/sbusreg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbusreg.h,v 1.4 2003/06/02 23:27:54 millert Exp $	*/
+/*	$OpenBSD: sbusreg.h,v 1.5 2007/05/29 09:54:15 sobrado Exp $	*/
 /*	$NetBSD: sbusreg.h,v 1.3 1997/09/14 19:17:25 pk Exp $ */
 
 /*
@@ -44,10 +44,10 @@
 /*
  * Sun-4c S-bus definitions.  (Should be made generic!)
  *
- * Sbus slot 0 is not a separate slot; it talks to the onboard I/O devices.
- * It is, however, addressed just like any `real' Sbus.
+ * SBus slot 0 is not a separate slot; it talks to the onboard I/O devices.
+ * It is, however, addressed just like any `real' SBus.
  *
- * Sbus device addresses are obtained from the FORTH PROMs.  They come
+ * SBus device addresses are obtained from the FORTH PROMs.  They come
  * in `absolute' and `relative' address flavors, so we have to handle both.
  * Relative addresses do *not* include the slot number.
  */
@@ -65,5 +65,5 @@ struct sbusreg {
 
 #define NSBUSCFG	20
 	/* Actual number dependent on machine model */
-	u_int32_t	sbus_sbuscfg[NSBUSCFG];	/* Sbus configuration control */
+	u_int32_t	sbus_sbuscfg[NSBUSCFG];	/* SBus configuration control */
 };
diff --git a/sys/arch/sparc/dev/sbusvar.h b/sys/arch/sparc/dev/sbusvar.h
index 0cd1af28626..2c8b8a6cc9f 100644
--- a/sys/arch/sparc/dev/sbusvar.h
+++ b/sys/arch/sparc/dev/sbusvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sbusvar.h,v 1.8 2006/06/02 20:00:54 miod Exp $	*/
+/*	$OpenBSD: sbusvar.h,v 1.9 2007/05/29 09:54:17 sobrado Exp $	*/
 /*	$NetBSD: sbusvar.h,v 1.4 1996/04/22 02:35:05 abrown Exp $ */
 
 /*
@@ -46,15 +46,15 @@
  */
 
 /*
- * Sbus driver attach arguments.
+ * SBus driver attach arguments.
  */
 struct sbus_attach_args {
 	struct	romaux sa_ra;		/* name, node, addr, etc */
-	int	sa_slot;		/* Sbus slot number */
+	int	sa_slot;		/* SBus slot number */
 	int	sa_offset;		/* offset within slot */
 };
 
-/* variables per Sbus */
+/* variables per SBus */
 struct sbus_softc {
 	struct	device sc_dev;		/* base device */
 	int	sc_clockfreq;		/* clock frequency (in Hz) */
diff --git a/sys/arch/sparc/dev/stp_sbus.c b/sys/arch/sparc/dev/stp_sbus.c
index 427f6712fb1..b8ebeb87eda 100644
--- a/sys/arch/sparc/dev/stp_sbus.c
+++ b/sys/arch/sparc/dev/stp_sbus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stp_sbus.c,v 1.5 2006/06/02 20:00:54 miod Exp $	*/
+/*	$OpenBSD: stp_sbus.c,v 1.6 2007/05/29 09:54:19 sobrado Exp $	*/
 /*	$NetBSD: stp4020.c,v 1.23 2002/06/01 23:51:03 lukem Exp $	*/
 
 /*-
@@ -120,7 +120,7 @@ stpattach(parent, self, aux)
 	}
 
 	if (ca->ca_ra.ra_nintr != 2) {
-		printf(": expect 2 interrupt Sbus levels; got %d\n",
+		printf(": expect 2 interrupt SBus levels; got %d\n",
 		    ca->ca_ra.ra_nintr);
 		return;
 	}
diff --git a/sys/arch/sparc/include/pte.h b/sys/arch/sparc/include/pte.h
index 41c1f23c9f4..112da7a5e47 100644
--- a/sys/arch/sparc/include/pte.h
+++ b/sys/arch/sparc/include/pte.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pte.h,v 1.5 1999/09/07 08:30:52 art Exp $	*/
+/*	$OpenBSD: pte.h,v 1.6 2007/05/29 09:54:21 sobrado Exp $	*/
 /*	$NetBSD: pte.h,v 1.19 1997/08/05 11:00:10 pk Exp $ */
 
 /*
@@ -269,7 +269,7 @@ extern int mmu_has_hole;
 #define	PG_TYPE		0x0c000000	/* both type bits */
 
 #define	PG_OBMEM	0x00000000	/* on board memory */
-#define	PG_OBIO		0x04000000	/* on board I/O (incl. Sbus on 4c) */
+#define	PG_OBIO		0x04000000	/* on board I/O (incl. SBus on 4c) */
 #define	PG_VME16	0x08000000	/* 16-bit-data VME space */
 #define	PG_VME32	0x0c000000	/* 32-bit-data VME space */
 #if defined(SUN4M)
diff --git a/sys/arch/sparc/sparc/autoconf.c b/sys/arch/sparc/sparc/autoconf.c
index 2495f0fd0d6..a2bbcc4f915 100644
--- a/sys/arch/sparc/sparc/autoconf.c
+++ b/sys/arch/sparc/sparc/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.78 2007/05/04 19:30:55 deraadt Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.79 2007/05/29 09:53:54 sobrado Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.73 1997/07/29 09:41:53 fair Exp $ */
 
 /*
@@ -1002,7 +1002,7 @@ romprop(rp, cp, node)
 			for (n = 0; n < len; n++) {
 				intr = interrupts[n];
 				/*
-				 * Non-Sbus devices (such as the cgfourteen,
+				 * Non-SBus devices (such as the cgfourteen,
 				 * which attaches on obio) do not need their
 				 * interrupt level translated.
 				 */
diff --git a/sys/arch/sparc/sparc/intr.c b/sys/arch/sparc/sparc/intr.c
index d5ace6ea10a..0906c999d96 100644
--- a/sys/arch/sparc/sparc/intr.c
+++ b/sys/arch/sparc/sparc/intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.c,v 1.29 2007/05/01 15:21:43 deraadt Exp $ */
+/*	$OpenBSD: intr.c,v 1.30 2007/05/29 09:53:57 sobrado Exp $ */
 /*	$NetBSD: intr.c,v 1.20 1997/07/29 09:42:03 fair Exp $ */
 
 /*
@@ -106,7 +106,7 @@ union sir sir;
 int netisr;
 
 /*
- * Level 1 software interrupt (could also be Sbus level 1 interrupt).
+ * Level 1 software interrupt (could also be SBus level 1 interrupt).
  * Three possible reasons:
  *	ROM console input needed
  *	Network software interrupt
@@ -227,15 +227,15 @@ intr_init()
  */
 struct intrhand *intrhand[15] = {
 	NULL,			/*  0 = error */
-	&level01,		/*  1 = software level 1 + Sbus */
-	NULL,	 		/*  2 = Sbus level 2 (4m: Sbus L1) */
-	NULL,			/*  3 = SCSI + DMA + Sbus level 3 (4m: L2,lpt)*/
+	&level01,		/*  1 = software level 1 + SBus */
+	NULL,	 		/*  2 = SBus level 2 (4m: SBus L1) */
+	NULL,			/*  3 = SCSI + DMA + SBus level 3 (4m: L2,lpt)*/
 	NULL,			/*  4 = software level 4 (tty softint) (scsi) */
-	NULL,			/*  5 = Ethernet + Sbus level 4 (4m: Sbus L3) */
+	NULL,			/*  5 = Ethernet + SBus level 4 (4m: SBus L3) */
 	NULL,			/*  6 = software level 6 (not used) (4m: enet)*/
-	NULL,			/*  7 = video + Sbus level 5 */
-	NULL,			/*  8 = Sbus level 6 */
-	NULL,			/*  9 = Sbus level 7 */
+	NULL,			/*  7 = video + SBus level 5 */
+	NULL,			/*  8 = SBus level 6 */
+	NULL,			/*  9 = SBus level 7 */
 	&level10,		/* 10 = counter 0 = clock */
 	NULL,			/* 11 = floppy */
 	NULL,			/* 12 = zs hardware interrupt */
diff --git a/sys/arch/sparc/sparc/iommu.c b/sys/arch/sparc/sparc/iommu.c
index 5ac357db671..79bfee1250e 100644
--- a/sys/arch/sparc/sparc/iommu.c
+++ b/sys/arch/sparc/sparc/iommu.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iommu.c,v 1.19 2005/03/29 11:33:18 miod Exp $	*/
+/*	$OpenBSD: iommu.c,v 1.20 2007/05/29 09:53:59 sobrado Exp $	*/
 /*	$NetBSD: iommu.c,v 1.13 1997/07/29 09:42:04 fair Exp $ */
 
 /*
@@ -272,7 +272,7 @@ iommu_attach(parent, self, aux)
 		oca.ca_ra.ra_bp = NULL;
 
 	/*
-	 * Loop through ROM children (expect Sbus among them).
+	 * Loop through ROM children (expect SBus among them).
 	 */
 	for (node = firstchild(node); node; node = nextsibling(node)) {
 		name = getpropstring(node, "name");