summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2007-05-25 21:27:17 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2007-05-25 21:27:17 +0000
commit4b5549eb7177dfc955b9247f9190ad9252c8039c (patch)
tree27bcc3ba33f8115a674ab5aa2e954560575e4b4e /sys/dev
parentea6c22ed3e8787ca90bd0c939d3f389e7e2ec427 (diff)
"interupt" -> "interrupt" in various comments. Mostly from Diego Casati.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/isa/ariareg.h4
-rw-r--r--sys/dev/microcode/aic7xxx/aic79xx.reg6
-rw-r--r--sys/dev/pci/auixp.c4
-rw-r--r--sys/dev/pci/autri.c6
-rw-r--r--sys/dev/pci/if_wb.c4
-rw-r--r--sys/dev/pci/isesreg.h6
-rw-r--r--sys/dev/tc/tcdsreg.h10
7 files changed, 20 insertions, 20 deletions
diff --git a/sys/dev/isa/ariareg.h b/sys/dev/isa/ariareg.h
index 14d1909b224..71c29d1181d 100644
--- a/sys/dev/isa/ariareg.h
+++ b/sys/dev/isa/ariareg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ariareg.h,v 1.1 1996/05/04 13:29:33 deraadt Exp $ */
+/* $OpenBSD: ariareg.h,v 1.2 2007/05/25 21:27:15 krw Exp $ */
/*
* Copyright (c) 1995, 1996 Roland C. Dowdeswell. All rights reserved.
@@ -91,7 +91,7 @@
#define ARIADSPC_CDVOLUME 0x0007
#define ARIADSPC_MICVOLUME 0x0008
#define ARIADSPC_MIXERCONFIG 0x0009
-#define ARIADSPC_FORCEINTR 0x000a /* Force an Interupt */
+#define ARIADSPC_FORCEINTR 0x000a /* Force an Interrupt */
#define ARIADSPC_TRANSCOMPLETE 0x0010 /* Transfer Complete */
#define ARIADSPC_START_PLAY 0x0011
#define ARIADSPC_STOP_PLAY 0x0012
diff --git a/sys/dev/microcode/aic7xxx/aic79xx.reg b/sys/dev/microcode/aic7xxx/aic79xx.reg
index 5e097676a1a..caaaec46a6e 100644
--- a/sys/dev/microcode/aic7xxx/aic79xx.reg
+++ b/sys/dev/microcode/aic7xxx/aic79xx.reg
@@ -1,4 +1,4 @@
-/* $OpenBSD: aic79xx.reg,v 1.5 2006/02/06 17:29:11 jmc Exp $ */
+/* $OpenBSD: aic79xx.reg,v 1.6 2007/05/25 21:27:15 krw Exp $ */
/*
* Aic79xx register and scratch ram definitions.
*
@@ -40,7 +40,7 @@
*
* $FreeBSD: src/sys/dev/aic7xxx/aic79xx.reg,v 1.18 2004/08/04 17:55:34 gibbs Exp $
*/
-VERSION = "$Id: aic79xx.reg,v 1.5 2006/02/06 17:29:11 jmc Exp $"
+VERSION = "$Id: aic79xx.reg,v 1.6 2007/05/25 21:27:15 krw Exp $"
/*
* This file is processed by the aic7xxx_asm utility for use in assembling
@@ -284,7 +284,7 @@ register HS_MAILBOX {
}
/*
- * Sequencer Interupt Status
+ * Sequencer Interrupt Status
*/
register SEQINTSTAT {
address 0x00C
diff --git a/sys/dev/pci/auixp.c b/sys/dev/pci/auixp.c
index 2036ad3ebad..f092e49e439 100644
--- a/sys/dev/pci/auixp.c
+++ b/sys/dev/pci/auixp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: auixp.c,v 1.8 2007/04/10 17:47:55 miod Exp $ */
+/* $OpenBSD: auixp.c,v 1.9 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: auixp.c,v 1.9 2005/06/27 21:13:09 thorpej Exp $ */
/*
@@ -1087,7 +1087,7 @@ auixp_intr(void *softc)
detected_codecs = status & CODEC_CHECK_BITS;
sc->sc_codec_not_ready_bits |= detected_codecs;
- /* disable detected interupt sources */
+ /* disable detected interrupt sources */
enable = bus_space_read_4(iot, ioh, ATI_REG_IER);
enable &= ~detected_codecs;
bus_space_write_4(iot, ioh, ATI_REG_IER, enable);
diff --git a/sys/dev/pci/autri.c b/sys/dev/pci/autri.c
index 41c85d333ed..c7106132768 100644
--- a/sys/dev/pci/autri.c
+++ b/sys/dev/pci/autri.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autri.c,v 1.18 2006/04/07 22:41:33 jsg Exp $ */
+/* $OpenBSD: autri.c,v 1.19 2007/05/25 21:27:15 krw Exp $ */
/*
* Copyright (c) 2001 SOMEYA Yoshihiko and KUROSAWA Takahiro.
@@ -815,9 +815,9 @@ autri_intr(p)
mask = 1 << (ch & 0x1f);
if (active[(ch & 0x20) ? 1 : 0] & mask) {
- /* clear interupt */
+ /* clear interrupt */
TWRITE4(sc, (ch & 0x20) ? AUTRI_AIN_B : AUTRI_AIN_A, mask);
- /* disable interupt */
+ /* disable interrupt */
autri_reg_clear_4(sc,(ch & 0x20) ? AUTRI_AINTEN_B : AUTRI_AINTEN_A, mask);
#if 0
reg = TREAD4(sc,AUTRI_LFO_GC_CIR) & ~0x0000003f;
diff --git a/sys/dev/pci/if_wb.c b/sys/dev/pci/if_wb.c
index 7225f3462d5..94e054f050e 100644
--- a/sys/dev/pci/if_wb.c
+++ b/sys/dev/pci/if_wb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wb.c,v 1.36 2006/10/25 02:37:50 brad Exp $ */
+/* $OpenBSD: if_wb.c,v 1.37 2007/05/25 21:27:15 krw Exp $ */
/*
* Copyright (c) 1997, 1998
@@ -1425,7 +1425,7 @@ void wb_start(ifp)
* Place the request for the upload interrupt
* in the last descriptor in the chain. This way, if
* we're chaining several packets at once, we'll only
- * get an interupt once for the whole chain rather than
+ * get an interrupt once for the whole chain rather than
* once for each packet.
*/
WB_TXCTL(cur_tx) |= WB_TXCTL_FINT;
diff --git a/sys/dev/pci/isesreg.h b/sys/dev/pci/isesreg.h
index 44a8a088ba3..0d8dd550025 100644
--- a/sys/dev/pci/isesreg.h
+++ b/sys/dev/pci/isesreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isesreg.h,v 1.9 2003/06/07 11:31:24 ho Exp $ $ */
+/* $OpenBSD: isesreg.h,v 1.10 2007/05/25 21:27:16 krw Exp $ $ */
/*
* Copyright (c) 2000 Håkan Olsson (ho@crt.se)
@@ -64,8 +64,8 @@
#define ISES_A(x) (ISES_A_OFFSET + (x))
#define ISES_A_STAT ISES_A(0x00) /* status register */
-#define ISES_A_INTS ISES_A(0x04) /* interupt status register */
-#define ISES_A_INTE ISES_A(0x08) /* interupt enable register */
+#define ISES_A_INTS ISES_A(0x04) /* interrupt status register */
+#define ISES_A_INTE ISES_A(0x08) /* interrupt enable register */
#define ISES_A_SREQ ISES_A(0x0C) /* service request (read) */
#define ISES_A_CTRL ISES_A_SREQ /* control register (write) */
#define ISES_A_OQD ISES_A(0x10) /* Output Queue Data (read) */
diff --git a/sys/dev/tc/tcdsreg.h b/sys/dev/tc/tcdsreg.h
index 974f913a7d1..e402f4db8e1 100644
--- a/sys/dev/tc/tcdsreg.h
+++ b/sys/dev/tc/tcdsreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcdsreg.h,v 1.1 2002/05/02 22:56:06 miod Exp $ */
+/* $OpenBSD: tcdsreg.h,v 1.2 2007/05/25 21:27:16 krw Exp $ */
/* $NetBSD: tcdsreg.h,v 1.1 2000/07/04 02:22:20 nisimura Exp $ */
/*
@@ -157,11 +157,11 @@ void tcds_scsi_reset(int);
#define SCSI_CIR_xxx0 0x00200000 /* RESERVED */
#define SCSI_CIR_xxx1 0x00100000 /* RESERVED */
#else
-#define SCSI_CIR_PREF1 0x00200000 /* 53C94 prefetch interupt */
-#define SCSI_CIR_PREF0 0x00100000 /* 53C94 prefetch interupt */
+#define SCSI_CIR_PREF1 0x00200000 /* 53C94 prefetch interrupt */
+#define SCSI_CIR_PREF0 0x00100000 /* 53C94 prefetch interrupt */
#endif
-#define SCSI_CIR_53C94_INT1 0x00080000 /* SCSI[1] 53C94 Interupt */
-#define SCSI_CIR_53C94_INT0 0x00040000 /* SCSI[0] 53C94 Interupt */
+#define SCSI_CIR_53C94_INT1 0x00080000 /* SCSI[1] 53C94 Interrupt */
+#define SCSI_CIR_53C94_INT0 0x00040000 /* SCSI[0] 53C94 Interrupt */
#define SCSI_CIR_53C94_DREQ1 0x00020000 /* SCSI[1] 53C94 DREQ */
#define SCSI_CIR_53C94_DREQ0 0x00010000 /* SCSI[0] 53C94 DREQ */
#define SCSI_CIR_TC_PAR_TEST 0x00008000 /* TC parity test mode */