Module Name: src
Committed By: andvar
Date: Sat May 6 21:34:40 UTC 2023
Modified Files:
src/sys/arch/amiga/dev: efa.c
src/sys/arch/arc/jazz: oosiop_jazzio.c
src/sys/arch/atari/pci: pci_vga.c
src/sys/arch/hpcmips/vr: vr4181ecureg.h vrc4172gpio.c vrgiu.c
src/sys/arch/prep/stand/boot: vreset.c
src/sys/dev/acpi: acpi_wdrt.c
src/sys/dev/ic: vga_subr.c
Log Message:
s/regster/register/ in comments and error messages.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/dev/efa.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arc/jazz/oosiop_jazzio.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/atari/pci/pci_vga.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/hpcmips/vr/vr4181ecureg.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/hpcmips/vr/vrc4172gpio.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/hpcmips/vr/vrgiu.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/prep/stand/boot/vreset.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/acpi/acpi_wdrt.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/vga_subr.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/amiga/dev/efa.c
diff -u src/sys/arch/amiga/dev/efa.c:1.15 src/sys/arch/amiga/dev/efa.c:1.16
--- src/sys/arch/amiga/dev/efa.c:1.15 Fri Oct 20 07:06:06 2017
+++ src/sys/arch/amiga/dev/efa.c Sat May 6 21:34:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: efa.c,v 1.15 2017/10/20 07:06:06 jdolecek Exp $ */
+/* $NetBSD: efa.c,v 1.16 2023/05/06 21:34:39 andvar Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -147,7 +147,7 @@ efa_attach(device_t parent, device_t sel
return;
}
if (!efa_mapreg_native(sc)) {
- aprint_error_dev(self, "couldn't map FastATA regsters\n");
+ aprint_error_dev(self, "couldn't map FastATA registers\n");
return;
}
Index: src/sys/arch/arc/jazz/oosiop_jazzio.c
diff -u src/sys/arch/arc/jazz/oosiop_jazzio.c:1.7 src/sys/arch/arc/jazz/oosiop_jazzio.c:1.8
--- src/sys/arch/arc/jazz/oosiop_jazzio.c:1.7 Fri Jul 1 19:25:42 2011
+++ src/sys/arch/arc/jazz/oosiop_jazzio.c Sat May 6 21:34:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: oosiop_jazzio.c,v 1.7 2011/07/01 19:25:42 dyoung Exp $ */
+/* $NetBSD: oosiop_jazzio.c,v 1.8 2023/05/06 21:34:39 andvar Exp $ */
/*
* Copyright (c) 2001 Shuichiro URATA. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: oosiop_jazzio.c,v 1.7 2011/07/01 19:25:42 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: oosiop_jazzio.c,v 1.8 2023/05/06 21:34:39 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,7 +83,7 @@ oosiop_jazzio_attach(device_t parent, de
if (bus_space_map(sc->sc_bst, ja->ja_addr,
OOSIOP_NREGS, 0, &sc->sc_bsh) != 0) {
- aprint_error(": failed to map regsters\n");
+ aprint_error(": failed to map registers\n");
return;
}
Index: src/sys/arch/atari/pci/pci_vga.c
diff -u src/sys/arch/atari/pci/pci_vga.c:1.20 src/sys/arch/atari/pci/pci_vga.c:1.21
--- src/sys/arch/atari/pci/pci_vga.c:1.20 Fri Jan 6 10:28:28 2023
+++ src/sys/arch/atari/pci/pci_vga.c Sat May 6 21:34:39 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_vga.c,v 1.20 2023/01/06 10:28:28 tsutsui Exp $ */
+/* $NetBSD: pci_vga.c,v 1.21 2023/05/06 21:34:39 andvar Exp $ */
/*
* Copyright (c) 1999 Leo Weppelman. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_vga.c,v 1.20 2023/01/06 10:28:28 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_vga.c,v 1.21 2023/05/06 21:34:39 andvar Exp $");
#include <sys/param.h>
#include <sys/queue.h>
@@ -81,7 +81,7 @@ static const uint8_t vga_atc[] = {
};
/* video DAC palette registers */
-/* XXX only set up 16 colors used by internal palette in ATC regsters */
+/* XXX only set up 16 colors used by internal palette in ATC registers */
static const uint8_t vga_dacpal[] = {
/* R G B */
0x00, 0x00, 0x00, /* BLACK */
Index: src/sys/arch/hpcmips/vr/vr4181ecureg.h
diff -u src/sys/arch/hpcmips/vr/vr4181ecureg.h:1.2 src/sys/arch/hpcmips/vr/vr4181ecureg.h:1.3
--- src/sys/arch/hpcmips/vr/vr4181ecureg.h:1.2 Mon Apr 28 20:23:22 2008
+++ src/sys/arch/hpcmips/vr/vr4181ecureg.h Sat May 6 21:34:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vr4181ecureg.h,v 1.2 2008/04/28 20:23:22 martin Exp $ */
+/* $NetBSD: vr4181ecureg.h,v 1.3 2023/05/06 21:34:40 andvar Exp $ */
/*
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,6 +37,6 @@
#define ECU_SIZE 0x20 /* bus map size */
#define ECU_INTSTAT_REG_W 0x18 /* interrupt status */
#define ECU_INTMSK_REG_W 0x1a /* interrupt mask */
-#define ECU_CFG_REG_1_W 0x1e /* configuration regster 1 */
+#define ECU_CFG_REG_1_W 0x1e /* configuration register 1 */
#define ECU_MAX_INTR 16
Index: src/sys/arch/hpcmips/vr/vrc4172gpio.c
diff -u src/sys/arch/hpcmips/vr/vrc4172gpio.c:1.17 src/sys/arch/hpcmips/vr/vrc4172gpio.c:1.18
--- src/sys/arch/hpcmips/vr/vrc4172gpio.c:1.17 Sat Aug 7 16:18:54 2021
+++ src/sys/arch/hpcmips/vr/vrc4172gpio.c Sat May 6 21:34:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vrc4172gpio.c,v 1.17 2021/08/07 16:18:54 thorpej Exp $ */
+/* $NetBSD: vrc4172gpio.c,v 1.18 2023/05/06 21:34:40 andvar Exp $ */
/*-
* Copyright (c) 2001 TAKEMRUA Shin. All rights reserved.
*
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrc4172gpio.c,v 1.17 2021/08/07 16:18:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrc4172gpio.c,v 1.18 2023/05/06 21:34:40 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -141,7 +141,7 @@ CFATTACH_DECL_NEW(vrc4172gpio, sizeof(st
vrc4172gpio_match, vrc4172gpio_attach, NULL, NULL);
/*
- * regster access method
+ * register access method
*/
static inline u_int16_t
read_2(struct vrc4172gpio_softc *sc, bus_addr_t off)
Index: src/sys/arch/hpcmips/vr/vrgiu.c
diff -u src/sys/arch/hpcmips/vr/vrgiu.c:1.47 src/sys/arch/hpcmips/vr/vrgiu.c:1.48
--- src/sys/arch/hpcmips/vr/vrgiu.c:1.47 Sat Aug 7 16:18:54 2021
+++ src/sys/arch/hpcmips/vr/vrgiu.c Sat May 6 21:34:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vrgiu.c,v 1.47 2021/08/07 16:18:54 thorpej Exp $ */
+/* $NetBSD: vrgiu.c,v 1.48 2023/05/06 21:34:40 andvar Exp $ */
/*-
* Copyright (c) 1999-2001
* Shin Takemura and PocketBSD Project. All rights reserved.
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vrgiu.c,v 1.47 2021/08/07 16:18:54 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vrgiu.c,v 1.48 2023/05/06 21:34:40 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -412,7 +412,7 @@ vrgiu_dump_regs(struct vrgiu_softc *sc)
printf(" INTHTSEL: %08x\n", vrgiu_regread_4(sc, GIUINTHTSEL_REG));
}
/*
- * GIU regster access method.
+ * GIU register access method.
*/
u_int32_t
vrgiu_regread_4(struct vrgiu_softc *sc, bus_addr_t offs)
Index: src/sys/arch/prep/stand/boot/vreset.c
diff -u src/sys/arch/prep/stand/boot/vreset.c:1.10 src/sys/arch/prep/stand/boot/vreset.c:1.11
--- src/sys/arch/prep/stand/boot/vreset.c:1.10 Wed Feb 16 23:49:27 2022
+++ src/sys/arch/prep/stand/boot/vreset.c Sat May 6 21:34:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vreset.c,v 1.10 2022/02/16 23:49:27 riastradh Exp $ */
+/* $NetBSD: vreset.c,v 1.11 2023/05/06 21:34:40 andvar Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -113,7 +113,7 @@ static vga_reg_t GR_regs[GRREGS] = {
};
/* video DAC palette registers */
-/* XXX only set up 16 colors used by internal palette in ATC regsters */
+/* XXX only set up 16 colors used by internal palette in ATC registers */
static const u_int8_t vga_dacpal[] = {
/* R G B */
0x00, 0x00, 0x00, /* BLACK */
Index: src/sys/dev/acpi/acpi_wdrt.c
diff -u src/sys/dev/acpi/acpi_wdrt.c:1.4 src/sys/dev/acpi/acpi_wdrt.c:1.5
--- src/sys/dev/acpi/acpi_wdrt.c:1.4 Thu Apr 23 23:23:00 2015
+++ src/sys/dev/acpi/acpi_wdrt.c Sat May 6 21:34:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wdrt.c,v 1.4 2015/04/23 23:23:00 pgoyette Exp $ */
+/* $NetBSD: acpi_wdrt.c,v 1.5 2023/05/06 21:34:40 andvar Exp $ */
/*
* Copyright (c) 2011 Jared D. McNeill <[email protected]>
@@ -35,7 +35,7 @@
/* #define ACPIWDRT_DEBUG */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wdrt.c,v 1.4 2015/04/23 23:23:00 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wdrt.c,v 1.5 2023/05/06 21:34:40 andvar Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -142,7 +142,7 @@ acpi_wdrt_match(device_t parent, cfdata_
return 0;
}
- /* Read control regster */
+ /* Read control register */
rv = AcpiOsReadMemory(wdrt->ControlRegister.Address, &val,
wdrt->ControlRegister.BitWidth);
if (ACPI_FAILURE(rv))
Index: src/sys/dev/ic/vga_subr.c
diff -u src/sys/dev/ic/vga_subr.c:1.25 src/sys/dev/ic/vga_subr.c:1.26
--- src/sys/dev/ic/vga_subr.c:1.25 Thu Aug 9 20:25:05 2012
+++ src/sys/dev/ic/vga_subr.c Sat May 6 21:34:40 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vga_subr.c,v 1.25 2012/08/09 20:25:05 uwe Exp $ */
+/* $NetBSD: vga_subr.c,v 1.26 2023/05/06 21:34:40 andvar Exp $ */
/*
* Copyright (c) 1998
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vga_subr.c,v 1.25 2012/08/09 20:25:05 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vga_subr.c,v 1.26 2023/05/06 21:34:40 andvar Exp $");
/* for WSDISPLAY_BORDER_COLOR */
#include "opt_wsdisplay_border.h"
@@ -348,7 +348,7 @@ static const uint8_t vga_atc[] = {
};
/* video DAC palette registers */
-/* XXX only set up 16 colors used by internal palette in ATC regsters */
+/* XXX only set up 16 colors used by internal palette in ATC registers */
static const uint8_t vga_dacpal[] = {
/* R G B */
0x00, 0x00, 0x00, /* BLACK */
@@ -379,23 +379,23 @@ vga_initregs(struct vga_handle *vh)
/* synchronous reset */
vga_ts_write(vh, syncreset, 0x01);
- /* set TS regsters */
+ /* set TS registers */
for (i = 2; i < VGA_TS_NREGS; i++)
_vga_ts_write(vh, i, vga_ts[i]);
/* clear synchronous reset */
vga_ts_write(vh, syncreset, 0x03);
- /* unprotect CRTC regsters */
+ /* unprotect CRTC registers */
vga_6845_write(vh, vsynce, vga_6845_read(vh, vsynce) & ~0x80);
- /* set CRTC regsters */
+ /* set CRTC registers */
for (i = 0; i < MC6845_NREGS; i++)
_vga_6845_write(vh, i, vga_crtc[i]);
- /* set GDC regsters */
+ /* set GDC registers */
for (i = 0; i < VGA_GDC_NREGS; i++)
_vga_gdc_write(vh, i, vga_gdc[i]);
- /* set ATC regsters */
+ /* set ATC registers */
for (i = 0; i < VGA_ATC_NREGS; i++)
_vga_attr_write(vh, i, vga_atc[i]);
