Module Name: src
Committed By: andvar
Date: Tue Mar 28 20:01:58 UTC 2023
Modified Files:
src/sys/arch/arm/xscale: pxa2x0_mci.c
src/sys/arch/ibmnws/ibmnws: machdep.c
src/sys/arch/luna68k/dev: sioreg.h
src/sys/arch/luna68k/stand/boot: sioreg.h
src/sys/arch/mvmeppc/mvmeppc: machdep.c
src/sys/arch/sparc/include: cgtworeg.h
src/sys/arch/sun3/include: cg2reg.h
src/sys/arch/x68k/x68k: machdep.c
src/sys/arch/zaurus/dev: zrc.c
src/sys/dev/ic: mb89352.c
src/sys/dev/usb: uhid.c
Log Message:
s/interrput/interrupt/ and s/accesss/access/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/pxa2x0_mci.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/ibmnws/ibmnws/machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/luna68k/dev/sioreg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/sioreg.h
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mvmeppc/mvmeppc/machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc/include/cgtworeg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sun3/include/cg2reg.h
cvs rdiff -u -r1.209 -r1.210 src/sys/arch/x68k/x68k/machdep.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/zaurus/dev/zrc.c
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/ic/mb89352.c
cvs rdiff -u -r1.126 -r1.127 src/sys/dev/usb/uhid.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/xscale/pxa2x0_mci.c
diff -u src/sys/arch/arm/xscale/pxa2x0_mci.c:1.13 src/sys/arch/arm/xscale/pxa2x0_mci.c:1.14
--- src/sys/arch/arm/xscale/pxa2x0_mci.c:1.13 Tue Sep 27 06:36:43 2022
+++ src/sys/arch/arm/xscale/pxa2x0_mci.c Tue Mar 28 20:01:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pxa2x0_mci.c,v 1.13 2022/09/27 06:36:43 skrll Exp $ */
+/* $NetBSD: pxa2x0_mci.c,v 1.14 2023/03/28 20:01:57 andvar Exp $ */
/* $OpenBSD: pxa2x0_mmc.c,v 1.5 2009/02/23 18:09:55 miod Exp $ */
/*
@@ -53,7 +53,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_mci.c,v 1.13 2022/09/27 06:36:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_mci.c,v 1.14 2023/03/28 20:01:57 andvar Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -742,7 +742,7 @@ pxamci_stop_clock(struct pxamci_softc *s
}
/*
- * SD/MMC controller interrput handler
+ * SD/MMC controller interrupt handler
*/
static int
pxamci_intr(void *arg)
Index: src/sys/arch/ibmnws/ibmnws/machdep.c
diff -u src/sys/arch/ibmnws/ibmnws/machdep.c:1.19 src/sys/arch/ibmnws/ibmnws/machdep.c:1.20
--- src/sys/arch/ibmnws/ibmnws/machdep.c:1.19 Wed Feb 16 23:49:26 2022
+++ src/sys/arch/ibmnws/ibmnws/machdep.c Tue Mar 28 20:01:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.19 2022/02/16 23:49:26 riastradh Exp $ */
+/* $NetBSD: machdep.c,v 1.20 2023/03/28 20:01:57 andvar Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.19 2022/02/16 23:49:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.20 2023/03/28 20:01:57 andvar Exp $");
#include "opt_compat_netbsd.h"
@@ -159,7 +159,7 @@ void
cpu_startup(void)
{
/*
- * Mapping PReP interrput vector register.
+ * Mapping PReP interrupt vector register.
*/
prep_intr_reg = (vaddr_t) mapiodev(PREP_INTR_REG, PAGE_SIZE, false);
if (!prep_intr_reg)
Index: src/sys/arch/luna68k/dev/sioreg.h
diff -u src/sys/arch/luna68k/dev/sioreg.h:1.5 src/sys/arch/luna68k/dev/sioreg.h:1.6
--- src/sys/arch/luna68k/dev/sioreg.h:1.5 Sat Sep 25 15:18:38 2021
+++ src/sys/arch/luna68k/dev/sioreg.h Tue Mar 28 20:01:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sioreg.h,v 1.5 2021/09/25 15:18:38 tsutsui Exp $ */
+/* $NetBSD: sioreg.h,v 1.6 2023/03/28 20:01:57 andvar Exp $ */
/*
* Copyright (c) 1992, 1993
* The Regents of the University of California. All rights reserved.
@@ -91,7 +91,7 @@
#define WR0_RSTINT 0x10 /* Reset External/Status Interrupt */
#define WR0_CHANRST 0x18 /* Channel Reset */
#define WR0_INTNXT 0x20 /* Enable Interrupt on Next Receive Character */
-#define WR0_RSTPEND 0x28 /* Reset Transmitter Interrput/DMA Pending */
+#define WR0_RSTPEND 0x28 /* Reset Transmitter Interrupt/DMA Pending */
#define WR0_ERRRST 0x30 /* Error Reset */
#define WR0_ENDINTR 0x38 /* End of Interrupt */
Index: src/sys/arch/luna68k/stand/boot/sioreg.h
diff -u src/sys/arch/luna68k/stand/boot/sioreg.h:1.4 src/sys/arch/luna68k/stand/boot/sioreg.h:1.5
--- src/sys/arch/luna68k/stand/boot/sioreg.h:1.4 Sat Feb 14 05:03:09 2015
+++ src/sys/arch/luna68k/stand/boot/sioreg.h Tue Mar 28 20:01:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sioreg.h,v 1.4 2015/02/14 05:03:09 tsutsui Exp $ */
+/* $NetBSD: sioreg.h,v 1.5 2023/03/28 20:01:57 andvar Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -115,7 +115,7 @@ struct siodevice {
#define WR0_RSTINT 0x10 /* Reset External/Status Interrupt */
#define WR0_CHANRST 0x18 /* Channel Reset */
#define WR0_INTNXT 0x20 /* Enable Interrupt on Next Receive Character */
-#define WR0_RSTPEND 0x28 /* Reset Transmitter Interrput/DMA Pending */
+#define WR0_RSTPEND 0x28 /* Reset Transmitter Interrupt/DMA Pending */
#define WR0_ERRRST 0x30 /* Error Reset */
#define WR0_ENDINTR 0x38 /* End of Interrupt */
Index: src/sys/arch/mvmeppc/mvmeppc/machdep.c
diff -u src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.32 src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.33
--- src/sys/arch/mvmeppc/mvmeppc/machdep.c:1.32 Sat Feb 27 01:31:24 2021
+++ src/sys/arch/mvmeppc/mvmeppc/machdep.c Tue Mar 28 20:01:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.32 2021/02/27 01:31:24 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.33 2023/03/28 20:01:57 andvar Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.32 2021/02/27 01:31:24 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.33 2023/03/28 20:01:57 andvar Exp $");
#include "opt_compat_netbsd.h"
#include "opt_mvmetype.h"
@@ -162,7 +162,7 @@ cpu_startup(void)
char modelbuf[256];
/*
- * Mapping PReP-compatible interrput vector register.
+ * Mapping PReP-compatible interrupt vector register.
*/
prep_intr_reg = (vaddr_t) mapiodev(MVMEPPC_INTR_REG, PAGE_SIZE, false);
if (!prep_intr_reg)
Index: src/sys/arch/sparc/include/cgtworeg.h
diff -u src/sys/arch/sparc/include/cgtworeg.h:1.5 src/sys/arch/sparc/include/cgtworeg.h:1.6
--- src/sys/arch/sparc/include/cgtworeg.h:1.5 Tue May 20 13:38:00 2003
+++ src/sys/arch/sparc/include/cgtworeg.h Tue Mar 28 20:01:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cgtworeg.h,v 1.5 2003/05/20 13:38:00 nakayama Exp $ */
+/* $NetBSD: cgtworeg.h,v 1.6 2023/03/28 20:01:57 andvar Exp $ */
/*
* Copyright (c) 1994 Dennis Ferguson
@@ -119,7 +119,7 @@ struct cg2_extstatus {
*/
struct dblbufreg {
u_int display_b : 1; /* display memory B (set) or A (reset) */
- u_int read_b : 1; /* accesss memory B (set) or A (reset) */
+ u_int read_b : 1; /* access memory B (set) or A (reset) */
u_int nowrite_b : 1; /* when set, writes don't update memory B */
u_int nowrite_a : 1; /* when set, writes don't update memory A */
u_int read_ecmap : 1; /* copy from(clear)/to(set) shadow colour map */
Index: src/sys/arch/sun3/include/cg2reg.h
diff -u src/sys/arch/sun3/include/cg2reg.h:1.6 src/sys/arch/sun3/include/cg2reg.h:1.7
--- src/sys/arch/sun3/include/cg2reg.h:1.6 Sun Dec 11 12:19:21 2005
+++ src/sys/arch/sun3/include/cg2reg.h Tue Mar 28 20:01:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: cg2reg.h,v 1.6 2005/12/11 12:19:21 christos Exp $ */
+/* $NetBSD: cg2reg.h,v 1.7 2023/03/28 20:01:57 andvar Exp $ */
/*
* Copyright (c) 1994 Dennis Ferguson
@@ -105,7 +105,7 @@ struct cg2_extstatus {
*/
struct dblbufreg {
u_int display_b : 1; /* display memory B (set) or A (reset) */
- u_int read_b : 1; /* accesss memory B (set) or A (reset) */
+ u_int read_b : 1; /* access memory B (set) or A (reset) */
u_int nowrite_b : 1; /* when set, writes don't update memory B */
u_int nowrite_a : 1; /* when set, writes don't update memory A */
u_int read_ecmap : 1; /* copy from(clear)/to(set) shadow colour map */
Index: src/sys/arch/x68k/x68k/machdep.c
diff -u src/sys/arch/x68k/x68k/machdep.c:1.209 src/sys/arch/x68k/x68k/machdep.c:1.210
--- src/sys/arch/x68k/x68k/machdep.c:1.209 Sat Jul 16 04:55:35 2022
+++ src/sys/arch/x68k/x68k/machdep.c Tue Mar 28 20:01:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.209 2022/07/16 04:55:35 isaki Exp $ */
+/* $NetBSD: machdep.c,v 1.210 2023/03/28 20:01:57 andvar Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.209 2022/07/16 04:55:35 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.210 2023/03/28 20:01:57 andvar Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -503,7 +503,7 @@ cpu_reboot(int howto, char *bootstr)
/*resettodr();*/
}
- /* Disable interrputs. */
+ /* Disable interrupts. */
splhigh();
if (howto & RB_DUMP)
Index: src/sys/arch/zaurus/dev/zrc.c
diff -u src/sys/arch/zaurus/dev/zrc.c:1.12 src/sys/arch/zaurus/dev/zrc.c:1.13
--- src/sys/arch/zaurus/dev/zrc.c:1.12 Sat Aug 7 16:19:08 2021
+++ src/sys/arch/zaurus/dev/zrc.c Tue Mar 28 20:01:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: zrc.c,v 1.12 2021/08/07 16:19:08 thorpej Exp $ */
+/* $NetBSD: zrc.c,v 1.13 2023/03/28 20:01:58 andvar Exp $ */
/* $OpenBSD: zaurus_remote.c,v 1.1 2005/11/17 05:26:31 uwe Exp $ */
/*
@@ -20,7 +20,7 @@
#include "opt_wsdisplay_compat.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zrc.c,v 1.12 2021/08/07 16:19:08 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zrc.c,v 1.13 2023/03/28 20:01:58 andvar Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -189,7 +189,7 @@ zrc_attach(device_t parent, device_t sel
callout_init(&sc->sc_to, 0);
callout_setfunc(&sc->sc_to, zrc_timeout, sc);
- /* Establish interrput */
+ /* Establish interrupt */
pxa2x0_gpio_set_function(C3000_RC_IRQ_PIN, GPIO_IN);
sc->sc_ih = pxa2x0_gpio_intr_establish(C3000_RC_IRQ_PIN,
IST_EDGE_BOTH, IPL_BIO, zrc_intr, sc);
Index: src/sys/dev/ic/mb89352.c
diff -u src/sys/dev/ic/mb89352.c:1.61 src/sys/dev/ic/mb89352.c:1.62
--- src/sys/dev/ic/mb89352.c:1.61 Sat Jan 1 21:07:14 2022
+++ src/sys/dev/ic/mb89352.c Tue Mar 28 20:01:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: mb89352.c,v 1.61 2022/01/01 21:07:14 andvar Exp $ */
+/* $NetBSD: mb89352.c,v 1.62 2023/03/28 20:01:58 andvar Exp $ */
/* NecBSD: mb89352.c,v 1.4 1998/03/14 07:31:20 kmatsuda Exp */
/*-
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.61 2022/01/01 21:07:14 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mb89352.c,v 1.62 2023/03/28 20:01:58 andvar Exp $");
#ifdef DDB
#define integrate
@@ -1829,7 +1829,7 @@ loop:
/* disable disconnect interrupt */
bus_space_write_1(iot, ioh, PCTL,
bus_space_read_1(iot, ioh, PCTL) & ~PCTL_BFINT_ENAB);
- /* XXX reset interrput */
+ /* XXX reset interrupt */
bus_space_write_1(iot, ioh, INTS, ints);
switch (sc->sc_state) {
Index: src/sys/dev/usb/uhid.c
diff -u src/sys/dev/usb/uhid.c:1.126 src/sys/dev/usb/uhid.c:1.127
--- src/sys/dev/usb/uhid.c:1.126 Sat Sep 24 11:06:41 2022
+++ src/sys/dev/usb/uhid.c Tue Mar 28 20:01:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: uhid.c,v 1.126 2022/09/24 11:06:41 riastradh Exp $ */
+/* $NetBSD: uhid.c,v 1.127 2023/03/28 20:01:58 andvar Exp $ */
/*
* Copyright (c) 1998, 2004, 2008, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.126 2022/09/24 11:06:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhid.c,v 1.127 2023/03/28 20:01:58 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -301,7 +301,7 @@ uhidopen(dev_t dev, int flag, int mode,
else
sc->sc_obuf = NULL;
- /* Paranoia: reset SIGIO before enabling interrputs. */
+ /* Paranoia: reset SIGIO before enabling interrupts. */
mutex_enter(&proc_lock);
atomic_store_relaxed(&sc->sc_async, NULL);
mutex_exit(&proc_lock);
