Module Name: src Committed By: andvar Date: Sun Jun 2 13:28:46 UTC 2024
Modified Files: src/share/man/man9: heartbeat.9 src/sys/arch/alpha/pci: mcpciareg.h src/sys/arch/arm/nxp: imxpcie.c src/sys/arch/arm/samsung: exynos_reg.h src/sys/arch/epoc32/windermere: windermerereg.h src/sys/arch/hpcsh/dev/hd64461: hd64461pcmcia.c src/sys/arch/hpcsh/dev/hd64465: hd64465pcmcia.c src/sys/arch/mac68k/dev: pm_direct.c src/sys/arch/mac68k/mac68k: machdep.c src/sys/arch/macppc/dev: pm_direct.c src/sys/arch/newsmips/newsmips: news4000.c news5000.c src/sys/arch/sun3/dev: esp.c src/sys/dev/ic: cd18xx.c src/sys/dev/marvell: mvxpsecvar.h src/sys/dev/mca: espreg.h src/usr.sbin/ofctl: ofctl.c Log Message: fix various typos in word `interrupt', mainly in comments. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/share/man/man9/heartbeat.9 cvs rdiff -u -r1.8 -r1.9 src/sys/arch/alpha/pci/mcpciareg.h cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nxp/imxpcie.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/samsung/exynos_reg.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/epoc32/windermere/windermerereg.h cvs rdiff -u -r1.55 -r1.56 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/mac68k/dev/pm_direct.c cvs rdiff -u -r1.367 -r1.368 src/sys/arch/mac68k/mac68k/machdep.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/macppc/dev/pm_direct.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/newsmips/newsmips/news4000.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/newsmips/newsmips/news5000.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/sun3/dev/esp.c cvs rdiff -u -r1.32 -r1.33 src/sys/dev/ic/cd18xx.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/marvell/mvxpsecvar.h cvs rdiff -u -r1.2 -r1.3 src/sys/dev/mca/espreg.h cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/ofctl/ofctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/share/man/man9/heartbeat.9 diff -u src/share/man/man9/heartbeat.9:1.5 src/share/man/man9/heartbeat.9:1.6 --- src/share/man/man9/heartbeat.9:1.5 Fri Jul 7 15:56:31 2023 +++ src/share/man/man9/heartbeat.9 Sun Jun 2 13:28:45 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: heartbeat.9,v 1.5 2023/07/07 15:56:31 uwe Exp $ +.\" $NetBSD: heartbeat.9,v 1.6 2024/06/02 13:28:45 andvar Exp $ .\" .\" Copyright (c) 2023 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -88,7 +88,7 @@ checks whether .Xr time_uptime 9 has changed, to see if either the .Xr timecounter 9 -or soft intrrupts on the current CPU are stuck. +or soft interrupts on the current CPU are stuck. If it hasn't advanced within .Li kern.heartbeat.max_period seconds worth of ticks, or if it has updated and the current CPU's view Index: src/sys/arch/alpha/pci/mcpciareg.h diff -u src/sys/arch/alpha/pci/mcpciareg.h:1.8 src/sys/arch/alpha/pci/mcpciareg.h:1.9 --- src/sys/arch/alpha/pci/mcpciareg.h:1.8 Mon Feb 6 02:14:14 2012 +++ src/sys/arch/alpha/pci/mcpciareg.h Sun Jun 2 13:28:45 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: mcpciareg.h,v 1.8 2012/02/06 02:14:14 matt Exp $ */ +/* $NetBSD: mcpciareg.h,v 1.9 2024/06/02 13:28:45 andvar Exp $ */ /* * Copyright (c) 1998 by Matthew Jacob @@ -108,7 +108,7 @@ * - (8+x)(9+y*2).F000.3EFF * * (8+x)(9+y*2).F000.3F00, N/A PCIy Interrupt ACK0 - * (8+x)(9+y*2).F000.3F40 PCIy INteruppt ACK1 + * (8+x)(9+y*2).F000.3F40 PCIy Interrupt ACK1 * * (8+x)(9+y*2).F000.3F80 N/A Unused * - (8+x)(9+y*2).FFFF.FFFF Index: src/sys/arch/arm/nxp/imxpcie.c diff -u src/sys/arch/arm/nxp/imxpcie.c:1.4 src/sys/arch/arm/nxp/imxpcie.c:1.5 --- src/sys/arch/arm/nxp/imxpcie.c:1.4 Sat Aug 7 16:18:45 2021 +++ src/sys/arch/arm/nxp/imxpcie.c Sun Jun 2 13:28:45 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: imxpcie.c,v 1.4 2021/08/07 16:18:45 thorpej Exp $ */ +/* $NetBSD: imxpcie.c,v 1.5 2024/06/02 13:28:45 andvar Exp $ */ /* * Copyright (c) 2019 Genetec Corporation. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: imxpcie.c,v 1.4 2021/08/07 16:18:45 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imxpcie.c,v 1.5 2024/06/02 13:28:45 andvar Exp $"); #include "opt_pci.h" #include "opt_fdt.h" @@ -566,7 +566,7 @@ imxpcie_setup(struct imxpcie_softc * con PCIE_WRITE(sc, PCI_BAR0, 0x00000004); PCIE_WRITE(sc, PCI_BAR1, 0x00000000); - /* Interurupt pins */ + /* Interrupt pins */ v = PCIE_READ(sc, PCI_INTERRUPT_REG); v &= ~(PCI_INTERRUPT_PIN_MASK << PCI_INTERRUPT_PIN_SHIFT); v |= PCI_INTERRUPT_PIN_A << PCI_INTERRUPT_PIN_SHIFT; Index: src/sys/arch/arm/samsung/exynos_reg.h diff -u src/sys/arch/arm/samsung/exynos_reg.h:1.15 src/sys/arch/arm/samsung/exynos_reg.h:1.16 --- src/sys/arch/arm/samsung/exynos_reg.h:1.15 Sun Jun 11 00:13:15 2017 +++ src/sys/arch/arm/samsung/exynos_reg.h Sun Jun 2 13:28:45 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: exynos_reg.h,v 1.15 2017/06/11 00:13:15 jmcneill Exp $ */ +/* $NetBSD: exynos_reg.h,v 1.16 2024/06/02 13:28:45 andvar Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -48,7 +48,7 @@ * ISP In-System Programming, like a JTAG * ACP Accelerator Coherency Port * SSS Security Sub System - * GIC Generic Interurrupt Controller + * GIC Generic Interrupt Controller * PMU Power Management Unit * DMC 2D Graphics engine * LEFTBUS Data bus / Peripheral bus Index: src/sys/arch/epoc32/windermere/windermerereg.h diff -u src/sys/arch/epoc32/windermere/windermerereg.h:1.1 src/sys/arch/epoc32/windermere/windermerereg.h:1.2 --- src/sys/arch/epoc32/windermere/windermerereg.h:1.1 Sun Apr 28 12:11:26 2013 +++ src/sys/arch/epoc32/windermere/windermerereg.h Sun Jun 2 13:28:46 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: windermerereg.h,v 1.1 2013/04/28 12:11:26 kiyohara Exp $ */ +/* $NetBSD: windermerereg.h,v 1.2 2024/06/02 13:28:46 andvar Exp $ */ /* * Copyright (c) 2012 KIYOHARA Takashi * All rights reserved. @@ -69,8 +69,8 @@ /* Interrupt */ #define INTSR 0x00 /* Interrupt Status(after masking) */ #define INTRSR 0x01 /* Interrupt Status(before masking) */ -#define INTENS 0x02 /* Interrupr Enable */ -#define INTENC 0x03 /* Interrupr Disable */ +#define INTENS 0x02 /* Interrupt Enable */ +#define INTENC 0x03 /* Interrupt Disable */ /* UART */ #define UART_SIZE 0x20 Index: src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c diff -u src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.55 src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.56 --- src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c:1.55 Mon Oct 11 02:30:00 2021 +++ src/sys/arch/hpcsh/dev/hd64461/hd64461pcmcia.c Sun Jun 2 13:28:45 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: hd64461pcmcia.c,v 1.55 2021/10/11 02:30:00 rin Exp $ */ +/* $NetBSD: hd64461pcmcia.c,v 1.56 2024/06/02 13:28:45 andvar Exp $ */ /*- * Copyright (c) 2001, 2002, 2004 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.55 2021/10/11 02:30:00 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hd64461pcmcia.c,v 1.56 2024/06/02 13:28:45 andvar Exp $"); #include "opt_hd64461pcmcia.h" @@ -458,7 +458,7 @@ hd64461pcmcia_channel0_intr(void *arg) int ret = 0; r = hd64461_reg_read_1(HD64461_PCC0CSCR_REG8); - /* clear interrtupt (edge source only) */ + /* clear interrupt (edge source only) */ hd64461_reg_write_1(HD64461_PCC0CSCR_REG8, 0); if (r & HD64461_PCC0CSCR_P0IREQ) { @@ -482,7 +482,7 @@ hd64461pcmcia_channel1_intr(void *arg) int ret = 0; r = hd64461_reg_read_1(HD64461_PCC1CSCR_REG8); - /* clear interrtupt */ + /* clear interrupt */ hd64461_reg_write_1(HD64461_PCC1CSCR_REG8, 0); if (r & HD64461_PCC1CSCR_P1RC) { Index: src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c diff -u src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c:1.36 src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c:1.37 --- src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c:1.36 Wed Apr 5 21:53:56 2023 +++ src/sys/arch/hpcsh/dev/hd64465/hd64465pcmcia.c Sun Jun 2 13:28:45 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: hd64465pcmcia.c,v 1.36 2023/04/05 21:53:56 andvar Exp $ */ +/* $NetBSD: hd64465pcmcia.c,v 1.37 2024/06/02 13:28:45 andvar Exp $ */ /*- * Copyright (c) 2001, 2002 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hd64465pcmcia.c,v 1.36 2023/04/05 21:53:56 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hd64465pcmcia.c,v 1.37 2024/06/02 13:28:45 andvar Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -383,7 +383,7 @@ hd64465pcmcia_intr(void *arg) cscr = HD64461_PCCCSCR(ch->ch_channel); r = hd64465_reg_read_1(cscr); - /* clear interrtupt (don't change power switch select) */ + /* clear interrupt (don't change power switch select) */ hd64465_reg_write_1(cscr, r & ~0x40); if (r & (0x60 | 0x04/* for memory mapped mode*/)) { Index: src/sys/arch/mac68k/dev/pm_direct.c diff -u src/sys/arch/mac68k/dev/pm_direct.c:1.31 src/sys/arch/mac68k/dev/pm_direct.c:1.32 --- src/sys/arch/mac68k/dev/pm_direct.c:1.31 Fri Apr 26 00:59:08 2024 +++ src/sys/arch/mac68k/dev/pm_direct.c Sun Jun 2 13:28:45 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: pm_direct.c,v 1.31 2024/04/26 00:59:08 nat Exp $ */ +/* $NetBSD: pm_direct.c,v 1.32 2024/06/02 13:28:45 andvar Exp $ */ /* * Copyright (C) 1997 Takashi Hamada @@ -32,7 +32,7 @@ /* From: pm_direct.c 1.3 03/18/98 Takashi Hamada */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.31 2024/04/26 00:59:08 nat Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.32 2024/06/02 13:28:45 andvar Exp $"); #include "opt_adb.h" @@ -410,7 +410,7 @@ pm_pmgrop_pm1(PMData *pmdata) u_char pm_data; u_char *pm_buf; - /* disable all inetrrupts but PM */ + /* disable all interrupts but PM */ via1_vIER = via_reg(VIA1, vIER); PM_VIA_INTR_DISABLE(); @@ -681,7 +681,7 @@ pm_pmgrop_pm2(PMData *pmdata) s = splhigh(); - /* disable all inetrrupts but PM */ + /* disable all interrupts but PM */ via1_vIER = 0x10; via1_vIER &= via_reg(VIA1, vIER); via_reg(VIA1, vIER) = via1_vIER; Index: src/sys/arch/mac68k/mac68k/machdep.c diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.367 src/sys/arch/mac68k/mac68k/machdep.c:1.368 --- src/sys/arch/mac68k/mac68k/machdep.c:1.367 Sat Feb 10 08:24:51 2024 +++ src/sys/arch/mac68k/mac68k/machdep.c Sun Jun 2 13:28:44 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.367 2024/02/10 08:24:51 andvar Exp $ */ +/* $NetBSD: machdep.c,v 1.368 2024/06/02 13:28:44 andvar Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -74,7 +74,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.367 2024/02/10 08:24:51 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.368 2024/06/02 13:28:44 andvar Exp $"); #include "opt_adb.h" #include "opt_compat_netbsd.h" @@ -1100,7 +1100,7 @@ getenv(const char *str) * is the same for all machines which use that ROM. The offset addresses of * the machine-specific routines is generally different for each machine. * The machine-specific routines currently used by NetBSD/mac68k include: - * ADB_interrupt, PM_interrpt, ADBBase+130_interrupt, + * ADB_interrupt, PM_interrupt, ADBBase+130_interrupt, * PMgrOp, jClkNoMem, Egret, InitEgret, and ADBReInit_JTBL * * It is possible that the routine at "jClkNoMem" is a common routine, but Index: src/sys/arch/macppc/dev/pm_direct.c diff -u src/sys/arch/macppc/dev/pm_direct.c:1.38 src/sys/arch/macppc/dev/pm_direct.c:1.39 --- src/sys/arch/macppc/dev/pm_direct.c:1.38 Wed Feb 9 22:30:26 2022 +++ src/sys/arch/macppc/dev/pm_direct.c Sun Jun 2 13:28:46 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: pm_direct.c,v 1.38 2022/02/09 22:30:26 andvar Exp $ */ +/* $NetBSD: pm_direct.c,v 1.39 2024/06/02 13:28:46 andvar Exp $ */ /* * Copyright (C) 1997 Takashi Hamada @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.38 2022/02/09 22:30:26 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pm_direct.c,v 1.39 2024/06/02 13:28:46 andvar Exp $"); #ifdef DEBUG #ifndef ADB_DEBUG @@ -481,7 +481,7 @@ pmgrop(PMData *pmdata) s = splhigh(); - /* disable all inetrrupts but PM */ + /* disable all interrupts but PM */ via1_vIER = 0x10; via1_vIER &= read_via_reg(VIA1, vIER); write_via_reg(VIA1, vIER, via1_vIER); Index: src/sys/arch/newsmips/newsmips/news4000.c diff -u src/sys/arch/newsmips/newsmips/news4000.c:1.1 src/sys/arch/newsmips/newsmips/news4000.c:1.2 --- src/sys/arch/newsmips/newsmips/news4000.c:1.1 Sun Oct 14 00:10:11 2018 +++ src/sys/arch/newsmips/newsmips/news4000.c Sun Jun 2 13:28:44 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: news4000.c,v 1.1 2018/10/14 00:10:11 tsutsui Exp $ */ +/* $NetBSD: news4000.c,v 1.2 2024/06/02 13:28:44 andvar Exp $ */ /*- * Copyright (C) 2000 NONAKA Kimihiro. All rights reserved. @@ -199,7 +199,7 @@ news4000_enable_timer(void) news4000_tc_init(); #endif - /* enable timer interrpt */ + /* enable timer interrupt */ *(volatile uint32_t *)NEWS4000_TIMERCTL = 1; } Index: src/sys/arch/newsmips/newsmips/news5000.c diff -u src/sys/arch/newsmips/newsmips/news5000.c:1.22 src/sys/arch/newsmips/newsmips/news5000.c:1.23 --- src/sys/arch/newsmips/newsmips/news5000.c:1.22 Sun Oct 14 00:10:11 2018 +++ src/sys/arch/newsmips/newsmips/news5000.c Sun Jun 2 13:28:44 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: news5000.c,v 1.22 2018/10/14 00:10:11 tsutsui Exp $ */ +/* $NetBSD: news5000.c,v 1.23 2024/06/02 13:28:44 andvar Exp $ */ /*- * Copyright (C) 1999 SHIMIZU Ryo. All rights reserved. @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: news5000.c,v 1.22 2018/10/14 00:10:11 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: news5000.c,v 1.23 2024/06/02 13:28:44 andvar Exp $"); #define __INTR_PRIVATE #include <sys/param.h> @@ -241,7 +241,7 @@ news5000_enable_timer(void) news5000_tc_init(); - /* enable timer interrpt */ + /* enable timer interrupt */ *(volatile uint32_t *)NEWS5000_INTEN2 = NEWS5000_INT2_TIMER0; } Index: src/sys/arch/sun3/dev/esp.c diff -u src/sys/arch/sun3/dev/esp.c:1.28 src/sys/arch/sun3/dev/esp.c:1.29 --- src/sys/arch/sun3/dev/esp.c:1.28 Mon Apr 28 20:23:37 2008 +++ src/sys/arch/sun3/dev/esp.c Sun Jun 2 13:28:45 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: esp.c,v 1.28 2008/04/28 20:23:37 martin Exp $ */ +/* $NetBSD: esp.c,v 1.29 2024/06/02 13:28:45 andvar Exp $ */ /*- * Copyright (c) 1997 The NetBSD Foundation, Inc. @@ -35,7 +35,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.28 2008/04/28 20:23:37 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: esp.c,v 1.29 2024/06/02 13:28:45 andvar Exp $"); #include <sys/types.h> #include <sys/param.h> @@ -231,7 +231,7 @@ espattach(device_t parent, device_t self break; } - /* and the interuppts */ + /* and the interrupts */ isr_add_autovect(ncr53c9x_intr, sc, ca->ca_intpri); evcnt_attach_dynamic(&sc->sc_intrcnt, EVCNT_TYPE_INTR, NULL, device_xname(self), "intr"); Index: src/sys/dev/ic/cd18xx.c diff -u src/sys/dev/ic/cd18xx.c:1.32 src/sys/dev/ic/cd18xx.c:1.33 --- src/sys/dev/ic/cd18xx.c:1.32 Fri Feb 2 22:00:33 2024 +++ src/sys/dev/ic/cd18xx.c Sun Jun 2 13:28:44 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: cd18xx.c,v 1.32 2024/02/02 22:00:33 andvar Exp $ */ +/* $NetBSD: cd18xx.c,v 1.33 2024/06/02 13:28:44 andvar Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -92,7 +92,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.32 2024/02/02 22:00:33 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cd18xx.c,v 1.33 2024/06/02 13:28:44 andvar Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -1045,7 +1045,7 @@ cdtty_hwiflow(struct cd18xx_softc *sc, s /* * this is the number of interrupts allowed, total. set it to 0 - * to allow unlimited interrpts + * to allow unlimited interrupts */ #define INTR_MAX_ALLOWED 0 Index: src/sys/dev/marvell/mvxpsecvar.h diff -u src/sys/dev/marvell/mvxpsecvar.h:1.3 src/sys/dev/marvell/mvxpsecvar.h:1.4 --- src/sys/dev/marvell/mvxpsecvar.h:1.3 Sun May 22 11:39:27 2022 +++ src/sys/dev/marvell/mvxpsecvar.h Sun Jun 2 13:28:45 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: mvxpsecvar.h,v 1.3 2022/05/22 11:39:27 riastradh Exp $ */ +/* $NetBSD: mvxpsecvar.h,v 1.4 2024/06/02 13:28:45 andvar Exp $ */ /* * Copyright (c) 2015 Internet Initiative Japan Inc. * All rights reserved. @@ -345,7 +345,7 @@ typedef SLIST_HEAD(mvxpsec_packet_list, * Event counters */ struct mvxpsec_evcnt { - /* interuprts */ + /* interrupts */ struct evcnt intr_all; struct evcnt intr_auth; struct evcnt intr_des; Index: src/sys/dev/mca/espreg.h diff -u src/sys/dev/mca/espreg.h:1.2 src/sys/dev/mca/espreg.h:1.3 --- src/sys/dev/mca/espreg.h:1.2 Mon Apr 28 20:23:53 2008 +++ src/sys/dev/mca/espreg.h Sun Jun 2 13:28:46 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: espreg.h,v 1.2 2008/04/28 20:23:53 martin Exp $ */ +/* $NetBSD: espreg.h,v 1.3 2024/06/02 13:28:46 andvar Exp $ */ /*- * Copyright (c) 1997, 2001 The NetBSD Foundation, Inc. @@ -42,7 +42,7 @@ #define N86C01_MODE_ENABLE 0x02 /* Mode enable register */ #define N86C01_DATA_WIDTH 0x80 /* data width - 1=16 0=8 */ -#define N86C01_INTR_ENABLE 0x40 /* enable inrerrupts 1=enable*/ +#define N86C01_INTR_ENABLE 0x40 /* enable interrupts 1=enable*/ #define N86C01_INTR_SELECT_MSK 0x30 /* IRQ select - see ADF */ #define N86C01_IOADDR_MSK 0x0e /* Base Address - see ADF */ #define N86C01_CARD_ENABLE 0x01 /* Card enable - 1=enabled */ Index: src/usr.sbin/ofctl/ofctl.c diff -u src/usr.sbin/ofctl/ofctl.c:1.15 src/usr.sbin/ofctl/ofctl.c:1.16 --- src/usr.sbin/ofctl/ofctl.c:1.15 Sat Jun 6 22:33:23 2020 +++ src/usr.sbin/ofctl/ofctl.c Sun Jun 2 13:28:46 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: ofctl.c,v 1.15 2020/06/06 22:33:23 thorpej Exp $ */ +/* $NetBSD: ofctl.c,v 1.16 2024/06/02 13:28:46 andvar Exp $ */ /*- * Copyright (c) 2006, 2007 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ #ifndef lint __COPYRIGHT("@(#) Copyright (c) 2006, 2007\ The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: ofctl.c,v 1.15 2020/06/06 22:33:23 thorpej Exp $"); +__RCSID("$NetBSD: ofctl.c,v 1.16 2024/06/02 13:28:46 andvar Exp $"); #endif /* not lint */ #include <stdio.h> @@ -899,7 +899,7 @@ static const struct { #if 0 { "assigned-addresses", assigned_addresses_format }, { "ranges", ranges_format }, - { "interrupt-map", interrup_map_format }, + { "interrupt-map", interrupt_map_format }, { "interrupt", interrupt_format }, #endif { "model", string_format },