summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/arch/amiga/dev/if_edreg.h6
-rw-r--r--sys/arch/mac68k/dev/if_aereg.h6
-rw-r--r--sys/arch/sparc/dev/bereg.h10
-rw-r--r--sys/arch/vax/if/if_qereg.h4
-rw-r--r--sys/dev/ic/am79c930reg.h6
-rw-r--r--sys/dev/ic/dp8390var.h6
-rw-r--r--sys/dev/isa/if_ed.c10
-rw-r--r--sys/dev/isa/if_edreg.h6
-rw-r--r--sys/dev/isa/if_wereg.h6
-rw-r--r--sys/dev/pci/if_tx.c6
10 files changed, 33 insertions, 33 deletions
diff --git a/sys/arch/amiga/dev/if_edreg.h b/sys/arch/amiga/dev/if_edreg.h
index 57aca3272ef..31793cb33a7 100644
--- a/sys/arch/amiga/dev/if_edreg.h
+++ b/sys/arch/amiga/dev/if_edreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_edreg.h,v 1.2 1997/01/16 09:24:41 niklas Exp $ */
+/* $OpenBSD: if_edreg.h,v 1.3 2002/06/03 20:01:36 deraadt Exp $ */
/* $NetBSD: if_edreg.h,v 1.4 1995/05/08 02:40:54 chopps Exp $ */
/*
@@ -10,9 +10,9 @@
* Compile-time config flags
*/
/*
- * This sets the default for enabling/disablng the tranceiver.
+ * This sets the default for enabling/disablng the transceiver.
*/
-#define ED_FLAGS_DISABLE_TRANCEIVER 0x0001
+#define ED_FLAGS_DISABLE_TRANSCEIVER 0x0001
/*
* This forces the board to be used in 8/16-bit mode even if it autoconfigs
diff --git a/sys/arch/mac68k/dev/if_aereg.h b/sys/arch/mac68k/dev/if_aereg.h
index f77079a93bb..6f7aaffe087 100644
--- a/sys/arch/mac68k/dev/if_aereg.h
+++ b/sys/arch/mac68k/dev/if_aereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_aereg.h,v 1.5 1997/03/08 16:16:53 briggs Exp $ */
+/* $OpenBSD: if_aereg.h,v 1.6 2002/06/03 20:01:36 deraadt Exp $ */
/* $NetBSD: if_aereg.h,v 1.14 1997/02/24 07:34:20 scottr Exp $ */
/*
@@ -39,9 +39,9 @@ struct ae_ring {
* Compile-time config flags
*/
/*
- * This sets the default for enabling/disablng the tranceiver.
+ * This sets the default for enabling/disablng the transceiver.
*/
-#define AE_FLAGS_DISABLE_TRANCEIVER 0x0001
+#define AE_FLAGS_DISABLE_TRANSCEIVER 0x0001
/*
* This disables the use of double transmit buffers.
diff --git a/sys/arch/sparc/dev/bereg.h b/sys/arch/sparc/dev/bereg.h
index be8d9e5c1cc..7eb3bed45da 100644
--- a/sys/arch/sparc/dev/bereg.h
+++ b/sys/arch/sparc/dev/bereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: bereg.h,v 1.9 2001/01/30 07:17:07 jason Exp $ */
+/* $OpenBSD: bereg.h,v 1.10 2002/06/03 20:01:36 deraadt Exp $ */
/*
* Copyright (c) 1998 Theo de Raadt and Jason L. Wright.
@@ -206,14 +206,14 @@ struct be_cregs {
#define BE_CR_QMASK_RXSERR 0x00000001 /* rx sbus error ack */
/*
- * BE Tranceiver registers
+ * BE Transceiver registers
*/
struct be_tregs {
- volatile u_int32_t tcvr_pal; /* tranceiver pal */
+ volatile u_int32_t tcvr_pal; /* transceiver pal */
volatile u_int32_t mgmt_pal; /* management pal */
};
-/* be_tregs.tcvr_pal: tranceiver pal */
+/* be_tregs.tcvr_pal: transceiver pal */
#define TCVR_PAL_SERIAL 0x00000001 /* serial mode enable */
#define TCVR_PAL_EXTLBACK 0x00000002 /* external loopback */
#define TCVR_PAL_MSENSE 0x00000004 /* media sense */
@@ -289,7 +289,7 @@ struct be_bufs {
#define BE_PHY_EXTERNAL 0
#define BE_PHY_INTERNAL 1
-/* Tranceiver types */
+/* Transceiver types */
#define BE_TCVR_NONE 0
#define BE_TCVR_INTERNAL 1
#define BE_TCVR_EXTERNAL 2
diff --git a/sys/arch/vax/if/if_qereg.h b/sys/arch/vax/if/if_qereg.h
index 71e7429fdbb..d341d0ce157 100644
--- a/sys/arch/vax/if/if_qereg.h
+++ b/sys/arch/vax/if/if_qereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_qereg.h,v 1.4 2000/04/27 03:14:43 bjc Exp $ */
+/* $OpenBSD: if_qereg.h,v 1.5 2002/06/03 20:01:36 deraadt Exp $ */
/* $NetBSD: if_qereg.h,v 1.5 1999/06/20 00:04:47 ragge Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
@@ -114,7 +114,7 @@ struct qedevice {
#define QE_ILOOP 0x0100 /* Internal loopback */
#define QE_ELOOP 0x0200 /* External loopback */
#define QE_STIM_ENABLE 0x0400 /* Sanity timer enable */
-#define QE_POWERUP 0x1000 /* Tranceiver power on */
+#define QE_POWERUP 0x1000 /* Transceiver power on */
#define QE_CARRIER 0x2000 /* Carrier detect */
#define QE_RCV_INT 0x8000 /* Receiver interrupt */
diff --git a/sys/dev/ic/am79c930reg.h b/sys/dev/ic/am79c930reg.h
index a9c74a49562..5139951cc81 100644
--- a/sys/dev/ic/am79c930reg.h
+++ b/sys/dev/ic/am79c930reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: am79c930reg.h,v 1.3 2001/07/04 09:02:57 niklas Exp $ */
+/* $OpenBSD: am79c930reg.h,v 1.4 2002/06/03 20:01:36 deraadt Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -48,7 +48,7 @@
/*
* The 79c930 contains a bus interface unit, a media access
- * controller, and a tranceiver attachment interface.
+ * controller, and a transceiver attachment interface.
* The MAC contains an 80188 CPU core.
* typical devices built around this chip typically add 32k or 64k of
* memory for buffers.
@@ -112,7 +112,7 @@
/*
- * Tranceiver Attachment Interface Registers (TIR space)
+ * Transceiver Attachment Interface Registers (TIR space)
* (omitted for now, since host access to them is for diagnostic
* purposes only).
*/
diff --git a/sys/dev/ic/dp8390var.h b/sys/dev/ic/dp8390var.h
index 45672d2f488..8a009ca7e7b 100644
--- a/sys/dev/ic/dp8390var.h
+++ b/sys/dev/ic/dp8390var.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dp8390var.h,v 1.7 2002/03/14 01:26:54 millert Exp $ */
+/* $OpenBSD: dp8390var.h,v 1.8 2002/06/03 20:01:36 deraadt Exp $ */
/* $NetBSD: dp8390var.h,v 1.8 1998/08/12 07:19:09 scottr Exp $ */
/*
@@ -106,9 +106,9 @@ struct dp8390_softc {
* Compile-time config flags
*/
/*
- * This sets the default for enabling/disablng the tranceiver.
+ * This sets the default for enabling/disablng the transceiver.
*/
-#define DP8390_DISABLE_TRANCEIVER 0x0001
+#define DP8390_DISABLE_TRANSCEIVER 0x0001
/*
* This forces the board to be used in 8/16-bit mode even if it autoconfigs
diff --git a/sys/dev/isa/if_ed.c b/sys/dev/isa/if_ed.c
index 34d68a82a67..d037d884724 100644
--- a/sys/dev/isa/if_ed.c
+++ b/sys/dev/isa/if_ed.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ed.c,v 1.49 2002/03/14 01:26:56 millert Exp $ */
+/* $OpenBSD: if_ed.c,v 1.50 2002/06/03 20:01:37 deraadt Exp $ */
/* $NetBSD: if_ed.c,v 1.105 1996/10/21 22:40:45 thorpej Exp $ */
/*
@@ -1197,7 +1197,7 @@ ed_find_3Com(sc, cf, ia)
/*
* Unmap PROM - select NIC registers. The proper setting of the
- * tranceiver is set in edinit so that the attach code is given a
+ * transceiver is set in edinit so that the attach code is given a
* chance to set the default based on a compile-time config option.
*/
bus_space_write_1(iot, ioh, asicbase + ED_3COM_CR, ED_3COM_CR_XSEL);
@@ -1656,12 +1656,12 @@ edattach(parent, self, aux)
IFQ_SET_READY(&ifp->if_snd);
/*
- * Set default state for LINK0 flag (used to disable the tranceiver
+ * Set default state for LINK0 flag (used to disable the transceiver
* for AUI operation), based on compile-time config option.
*/
switch (sc->vendor) {
case ED_VENDOR_3COM:
- if (cf->cf_flags & ED_FLAGS_DISABLE_TRANCEIVER)
+ if (cf->cf_flags & ED_FLAGS_DISABLE_TRANSCEIVER)
ifp->if_flags |= IFF_LINK0;
break;
case ED_VENDOR_WD_SMC:
@@ -1883,7 +1883,7 @@ edinit(sc)
NIC_PUT(iot, ioh, nicbase, ED_P0_TCR, 0);
/*
- * If this is a 3Com board, the tranceiver must be software enabled
+ * If this is a 3Com board, the transceiver must be software enabled
* (there is no settable hardware default).
*/
switch (sc->vendor) {
diff --git a/sys/dev/isa/if_edreg.h b/sys/dev/isa/if_edreg.h
index 08a2f58cd28..603a5f8eca2 100644
--- a/sys/dev/isa/if_edreg.h
+++ b/sys/dev/isa/if_edreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_edreg.h,v 1.5 2001/01/25 03:50:50 todd Exp $ */
+/* $OpenBSD: if_edreg.h,v 1.6 2002/06/03 20:01:37 deraadt Exp $ */
/* $NetBSD: if_edreg.h,v 1.15 1996/01/10 16:49:22 chuck Exp $ */
/*
@@ -22,9 +22,9 @@
* Compile-time config flags
*/
/*
- * This sets the default for enabling/disablng the tranceiver.
+ * This sets the default for enabling/disablng the transceiver.
*/
-#define ED_FLAGS_DISABLE_TRANCEIVER 0x0001
+#define ED_FLAGS_DISABLE_TRANSCEIVER 0x0001
/*
* This forces the board to be used in 8/16-bit mode even if it autoconfigs
diff --git a/sys/dev/isa/if_wereg.h b/sys/dev/isa/if_wereg.h
index 4b5fbe99f99..e5b64024821 100644
--- a/sys/dev/isa/if_wereg.h
+++ b/sys/dev/isa/if_wereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wereg.h,v 1.1 1998/09/22 06:33:19 fgsch Exp $ */
+/* $OpenBSD: if_wereg.h,v 1.2 2002/06/03 20:01:37 deraadt Exp $ */
/* $NetBSD: if_wereg.h,v 1.1 1997/11/03 21:22:50 thorpej Exp $ */
/*
@@ -15,9 +15,9 @@
* Compile-time config flags
*/
/*
- * This sets the default for enabling/disablng the tranceiver.
+ * This sets the default for enabling/disablng the transceiver.
*/
-#define WE_FLAGS_DISABLE_TRANCEIVER 0x0001
+#define WE_FLAGS_DISABLE_TRANSCEIVER 0x0001
/*
* This forces the board to be used in 8/16-bit mode even if it autoconfigs
diff --git a/sys/dev/pci/if_tx.c b/sys/dev/pci/if_tx.c
index 8872afcee54..42c3eeea541 100644
--- a/sys/dev/pci/if_tx.c
+++ b/sys/dev/pci/if_tx.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tx.c,v 1.22 2002/03/14 01:26:59 millert Exp $ */
+/* $OpenBSD: if_tx.c,v 1.23 2002/06/03 20:01:36 deraadt Exp $ */
/* $FreeBSD: src/sys/pci/if_tx.c,v 1.45 2001/02/07 20:11:02 semenu Exp $ */
/*-
@@ -1215,7 +1215,7 @@ epic_ifmedia_upd(ifp)
case EPIC_QS6612_PHY:
break;
case EPIC_AC101_PHY:
- /* We have to powerup fiber tranceivers */
+ /* We have to powerup fiber transceivers */
if (IFM_SUBTYPE(media) == IFM_100_FX)
sc->miicfg |= MIICFG_694_ENABLE;
else
@@ -1224,7 +1224,7 @@ epic_ifmedia_upd(ifp)
break;
case EPIC_LXT970_PHY:
- /* We have to powerup fiber tranceivers */
+ /* We have to powerup fiber transceivers */
cfg = PHY_READ(sc->physc, MII_LXTPHY_CONFIG);
if (IFM_SUBTYPE(media) == IFM_100_FX)
cfg |= CONFIG_LEDC1 | CONFIG_LEDC0;