summaryrefslogtreecommitdiff
path: root/sys/arch
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/arch
parentea6c22ed3e8787ca90bd0c939d3f389e7e2ec427 (diff)
"interupt" -> "interrupt" in various comments. Mostly from Diego Casati.
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/arm/xscale/pxa2x0reg.h4
-rw-r--r--sys/arch/hp300/dev/dcmreg.h10
-rw-r--r--sys/arch/hp300/include/intr.h4
-rw-r--r--sys/arch/i386/isa/icu.s4
-rw-r--r--sys/arch/luna88k/luna88k/isr.h4
-rw-r--r--sys/arch/macppc/dev/z8530tty.c4
-rw-r--r--sys/arch/mvme68k/dev/if_lereg.h4
-rw-r--r--sys/arch/mvme88k/dev/if_lereg.h4
-rw-r--r--sys/arch/sparc/dev/xdreg.h4
-rw-r--r--sys/arch/sparc/dev/z8530kbd.c4
-rw-r--r--sys/arch/sparc/dev/z8530tty.c4
-rw-r--r--sys/arch/sparc64/dev/z8530kbd.c4
-rw-r--r--sys/arch/sparc64/dev/z8530tty.c4
-rw-r--r--sys/arch/vax/qbus/qdreg.h4
14 files changed, 31 insertions, 31 deletions
diff --git a/sys/arch/arm/xscale/pxa2x0reg.h b/sys/arch/arm/xscale/pxa2x0reg.h
index e53d35fa9c0..421f3e727e7 100644
--- a/sys/arch/arm/xscale/pxa2x0reg.h
+++ b/sys/arch/arm/xscale/pxa2x0reg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: pxa2x0reg.h,v 1.29 2007/03/18 20:53:10 uwe Exp $ */
+/* $OpenBSD: pxa2x0reg.h,v 1.30 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: pxa2x0reg.h,v 1.4 2003/06/11 20:43:01 scw Exp $ */
/*
@@ -705,7 +705,7 @@ struct pxa2x0_dma_desc {
#define MCCR_FSRIE (1<<1) /* FIFO Service Request Intr Enable */
#define MCCR_FEIE (1<<3) /* FIFO Error Intr Enable */
#define AC97_GCR 0x000c /* Global Control Register */
-#define GCR_GPI_IE (1<<0) /* Codec GPI Interupt Enable */
+#define GCR_GPI_IE (1<<0) /* Codec GPI Interrupt Enable */
#define GCR_nCRST (1<<1) /* AC '97 Cold Reset */
#define GCR_WRST (1<<2) /* AC '97 Warm Reset */
#define GCR_ACOFF (1<<3) /* AC-Link Shut Off */
diff --git a/sys/arch/hp300/dev/dcmreg.h b/sys/arch/hp300/dev/dcmreg.h
index 5fadb0b1870..2b7e49deba1 100644
--- a/sys/arch/hp300/dev/dcmreg.h
+++ b/sys/arch/hp300/dev/dcmreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: dcmreg.h,v 1.4 2003/06/02 23:27:44 millert Exp $ */
+/* $OpenBSD: dcmreg.h,v 1.5 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: dcmreg.h,v 1.5 1996/02/24 00:55:05 thorpej Exp $ */
/*
@@ -140,10 +140,10 @@ struct dcmpreg {
#define DCMRS 0x80 /* software reset, write */
/* interrupt control */
-#define DCMIPL(x) ((((x) >> 4) & 3) + 3) /* interupt level, read */
-#define IC_IR 0x40 /* interupt request, read */
-#define IC_IE 0x80 /* interupt enable, write */
-#define IC_ID 0x00 /* interupt disable, write */
+#define DCMIPL(x) ((((x) >> 4) & 3) + 3) /* interrupt level, read */
+#define IC_IR 0x40 /* interrupt request, read */
+#define IC_IE 0x80 /* interrupt enable, write */
+#define IC_ID 0x00 /* interrupt disable, write */
/* Semaphore control */
diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h
index e6fc7fcbaa5..db07ae7d614 100644
--- a/sys/arch/hp300/include/intr.h
+++ b/sys/arch/hp300/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.19 2007/05/15 13:46:22 martin Exp $ */
+/* $OpenBSD: intr.h,v 1.20 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: intr.h,v 1.2 1997/07/24 05:43:08 scottr Exp $ */
/*-
@@ -56,7 +56,7 @@ struct isr {
/*
* These four globals contain the appropriate PSL_S|PSL_IPL? values
- * to raise interupt priority to the requested level.
+ * to raise interrupt priority to the requested level.
*/
extern unsigned short hp300_bioipl;
extern unsigned short hp300_netipl;
diff --git a/sys/arch/i386/isa/icu.s b/sys/arch/i386/isa/icu.s
index ff1693ec67a..567695b776e 100644
--- a/sys/arch/i386/isa/icu.s
+++ b/sys/arch/i386/isa/icu.s
@@ -1,4 +1,4 @@
-/* $OpenBSD: icu.s,v 1.24 2007/04/12 20:22:58 art Exp $ */
+/* $OpenBSD: icu.s,v 1.25 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: icu.s,v 1.45 1996/01/07 03:59:34 mycroft Exp $ */
/*-
@@ -37,7 +37,7 @@
_C_LABEL(imen):
.long 0xffff # interrupt mask enable (all off)
_C_LABEL(ipending):
- .long 0 # interupts pending
+ .long 0 # interrupts pending
_C_LABEL(netisr):
.long 0 # scheduling bits for network
diff --git a/sys/arch/luna88k/luna88k/isr.h b/sys/arch/luna88k/luna88k/isr.h
index d24972c631f..12442b31de4 100644
--- a/sys/arch/luna88k/luna88k/isr.h
+++ b/sys/arch/luna88k/luna88k/isr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: isr.h,v 1.2 2004/07/27 12:36:34 miod Exp $ */
+/* $OpenBSD: isr.h,v 1.3 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: isr.h,v 1.1 2000/01/05 08:49:04 nisimura Exp $ */
/*-
@@ -46,7 +46,7 @@
#define NISRAUTOVEC 8
/*
- * Autovectored interupt handler cookie.
+ * Autovectored interrupt handler cookie.
*/
struct isr_autovec {
LIST_ENTRY(isr_autovec) isr_link;
diff --git a/sys/arch/macppc/dev/z8530tty.c b/sys/arch/macppc/dev/z8530tty.c
index 288b848540a..58f54adb087 100644
--- a/sys/arch/macppc/dev/z8530tty.c
+++ b/sys/arch/macppc/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530tty.c,v 1.5 2003/10/16 03:31:25 drahn Exp $ */
+/* $OpenBSD: z8530tty.c,v 1.6 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $ */
/*-
@@ -1028,7 +1028,7 @@ zsparam(struct tty *tp, struct termios *t)
}
/*
- * Compute interupt enable bits and set in the pending bits. Called both
+ * Compute interrupt enable bits and set in the pending bits. Called both
* in zsparam() and when PPS (pulse per second timing) state changes.
* Must be called at splzs().
*/
diff --git a/sys/arch/mvme68k/dev/if_lereg.h b/sys/arch/mvme68k/dev/if_lereg.h
index d6b1f49832d..de78971d827 100644
--- a/sys/arch/mvme68k/dev/if_lereg.h
+++ b/sys/arch/mvme68k/dev/if_lereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lereg.h,v 1.8 2003/12/30 21:25:58 miod Exp $ */
+/* $OpenBSD: if_lereg.h,v 1.9 2007/05/25 21:27:15 krw Exp $ */
/*-
* Copyright (c) 1982, 1992, 1993
@@ -49,7 +49,7 @@ struct lereg1 {
*/
struct vlereg1 {
volatile u_int16_t ler1_csr; /* board control/status register */
- volatile u_int16_t ler1_vec; /* interupt vector register */
+ volatile u_int16_t ler1_vec; /* interrupt vector register */
volatile u_int16_t ler1_rdp; /* data port */
volatile u_int16_t ler1_rap; /* register select port */
volatile u_int16_t ler1_ear; /* ethernet address register */
diff --git a/sys/arch/mvme88k/dev/if_lereg.h b/sys/arch/mvme88k/dev/if_lereg.h
index 53b7e69de3b..60d49c8b08d 100644
--- a/sys/arch/mvme88k/dev/if_lereg.h
+++ b/sys/arch/mvme88k/dev/if_lereg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_lereg.h,v 1.5 2006/04/27 06:27:03 miod Exp $ */
+/* $OpenBSD: if_lereg.h,v 1.6 2007/05/25 21:27:15 krw Exp $ */
/*-
* Copyright (c) 1982, 1992, 1993
@@ -39,7 +39,7 @@
*/
struct vlereg1 {
volatile u_int16_t ler1_csr; /* board control/status register */
- volatile u_int16_t ler1_vec; /* interupt vector register */
+ volatile u_int16_t ler1_vec; /* interrupt vector register */
volatile u_int16_t ler1_rdp; /* data port */
volatile u_int16_t ler1_rap; /* register select port */
volatile u_int16_t ler1_ear; /* ethernet address register */
diff --git a/sys/arch/sparc/dev/xdreg.h b/sys/arch/sparc/dev/xdreg.h
index 346b1b3cc8b..84cf9237b77 100644
--- a/sys/arch/sparc/dev/xdreg.h
+++ b/sys/arch/sparc/dev/xdreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xdreg.h,v 1.4 2004/04/12 22:12:32 jmc Exp $ */
+/* $OpenBSD: xdreg.h,v 1.5 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: xdreg.h,v 1.3 1996/03/31 22:38:54 pk Exp $ */
/*
@@ -318,7 +318,7 @@ struct xd_iopb_drive {
struct xd_iopb_format {
volatile u_char same[6]; /* smae as xd_iopb */
/* section 4.4.1: byte 6 */
- volatile u_char interleave_ipl;/* (interleave << 4) | interupt level */
+ volatile u_char interleave_ipl;/* (interleave << 4) | interrupt level */
/* interleave ratio 1:1 to 16:1 */
volatile u_char same1; /* byte 7: same */
/* section 4.4.2: byte 8 */
diff --git a/sys/arch/sparc/dev/z8530kbd.c b/sys/arch/sparc/dev/z8530kbd.c
index e3406ba96c5..5c1aff82061 100644
--- a/sys/arch/sparc/dev/z8530kbd.c
+++ b/sys/arch/sparc/dev/z8530kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530kbd.c,v 1.8 2005/11/11 16:44:48 miod Exp $ */
+/* $OpenBSD: z8530kbd.c,v 1.9 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */
/*-
@@ -660,7 +660,7 @@ out:
}
/*
- * Compute interupt enable bits and set in the pending bits. Called both
+ * Compute interrupt enable bits and set in the pending bits. Called both
* in zsparam() and when PPS (pulse per second timing) state changes.
* Must be called at splzs().
*/
diff --git a/sys/arch/sparc/dev/z8530tty.c b/sys/arch/sparc/dev/z8530tty.c
index 410baf4f1d1..df5096142bf 100644
--- a/sys/arch/sparc/dev/z8530tty.c
+++ b/sys/arch/sparc/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530tty.c,v 1.7 2006/04/29 19:55:31 naddy Exp $ */
+/* $OpenBSD: z8530tty.c,v 1.8 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: z8530tty.c,v 1.13 1996/10/16 20:42:14 gwr Exp $ */
/*-
@@ -1055,7 +1055,7 @@ zsparam(tp, t)
}
/*
- * Compute interupt enable bits and set in the pending bits. Called both
+ * Compute interrupt enable bits and set in the pending bits. Called both
* in zsparam() and when PPS (pulse per second timing) state changes.
* Must be called at splzs().
*/
diff --git a/sys/arch/sparc64/dev/z8530kbd.c b/sys/arch/sparc64/dev/z8530kbd.c
index f2e9cf8c9ce..3d4a5ddae06 100644
--- a/sys/arch/sparc64/dev/z8530kbd.c
+++ b/sys/arch/sparc64/dev/z8530kbd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530kbd.c,v 1.18 2005/11/11 16:44:51 miod Exp $ */
+/* $OpenBSD: z8530kbd.c,v 1.19 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */
/*-
@@ -643,7 +643,7 @@ out:
}
/*
- * Compute interupt enable bits and set in the pending bits. Called both
+ * Compute interrupt enable bits and set in the pending bits. Called both
* in zsparam() and when PPS (pulse per second timing) state changes.
* Must be called at splzs().
*/
diff --git a/sys/arch/sparc64/dev/z8530tty.c b/sys/arch/sparc64/dev/z8530tty.c
index 06d5fd81c0e..d45fa9c644d 100644
--- a/sys/arch/sparc64/dev/z8530tty.c
+++ b/sys/arch/sparc64/dev/z8530tty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: z8530tty.c,v 1.12 2006/04/29 19:55:31 naddy Exp $ */
+/* $OpenBSD: z8530tty.c,v 1.13 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: z8530tty.c,v 1.77 2001/05/30 15:24:24 lukem Exp $ */
/*-
@@ -1018,7 +1018,7 @@ zsparam(tp, t)
}
/*
- * Compute interupt enable bits and set in the pending bits. Called both
+ * Compute interrupt enable bits and set in the pending bits. Called both
* in zsparam() and when PPS (pulse per second timing) state changes.
* Must be called at splzs().
*/
diff --git a/sys/arch/vax/qbus/qdreg.h b/sys/arch/vax/qbus/qdreg.h
index a7be6c4c722..265ce48d803 100644
--- a/sys/arch/vax/qbus/qdreg.h
+++ b/sys/arch/vax/qbus/qdreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: qdreg.h,v 1.4 2006/07/31 18:01:16 miod Exp $ */
+/* $OpenBSD: qdreg.h,v 1.5 2007/05/25 21:27:15 krw Exp $ */
/* $NetBSD: qdreg.h,v 1.1 1998/03/21 10:02:39 ragge Exp $ */
/*-
* Copyright (c) 1982, 1986 The Regents of the University of California.
@@ -319,7 +319,7 @@
#define START_BREAK 0x60
#define STOP_BREAK 0x70
- /* interupt bit definitions */
+ /* interrupt bit definitions */
#define EI_XMT_A 0x01
#define EI_RCV_A 0x02