diff options
| author | wiz <wiz@NetBSD.org> | 2004-02-24 15:12:51 +0000 |
|---|---|---|
| committer | wiz <wiz@NetBSD.org> | 2004-02-24 15:12:51 +0000 |
| commit | f05e6f1a3a715f74aedadc253974f40e2936cd9d (patch) | |
| tree | 5fb17088047a20776ffe2a4f2c028a666515c3e9 /sys/dev | |
| parent | d5d52b4515a8a3b863ad879c733870ef37eb63ad (diff) | |
occured -> occurred. From Peter Postma.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/fss.c | 6 | ||||
| -rw-r--r-- | sys/dev/fssvar.h | 4 | ||||
| -rw-r--r-- | sys/dev/gpib/mtreg.h | 4 | ||||
| -rw-r--r-- | sys/dev/ic/atppc.c | 6 | ||||
| -rw-r--r-- | sys/dev/pci/emuxkireg.h | 4 | ||||
| -rw-r--r-- | sys/dev/ppbus/ppbus_1284.c | 8 | ||||
| -rw-r--r-- | sys/dev/qbus/rf.c | 8 | ||||
| -rw-r--r-- | sys/dev/raidframe/rf_diskqueue.h | 4 |
8 files changed, 22 insertions, 22 deletions
diff --git a/sys/dev/fss.c b/sys/dev/fss.c index ded77acb494..3af27dac878 100644 --- a/sys/dev/fss.c +++ b/sys/dev/fss.c @@ -1,4 +1,4 @@ -/* $NetBSD: fss.c,v 1.6 2004/02/14 00:00:56 hannken Exp $ */ +/* $NetBSD: fss.c,v 1.7 2004/02/24 15:12:51 wiz Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -43,7 +43,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.6 2004/02/14 00:00:56 hannken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fss.c,v 1.7 2004/02/24 15:12:51 wiz Exp $"); #include "fss.h" @@ -309,7 +309,7 @@ fss_dump(dev_t dev, daddr_t blkno, caddr_t va, size_t size) } /* - * An error occured reading or writing the snapshot or backing store. + * An error occurred reading or writing the snapshot or backing store. * If it is the first error log to console. * The caller holds the simplelock. */ diff --git a/sys/dev/fssvar.h b/sys/dev/fssvar.h index fdda5a2bfa8..3ca73ba25de 100644 --- a/sys/dev/fssvar.h +++ b/sys/dev/fssvar.h @@ -1,4 +1,4 @@ -/* $NetBSD: fssvar.h,v 1.4 2004/02/14 00:00:56 hannken Exp $ */ +/* $NetBSD: fssvar.h,v 1.5 2004/02/24 15:12:51 wiz Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -140,7 +140,7 @@ struct fss_softc { struct simplelock sc_slock; /* Protect this softc */ volatile int sc_flags; /* Flags */ #define FSS_ACTIVE 0x01 /* Snapshot is active */ -#define FSS_ERROR 0x02 /* I/o error occured */ +#define FSS_ERROR 0x02 /* I/O error occurred */ #define FSS_BS_THREAD 0x04 /* Kernel thread is running */ #define FSS_EXCL 0x08 /* Exclusive access granted */ #define FSS_BS_ALLOC 0x10 /* Allocate backing store */ diff --git a/sys/dev/gpib/mtreg.h b/sys/dev/gpib/mtreg.h index 4b038b01d14..337813bf3fa 100644 --- a/sys/dev/gpib/mtreg.h +++ b/sys/dev/gpib/mtreg.h @@ -1,4 +1,4 @@ -/* $NetBSD: mtreg.h,v 1.1 2003/06/02 03:52:24 gmcgarry Exp $ */ +/* $NetBSD: mtreg.h,v 1.2 2004/02/24 15:12:52 wiz Exp $ */ /* * Copyright (c) 1992, The University of Utah and @@ -156,7 +156,7 @@ struct mt_stat { #define SR1_EOF 0x80 /* positioned at File Mark */ #define SR1_BOT 0x40 /* positioned at Beginning of Tape */ #define SR1_EOT 0x20 /* positioned at End of Tape */ -#define SR1_SOFTERR 0x10 /* Recoverable Error has Occured */ +#define SR1_SOFTERR 0x10 /* Recoverable Error has Occurred */ #define SR1_REJECT 0x08 /* HPIB Cmd rejected - Regs 4 & 5 have info */ #define SR1_RO 0x04 /* No Write Ring */ #define SR1_ERR 0x02 /* Unrecoverable Data error - Reg 5 has info */ diff --git a/sys/dev/ic/atppc.c b/sys/dev/ic/atppc.c index 22e36b58d98..d6defe55863 100644 --- a/sys/dev/ic/atppc.c +++ b/sys/dev/ic/atppc.c @@ -1,4 +1,4 @@ -/* $NetBSD: atppc.c,v 1.13 2004/02/10 21:55:38 jdolecek Exp $ */ +/* $NetBSD: atppc.c,v 1.14 2004/02/24 15:12:52 wiz Exp $ */ /* * Copyright (c) 2001 Alcove - Nicolas Souchu @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: atppc.c,v 1.13 2004/02/10 21:55:38 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: atppc.c,v 1.14 2004/02/24 15:12:52 wiz Exp $"); #include "opt_atppc.h" @@ -684,7 +684,7 @@ atppcintr(void *arg) claim = 0; } } - /* Determine if nFault has occured */ + /* Determine if nFault has occurred */ if ((atppc->sc_mode & ATPPC_MODE_ECP) && (atppc->sc_ecr_intr & ATPPC_nFAULT_INTR) && !(atppc->sc_str_intr & nFAULT)) { diff --git a/sys/dev/pci/emuxkireg.h b/sys/dev/pci/emuxkireg.h index 20b9ffdf2f1..c49aed1b2a1 100644 --- a/sys/dev/pci/emuxkireg.h +++ b/sys/dev/pci/emuxkireg.h @@ -1,4 +1,4 @@ -/* $NetBSD: emuxkireg.h,v 1.3 2003/01/28 22:19:29 wiz Exp $ */ +/* $NetBSD: emuxkireg.h,v 1.4 2004/02/24 15:12:52 wiz Exp $ */ /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -423,7 +423,7 @@ #define EMU_DBG 0x52 #define EMU_DBG_ZC 0x80000000 -#define EMU_DBG_SATURATION_OCCURED 0x02000000 +#define EMU_DBG_SATURATION_OCCURRED 0x02000000 #define EMU_DBG_SATURATION_ADDR 0x01ff0000 #define EMU_DBG_SINGLE_STEP 0x00008000 #define EMU_DBG_STEP 0x00004000 diff --git a/sys/dev/ppbus/ppbus_1284.c b/sys/dev/ppbus/ppbus_1284.c index d4dad23c912..135f8916edb 100644 --- a/sys/dev/ppbus/ppbus_1284.c +++ b/sys/dev/ppbus/ppbus_1284.c @@ -1,4 +1,4 @@ -/* $NetBSD: ppbus_1284.c,v 1.5 2004/01/25 00:41:02 bjh21 Exp $ */ +/* $NetBSD: ppbus_1284.c,v 1.6 2004/02/24 15:12:52 wiz Exp $ */ /*- * Copyright (c) 1997 Nicolas Souchu @@ -32,7 +32,7 @@ /* General purpose routines for the IEEE1284-1994 Standard */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ppbus_1284.c,v 1.5 2004/01/25 00:41:02 bjh21 Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ppbus_1284.c,v 1.6 2004/02/24 15:12:52 wiz Exp $"); #include "opt_ppbus_1284.h" @@ -82,7 +82,7 @@ ppbus_1284_get_state(struct device * dev) } -/* Set IEEE1284 state if no error occured */ +/* Set IEEE1284 state if no error occurred */ int ppbus_1284_set_state(struct device * dev, int state) { @@ -649,7 +649,7 @@ ppbus_1284_terminate(struct device * dev) #endif /* do not reset error here to keep the error that - * may occured before the ppbus_1284_terminate() call */ + * may occurred before the ppbus_1284_terminate() call */ ppbus_1284_set_state(dev, PPBUS_TERMINATION); #ifdef PERIPH_1284 diff --git a/sys/dev/qbus/rf.c b/sys/dev/qbus/rf.c index 962b112299a..b1efcf244df 100644 --- a/sys/dev/qbus/rf.c +++ b/sys/dev/qbus/rf.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf.c,v 1.4 2003/08/13 08:08:48 ragge Exp $ */ +/* $NetBSD: rf.c,v 1.5 2004/02/24 15:12:52 wiz Exp $ */ /* * Copyright (c) 2002 Jochen Kunz. * All rights reserved. @@ -36,7 +36,7 @@ TODO: */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.4 2003/08/13 08:08:48 ragge Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf.c,v 1.5 2004/02/24 15:12:52 wiz Exp $"); /* autoconfig stuff */ #include <sys/param.h> @@ -798,7 +798,7 @@ rfc_intr(void *intarg) if ((rfc_sc->sc_curbuf->b_flags & B_ERROR) != 0) { /* - * An error occured while processing this buffer. + * An error occurred while processing this buffer. * Finish it and try to get a new buffer to process. * Return if there are no buffers in the queues. * This loops until the queues are empty or a new @@ -916,7 +916,7 @@ rfc_intr(void *intarg) if ((rfc_sc->sc_curbuf->b_flags & B_ERROR) != 0) { /* - * An error occured while processing this buffer. + * An error occurred while processing this buffer. * Finish it and try to get a new buffer to process. * Return if there are no buffers in the queues. * This loops until the queues are empty or a new diff --git a/sys/dev/raidframe/rf_diskqueue.h b/sys/dev/raidframe/rf_diskqueue.h index 520f8f9c473..3a7c0a5d8f5 100644 --- a/sys/dev/raidframe/rf_diskqueue.h +++ b/sys/dev/raidframe/rf_diskqueue.h @@ -1,4 +1,4 @@ -/* $NetBSD: rf_diskqueue.h,v 1.14 2004/01/01 19:27:36 oster Exp $ */ +/* $NetBSD: rf_diskqueue.h,v 1.15 2004/02/24 15:12:52 wiz Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -79,7 +79,7 @@ struct RF_DiskQueueData_s { struct buf *bp; /* a bp to use to get this I/O done */ /* TAILQ bits for a queue for completed I/O requests */ TAILQ_ENTRY(RF_DiskQueueData_s) iodone_entries; - int error; /* Indicate if an error occured + int error; /* Indicate if an error occurred on this I/O (1=yes, 0=no) */ }; #define RF_LOCK_DISK_QUEUE 0x01 |
