diff options
| -rw-r--r-- | sys/dev/sbus/bppreg.h | 6 | ||||
| -rw-r--r-- | sys/dev/sbus/files.sbus | 4 | ||||
| -rw-r--r-- | sys/dev/sbus/if_le.c | 4 | ||||
| -rw-r--r-- | sys/dev/sbus/if_le_lebuffer.c | 4 | ||||
| -rw-r--r-- | sys/dev/sbus/if_le_ledma.c | 4 | ||||
| -rw-r--r-- | sys/dev/sbus/sbusvar.h | 12 |
6 files changed, 17 insertions, 17 deletions
diff --git a/sys/dev/sbus/bppreg.h b/sys/dev/sbus/bppreg.h index 99dd0e58e1e..591f0f52721 100644 --- a/sys/dev/sbus/bppreg.h +++ b/sys/dev/sbus/bppreg.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bppreg.h,v 1.1 2007/02/28 18:48:35 miod Exp $ */ +/* $OpenBSD: bppreg.h,v 1.2 2007/05/31 17:23:14 sobrado Exp $ */ /* $NetBSD: bppreg.h,v 1.1 1998/09/21 21:20:48 pk Exp $ */ /*- @@ -39,9 +39,9 @@ /* Hardware Configuration Register */ #define BPP_HCR_DSS_MASK 0x003f /* Data before strobe */ -#define BPP_HCR_DSS_SHFT 0 /* (in Sbus clocks)*/ +#define BPP_HCR_DSS_SHFT 0 /* (in SBus clocks)*/ #define BPP_HCR_DSW_MASK 0x7f00 /* Data Strobe Width */ -#define BPP_HCR_DSW_SHFT 8 /* (in Sbus clocks)*/ +#define BPP_HCR_DSW_SHFT 8 /* (in SBus clocks)*/ #define BPP_HCR_TEST 0x8000 /* */ diff --git a/sys/dev/sbus/files.sbus b/sys/dev/sbus/files.sbus index 42c323030df..78470fab5b7 100644 --- a/sys/dev/sbus/files.sbus +++ b/sys/dev/sbus/files.sbus @@ -1,4 +1,4 @@ -# $OpenBSD: files.sbus,v 1.36 2007/02/28 18:48:35 miod Exp $ +# $OpenBSD: files.sbus,v 1.37 2007/05/31 17:23:14 sobrado Exp $ # $NetBSD: files.sbus,v 1.16 2000/12/08 17:29:12 martin Exp $ # # Config file and device description for machine-independent SBUS code. @@ -7,7 +7,7 @@ device sbus {[slot = -1], [offset = -1]} #notyet:file dev/sbus/sbus.c sbus -# Sbus NCR539x SCSI & Lance Ethernet +# SBus NCR539x SCSI & Lance Ethernet device dma {}: lsi64854 attach dma at sbus with dma_sbus device ledma {}: lsi64854 diff --git a/sys/dev/sbus/if_le.c b/sys/dev/sbus/if_le.c index a218799c43c..992cedd1366 100644 --- a/sys/dev/sbus/if_le.c +++ b/sys/dev/sbus/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.12 2006/06/02 20:00:56 miod Exp $ */ +/* $OpenBSD: if_le.c,v 1.13 2007/05/31 17:23:14 sobrado Exp $ */ /* $NetBSD: if_le.c,v 1.17 2001/05/30 11:46:35 mrg Exp $ */ /*- @@ -109,7 +109,7 @@ le_sbus_wrcsr(struct am7990_softc *sc, u_int16_t port, u_int16_t val) #if defined(SUN4M) /* - * We need to flush the Sbus->Mbus write buffers. This can most + * We need to flush the SBus->MBus write buffers. This can most * easily be accomplished by reading back the register that we * just wrote (thanks to Chris Torek for this solution). */ diff --git a/sys/dev/sbus/if_le_lebuffer.c b/sys/dev/sbus/if_le_lebuffer.c index ba069fa3fbe..738b373a142 100644 --- a/sys/dev/sbus/if_le_lebuffer.c +++ b/sys/dev/sbus/if_le_lebuffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_lebuffer.c,v 1.7 2006/06/02 20:00:56 miod Exp $ */ +/* $OpenBSD: if_le_lebuffer.c,v 1.8 2007/05/31 17:23:14 sobrado Exp $ */ /* $NetBSD: if_le_lebuffer.c,v 1.10 2002/03/11 16:00:56 pk Exp $ */ /*- @@ -111,7 +111,7 @@ le_lebuffer_wrcsr(struct am7990_softc *sc, u_int16_t port, u_int16_t val) #if defined(SUN4M) /* - * We need to flush the Sbus->Mbus write buffers. This can most + * We need to flush the SBus->MBus write buffers. This can most * easily be accomplished by reading back the register that we * just wrote (thanks to Chris Torek for this solution). */ diff --git a/sys/dev/sbus/if_le_ledma.c b/sys/dev/sbus/if_le_ledma.c index 8ec1be77465..186b36132c4 100644 --- a/sys/dev/sbus/if_le_ledma.c +++ b/sys/dev/sbus/if_le_ledma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le_ledma.c,v 1.12 2006/06/02 20:00:56 miod Exp $ */ +/* $OpenBSD: if_le_ledma.c,v 1.13 2007/05/31 17:23:14 sobrado Exp $ */ /* $NetBSD: if_le_ledma.c,v 1.14 2001/05/30 11:46:35 mrg Exp $ */ /*- @@ -123,7 +123,7 @@ le_ledma_wrcsr(struct am7990_softc *sc, u_int16_t port, u_int16_t val) #if defined(SUN4M) /* - * We need to flush the Sbus->Mbus write buffers. This can most + * We need to flush the SBus->MBus write buffers. This can most * easily be accomplished by reading back the register that we * just wrote (thanks to Chris Torek for this solution). */ diff --git a/sys/dev/sbus/sbusvar.h b/sys/dev/sbus/sbusvar.h index 95625ad7f6e..6d5c0b71e3a 100644 --- a/sys/dev/sbus/sbusvar.h +++ b/sys/dev/sbus/sbusvar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sbusvar.h,v 1.11 2006/06/21 18:29:22 jason Exp $ */ +/* $OpenBSD: sbusvar.h,v 1.12 2007/05/31 17:23:14 sobrado Exp $ */ /* $NetBSD: sbusvar.h,v 1.11 2000/11/01 06:18:45 eeh Exp $ */ /*- @@ -69,7 +69,7 @@ struct sbus_range { }; /* - * Sbus driver attach arguments. + * SBus driver attach arguments. */ struct sbus_attach_args { int sa_placeholder; /* for obio attach args sharing */ @@ -77,13 +77,13 @@ struct sbus_attach_args { bus_dma_tag_t sa_dmatag; char *sa_name; /* PROM node name */ int sa_node; /* PROM handle */ - struct sbus_reg *sa_reg; /* Sbus register space for device */ - int sa_nreg; /* Number of Sbus register spaces */ + struct sbus_reg *sa_reg; /* SBus register space for device */ + int sa_nreg; /* Number of SBus register spaces */ #define sa_slot sa_reg[0].sbr_slot #define sa_offset sa_reg[0].sbr_offset #define sa_size sa_reg[0].sbr_size - struct sbus_intr *sa_intr; /* Sbus interrupts for device */ + struct sbus_intr *sa_intr; /* SBus interrupts for device */ int sa_nintr; /* Number of interrupts */ #define sa_pri sa_intr[0].sbi_pri @@ -108,7 +108,7 @@ void sbus_destroy_attach_args(struct sbus_attach_args *); bus_space_map(t, BUS_ADDR(slot, offset), sz, flags, hp) #if notyet -/* variables per Sbus */ +/* variables per SBus */ struct sbus_softc { struct device sc_dev; /* base device */ bus_space_tag_t sc_bustag; |