use the right capitalization for `SBus'

ok jmc@

7 files changed, 22 insertions, 22 deletions

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;
 	}