summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorwiz <wiz@NetBSD.org>2001-09-16 16:34:23 +0000
committerwiz <wiz@NetBSD.org>2001-09-16 16:34:23 +0000
commit456dff6cb86edf66a568fe64ddf51c189a134a94 (patch)
treec7b320ef11ad7cedea28b1d6bed470bb0c718df4 /sys/dev
parent104fe43050c309103819267555448292f072db27 (diff)
Spell 'occurred' with two 'r's.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/audio.c4
-rw-r--r--sys/dev/ic/aic7xxx.c4
-rw-r--r--sys/dev/ic/dp8390.c4
-rw-r--r--sys/dev/ic/elink3.c4
-rw-r--r--sys/dev/ic/elinkxl.c4
-rw-r--r--sys/dev/ic/i82557.c4
-rw-r--r--sys/dev/ic/mb86960.c6
-rw-r--r--sys/dev/ic/nslm7x.c4
-rw-r--r--sys/dev/ic/smc83c170reg.h4
-rw-r--r--sys/dev/ic/tulip.c4
-rw-r--r--sys/dev/pci/bktr/bktr_card.c4
-rw-r--r--sys/dev/pci/btvmeireg.h4
-rw-r--r--sys/dev/pci/cs4281.c4
-rw-r--r--sys/dev/pci/twe.c4
-rw-r--r--sys/dev/raidframe/rf_engine.c4
-rw-r--r--sys/dev/usb/ugen.c4
16 files changed, 33 insertions, 33 deletions
diff --git a/sys/dev/audio.c b/sys/dev/audio.c
index 0ab40368759..43e00efd28c 100644
--- a/sys/dev/audio.c
+++ b/sys/dev/audio.c
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.138 2001/09/03 18:51:43 is Exp $ */
+/* $NetBSD: audio.c,v 1.139 2001/09/16 16:34:36 wiz Exp $ */
/*
* Copyright (c) 1991-1993 Regents of the University of California.
@@ -1588,7 +1588,7 @@ audio_write(sc, uio, ioflag)
saveerror = error;
error = audiostartp(sc);
if (saveerror != 0) {
- /* Report the first error that occured. */
+ /* Report the first error that occurred. */
error = saveerror;
}
}
diff --git a/sys/dev/ic/aic7xxx.c b/sys/dev/ic/aic7xxx.c
index 33d5e7b1d0d..dfee75f02c7 100644
--- a/sys/dev/ic/aic7xxx.c
+++ b/sys/dev/ic/aic7xxx.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aic7xxx.c,v 1.79 2001/07/19 16:25:24 thorpej Exp $ */
+/* $NetBSD: aic7xxx.c,v 1.80 2001/09/16 16:34:36 wiz Exp $ */
/*
* Generic driver for the aic7xxx based adaptec SCSI controllers
@@ -4961,7 +4961,7 @@ ahc_abort_scbs(struct ahc_softc *ahc, int target, char channel,
* Go through the pending CCB list and look for
* commands for this target that are still active.
* These are other tagged commands that were
- * disconnected when the reset occured.
+ * disconnected when the reset occurred.
*/
{
struct scb *scb;
diff --git a/sys/dev/ic/dp8390.c b/sys/dev/ic/dp8390.c
index 5dd596e5bc6..b9470611ddc 100644
--- a/sys/dev/ic/dp8390.c
+++ b/sys/dev/ic/dp8390.c
@@ -1,4 +1,4 @@
-/* $NetBSD: dp8390.c,v 1.47 2001/08/09 11:54:32 thorpej Exp $ */
+/* $NetBSD: dp8390.c,v 1.48 2001/09/16 16:34:36 wiz Exp $ */
/*
* Device driver for National Semiconductor DS8390/WD83C690 based ethernet
@@ -757,7 +757,7 @@ dp8390_intr(arg)
/*
* Decrement buffer in-use count if not zero (can only
- * be zero if a transmitter interrupt occured while not
+ * be zero if a transmitter interrupt occurred while not
* actually transmitting).
* If data is ready to transmit, start it transmitting,
* otherwise defer until after handling receiver.
diff --git a/sys/dev/ic/elink3.c b/sys/dev/ic/elink3.c
index fb564aea1b8..2f7f2f0bc28 100644
--- a/sys/dev/ic/elink3.c
+++ b/sys/dev/ic/elink3.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3.c,v 1.97 2001/07/27 02:33:34 thorpej Exp $ */
+/* $NetBSD: elink3.c,v 1.98 2001/09/16 16:34:36 wiz Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -837,7 +837,7 @@ epinit(ifp)
S_TX_AVAIL);
/*
- * Attempt to get rid of any stray interrupts that occured during
+ * Attempt to get rid of any stray interrupts that occurred during
* configuration. On the i386 this isn't possible because one may
* already be queued. However, a single stray interrupt is
* unimportant.
diff --git a/sys/dev/ic/elinkxl.c b/sys/dev/ic/elinkxl.c
index 30d7c72b0bd..0e3acfbf792 100644
--- a/sys/dev/ic/elinkxl.c
+++ b/sys/dev/ic/elinkxl.c
@@ -1,4 +1,4 @@
-/* $NetBSD: elinkxl.c,v 1.55 2001/07/19 16:25:25 thorpej Exp $ */
+/* $NetBSD: elinkxl.c,v 1.56 2001/09/16 16:34:37 wiz Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -1365,7 +1365,7 @@ ex_getstats(sc)
ifp->if_collisions += bus_space_read_1(iot, ioh, TX_COLLISIONS);
/*
* There seems to be no way to get the exact number of collisions,
- * this is the number that occured at the very least.
+ * this is the number that occurred at the very least.
*/
ifp->if_collisions += 2 * bus_space_read_1(iot, ioh,
TX_AFTER_X_COLLISIONS);
diff --git a/sys/dev/ic/i82557.c b/sys/dev/ic/i82557.c
index 80da7cf5e3f..bd16913c1da 100644
--- a/sys/dev/ic/i82557.c
+++ b/sys/dev/ic/i82557.c
@@ -1,4 +1,4 @@
-/* $NetBSD: i82557.c,v 1.59 2001/08/06 09:51:40 enami Exp $ */
+/* $NetBSD: i82557.c,v 1.60 2001/09/16 16:34:37 wiz Exp $ */
/*-
* Copyright (c) 1997, 1998, 1999, 2001 The NetBSD Foundation, Inc.
@@ -1179,7 +1179,7 @@ fxp_tick(void *arg)
le32toh(sp->rx_rnr_errors) +
le32toh(sp->rx_overrun_errors);
/*
- * If any transmit underruns occured, bump up the transmit
+ * If any transmit underruns occurred, bump up the transmit
* threshold by another 512 bytes (64 * 8).
*/
if (sp->tx_underruns) {
diff --git a/sys/dev/ic/mb86960.c b/sys/dev/ic/mb86960.c
index 1eed640b9cb..dcca8af2017 100644
--- a/sys/dev/ic/mb86960.c
+++ b/sys/dev/ic/mb86960.c
@@ -1,4 +1,4 @@
-/* $NetBSD: mb86960.c,v 1.48 2001/07/07 15:59:38 thorpej Exp $ */
+/* $NetBSD: mb86960.c,v 1.49 2001/09/16 16:34:37 wiz Exp $ */
/*
* All Rights Reserved, Copyright (C) Fujitsu Limited 1995
@@ -892,7 +892,7 @@ mb86960_tint(sc, tstat)
* packet transmission. When we send two or more packets
* with one start command (that's what we do when the
* transmission queue is clauded), 86960 informs us number
- * of collisions occured on the last packet on the
+ * of collisions occurred on the last packet on the
* transmission only. Number of collisions on previous
* packets are lost. I have told that the fact is clearly
* stated in the Fujitsu document.
@@ -1398,7 +1398,7 @@ mb86960_get_packet(sc, len)
*
* I wrote a code for an experimental "delayed padding" technique.
* When employed, it postpones the padding process for short packets.
- * If xmit() occured at the moment, the padding process is omitted, and
+ * If xmit() occurred at the moment, the padding process is omitted, and
* garbages are sent as pad data. If next packet is stored in the
* transmission buffer before xmit(), write_mbuf() pads the previous
* packet before transmitting new packet. This *may* gain the
diff --git a/sys/dev/ic/nslm7x.c b/sys/dev/ic/nslm7x.c
index 871ccaab642..ae6ba06ed57 100644
--- a/sys/dev/ic/nslm7x.c
+++ b/sys/dev/ic/nslm7x.c
@@ -1,4 +1,4 @@
-/* $NetBSD: nslm7x.c,v 1.11 2000/11/04 18:28:19 veego Exp $ */
+/* $NetBSD: nslm7x.c,v 1.12 2001/09/16 16:34:37 wiz Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -678,7 +678,7 @@ generic_fanrpm(sc, sensors)
}
/*
- * pre: last read occured >= 1.5 seconds ago
+ * pre: last read occurred >= 1.5 seconds ago
* post: sensors[] current data are the latest from the chip
*/
void
diff --git a/sys/dev/ic/smc83c170reg.h b/sys/dev/ic/smc83c170reg.h
index dd74ba43a16..47019233bd0 100644
--- a/sys/dev/ic/smc83c170reg.h
+++ b/sys/dev/ic/smc83c170reg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: smc83c170reg.h,v 1.6 2000/05/26 00:20:26 tsutsui Exp $ */
+/* $NetBSD: smc83c170reg.h,v 1.7 2001/09/16 16:34:37 wiz Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -173,7 +173,7 @@ struct epic_fraglist {
#define INTSTAT_RXIDLE 0x00020000 /* receive idle */
#define INTSTAT_INT_ACTV 0x00010000 /* interrupt active */
#define INTSTAT_GP2_INT 0x00008000 /* gpio2 low (PHY event) */
-#define INTSTAT_FATAL_INT 0x00001000 /* fatal error occured */
+#define INTSTAT_FATAL_INT 0x00001000 /* fatal error occurred */
#define INTSTAT_RCT 0x00000800 /* rx copy threshold crossed */
#define INTSTAT_PREI 0x00000400 /* preemptive interrupt */
#define INTSTAT_CNT 0x00000200 /* counter overflow */
diff --git a/sys/dev/ic/tulip.c b/sys/dev/ic/tulip.c
index fe463042abe..7805165ef97 100644
--- a/sys/dev/ic/tulip.c
+++ b/sys/dev/ic/tulip.c
@@ -1,4 +1,4 @@
-/* $NetBSD: tulip.c,v 1.98 2001/08/20 11:57:34 wiz Exp $ */
+/* $NetBSD: tulip.c,v 1.99 2001/09/16 16:34:37 wiz Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -1251,7 +1251,7 @@ tlp_rxintr(sc)
ifp->if_collisions++;
/*
- * If an error occured, update stats, clear the status
+ * If an error occurred, update stats, clear the status
* word, and leave the packet buffer in place. It will
* simply be reused the next time the ring comes around.
* If 802.1Q VLAN MTU is enabled, ignore the Frame Too Long
diff --git a/sys/dev/pci/bktr/bktr_card.c b/sys/dev/pci/bktr/bktr_card.c
index 266ab8b2877..257abb022d2 100644
--- a/sys/dev/pci/bktr/bktr_card.c
+++ b/sys/dev/pci/bktr/bktr_card.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bktr_card.c,v 1.9 2000/12/30 16:52:36 wiz Exp $ */
+/* $NetBSD: bktr_card.c,v 1.10 2001/09/16 16:34:38 wiz Exp $ */
/* FreeBSD: src/sys/dev/bktr/bktr_card.c,v 1.16 2000/10/31 13:09:56 roger Exp */
@@ -1089,7 +1089,7 @@ checkTuner:
} /* end switch(card) */
- /* At this point, a goto checkDBX has not occured */
+ /* At this point, a goto checkDBX has not occurred */
/* We have not been able to select a Tuner */
/* Some cards make use of the tuner address to */
/* identify the make/model of tuner */
diff --git a/sys/dev/pci/btvmeireg.h b/sys/dev/pci/btvmeireg.h
index 25b51f935af..59f5c9ea53f 100644
--- a/sys/dev/pci/btvmeireg.h
+++ b/sys/dev/pci/btvmeireg.h
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmeireg.h,v 1.2 2001/06/12 15:17:25 wiz Exp $ */
+/* $NetBSD: btvmeireg.h,v 1.3 2001/09/16 16:34:38 wiz Exp $ */
#ifndef _bit3reg_h_
#define _bit3reg_h_
@@ -361,7 +361,7 @@
#define RSS_PARITY_ERR (1<<7) /* Interface Parity Error Remote->PCI */
#define RSS_REMBUS_ERR (1<<6) /* Invalid mapping RAM access or a */
- /* data parity error occured */
+ /* data parity error occurred */
#define RSS_PR_STATUS (1<<5) /* PR interrupt set on the VME card */
#define RSS_TIMEOUT_ERR (1<<2) /* Interface Timeout error on DMA xfer */
#define RSS_PT_STATUS (1<<1) /* PT interrupt set on the VME card */
diff --git a/sys/dev/pci/cs4281.c b/sys/dev/pci/cs4281.c
index 4e48345113d..0ccd2705be2 100644
--- a/sys/dev/pci/cs4281.c
+++ b/sys/dev/pci/cs4281.c
@@ -1,4 +1,4 @@
-/* $NetBSD: cs4281.c,v 1.4 2001/04/18 01:35:07 tacha Exp $ */
+/* $NetBSD: cs4281.c,v 1.5 2001/09/16 16:34:38 wiz Exp $ */
/*
* Copyright (c) 2000 Tatoku Ogaito. All rights reserved.
@@ -1228,7 +1228,7 @@ cs4281_init(sc, init)
0x00 << 0; /* PLSS[4:0] Left PCM Playback */
BA0WRITE4(sc, CS4281_SRCSA, dat32);
- /* Set interrupt to occured at Half and Full terminal
+ /* Set interrupt to occurred at Half and Full terminal
* count interrupt enable for DMA channel 0 and 1.
* To keep DMA stop, set MSK.
*/
diff --git a/sys/dev/pci/twe.c b/sys/dev/pci/twe.c
index 034642ba17b..6d2df4e8ad2 100644
--- a/sys/dev/pci/twe.c
+++ b/sys/dev/pci/twe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: twe.c,v 1.17 2001/09/15 20:36:35 chs Exp $ */
+/* $NetBSD: twe.c,v 1.18 2001/09/16 16:34:38 wiz Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -459,7 +459,7 @@ twe_intr(void *arg)
/*
* Attention interrupts, signalled when a controller or child device
- * state change has occured.
+ * state change has occurred.
*/
if ((status & TWE_STS_ATTN_INTR) != 0) {
if ((sc->sc_flags & TWEF_AEN) == 0) {
diff --git a/sys/dev/raidframe/rf_engine.c b/sys/dev/raidframe/rf_engine.c
index dc8887fb0e0..768a11ec02f 100644
--- a/sys/dev/raidframe/rf_engine.c
+++ b/sys/dev/raidframe/rf_engine.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rf_engine.c,v 1.10 2000/08/20 16:51:03 thorpej Exp $ */
+/* $NetBSD: rf_engine.c,v 1.11 2001/09/16 16:34:38 wiz Exp $ */
/*
* Copyright (c) 1995 Carnegie-Mellon University.
* All rights reserved.
@@ -48,7 +48,7 @@
* If a node fails, the dag either rolls forward to the completion or *
* rolls back, undoing previously-completed nodes and fails atomically. *
* The direction of recovery is determined by the location of the failed *
- * node in the graph. If the failure occured before the commit node in *
+ * node in the graph. If the failure occurred before the commit node in *
* the graph, backward recovery is used. Otherwise, forward recovery is *
* used. *
* *
diff --git a/sys/dev/usb/ugen.c b/sys/dev/usb/ugen.c
index 6b6a4607934..596beef7a11 100644
--- a/sys/dev/usb/ugen.c
+++ b/sys/dev/usb/ugen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ugen.c,v 1.46 2001/09/15 16:16:27 yamt Exp $ */
+/* $NetBSD: ugen.c,v 1.47 2001/09/16 16:34:39 wiz Exp $ */
/* $FreeBSD: src/sys/dev/usb/ugen.c,v 1.26 1999/11/17 22:33:41 n_hibma Exp $ */
/*
@@ -508,7 +508,7 @@ ugen_do_read(struct ugen_softc *sc, int endpt, struct uio *uio, int flag)
switch (sce->edesc->bmAttributes & UE_XFERTYPE) {
case UE_INTERRUPT:
- /* Block until activity occured. */
+ /* Block until activity occurred. */
s = splusb();
while (sce->q.c_cc == 0) {
if (flag & IO_NDELAY) {