Module Name: src
Committed By: msaitoh
Date: Mon Aug 24 05:37:41 UTC 2020
Modified Files:
src/sys/arch/i386/pnpbios: pciide_pnpbios.c pnpbios.c
src/sys/arch/i386/stand/lib/netif: am7990.c
src/sys/dev/acpi: acpi_i2c.c
src/sys/dev/pci: btvmei.c pciide_common.c
src/sys/dev/vme: vme.c
Log Message:
s/ressource/resource/. No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/i386/pnpbios/pciide_pnpbios.c
cvs rdiff -u -r1.74 -r1.75 src/sys/arch/i386/pnpbios/pnpbios.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/i386/stand/lib/netif/am7990.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/acpi/acpi_i2c.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/pci/btvmei.c
cvs rdiff -u -r1.66 -r1.67 src/sys/dev/pci/pciide_common.c
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/vme/vme.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/i386/pnpbios/pciide_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.33 src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.34
--- src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.33 Fri Oct 20 07:06:06 2017
+++ src/sys/arch/i386/pnpbios/pciide_pnpbios.c Mon Aug 24 05:37:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_pnpbios.c,v 1.33 2017/10/20 07:06:06 jdolecek Exp $ */
+/* $NetBSD: pciide_pnpbios.c,v 1.34 2020/08/24 05:37:40 msaitoh Exp $ */
/*
* Copyright (c) 1999 Soren S. Jorvang. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_pnpbios.c,v 1.33 2017/10/20 07:06:06 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_pnpbios.c,v 1.34 2020/08/24 05:37:40 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -178,7 +178,7 @@ pciide_pnpbios_attach(device_t parent, d
for (drive = 0; drive < cp->ata_channel.ch_ndrives; drive++) {
/*
* we have not probed the drives yet,
- * allocate ressources for all of them.
+ * allocate resources for all of them.
*/
if (pciide_dma_table_setup(sc, 0, drive) != 0) {
/* Abort DMA setup */
Index: src/sys/arch/i386/pnpbios/pnpbios.c
diff -u src/sys/arch/i386/pnpbios/pnpbios.c:1.74 src/sys/arch/i386/pnpbios/pnpbios.c:1.75
--- src/sys/arch/i386/pnpbios/pnpbios.c:1.74 Sun Nov 10 21:16:28 2019
+++ src/sys/arch/i386/pnpbios/pnpbios.c Mon Aug 24 05:37:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pnpbios.c,v 1.74 2019/11/10 21:16:28 chs Exp $ */
+/* $NetBSD: pnpbios.c,v 1.75 2020/08/24 05:37:40 msaitoh Exp $ */
/*
* Copyright (c) 2000 Jason R. Thorpe. All rights reserved.
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.74 2019/11/10 21:16:28 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pnpbios.c,v 1.75 2020/08/24 05:37:40 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -155,7 +155,7 @@ static int pnp_debugdump(struct pnpresou
#endif
/*
- * small ressource types (beginning with 1)
+ * small resource types (beginning with 1)
*/
static const struct{
int (*handler)(struct pnpresources *, const void *, size_t);
Index: src/sys/arch/i386/stand/lib/netif/am7990.c
diff -u src/sys/arch/i386/stand/lib/netif/am7990.c:1.7 src/sys/arch/i386/stand/lib/netif/am7990.c:1.8
--- src/sys/arch/i386/stand/lib/netif/am7990.c:1.7 Sun Dec 14 18:46:33 2008
+++ src/sys/arch/i386/stand/lib/netif/am7990.c Mon Aug 24 05:37:40 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: am7990.c,v 1.7 2008/12/14 18:46:33 christos Exp $ */
+/* $NetBSD: am7990.c,v 1.8 2020/08/24 05:37:40 msaitoh Exp $ */
/* mostly from netbsd:sys/arch/i386/netboot/ne2100.c
memory allocation now 1 chunk, added deallocation
@@ -157,7 +157,7 @@ am7990_init(void)
}
/*
- * Stop ethernet board and free ressources
+ * Stop ethernet board and free resources
*/
void
EtherStop(void)
Index: src/sys/dev/acpi/acpi_i2c.c
diff -u src/sys/dev/acpi/acpi_i2c.c:1.7 src/sys/dev/acpi/acpi_i2c.c:1.8
--- src/sys/dev/acpi/acpi_i2c.c:1.7 Thu Jun 11 02:39:30 2020
+++ src/sys/dev/acpi/acpi_i2c.c Mon Aug 24 05:37:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_i2c.c,v 1.7 2020/06/11 02:39:30 thorpej Exp $ */
+/* $NetBSD: acpi_i2c.c,v 1.8 2020/08/24 05:37:41 msaitoh Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.7 2020/06/11 02:39:30 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_i2c.c,v 1.8 2020/08/24 05:37:41 msaitoh Exp $");
#include <dev/acpi/acpireg.h>
#include <dev/acpi/acpivar.h>
@@ -152,7 +152,7 @@ acpi_i2c_resource_parse_callback(ACPI_RE
case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
break;
default:
- printf("ressource type 0x%x ignored\n", res->Type);
+ printf("resource type 0x%x ignored\n", res->Type);
}
return_ACPI_STATUS(AE_OK);
}
Index: src/sys/dev/pci/btvmei.c
diff -u src/sys/dev/pci/btvmei.c:1.32 src/sys/dev/pci/btvmei.c:1.33
--- src/sys/dev/pci/btvmei.c:1.32 Sun Nov 10 21:16:36 2019
+++ src/sys/dev/pci/btvmei.c Mon Aug 24 05:37:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: btvmei.c,v 1.32 2019/11/10 21:16:36 chs Exp $ */
+/* $NetBSD: btvmei.c,v 1.33 2020/08/24 05:37:41 msaitoh Exp $ */
/*
* Copyright (c) 1999
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.32 2019/11/10 21:16:36 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: btvmei.c,v 1.33 2020/08/24 05:37:41 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -61,7 +61,7 @@ void b3_617_slaveconfig(device_t, struct
static void b3_617_vmeintr(struct b3_617_softc *, unsigned char);
/*
- * mapping ressources, needed for deallocation
+ * mapping resources, needed for deallocation
*/
struct b3_617_vmeresc {
bus_space_handle_t handle;
@@ -336,7 +336,7 @@ b3_617_halt(struct b3_617_softc *sc)
{
/*
* because detach code checks for existence of children,
- * all ressources (mappings, VME IRQs, DMA requests)
+ * all resources (mappings, VME IRQs, DMA requests)
* should be deallocated at this point
*/
Index: src/sys/dev/pci/pciide_common.c
diff -u src/sys/dev/pci/pciide_common.c:1.66 src/sys/dev/pci/pciide_common.c:1.67
--- src/sys/dev/pci/pciide_common.c:1.66 Mon Sep 3 16:29:32 2018
+++ src/sys/dev/pci/pciide_common.c Mon Aug 24 05:37:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_common.c,v 1.66 2018/09/03 16:29:32 riastradh Exp $ */
+/* $NetBSD: pciide_common.c,v 1.67 2020/08/24 05:37:41 msaitoh Exp $ */
/*
@@ -70,7 +70,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.66 2018/09/03 16:29:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_common.c,v 1.67 2020/08/24 05:37:41 msaitoh Exp $");
#include <sys/param.h>
@@ -1073,7 +1073,7 @@ next:
for (drive = 0; drive < sc->sc_wdcdev.wdc_maxdrives; drive++) {
/*
* we have not probed the drives yet, allocate
- * ressources for all of them.
+ * resources for all of them.
*/
if (pciide_dma_table_setup(sc, channel, drive) != 0) {
/* Abort DMA setup */
Index: src/sys/dev/vme/vme.c
diff -u src/sys/dev/vme/vme.c:1.26 src/sys/dev/vme/vme.c:1.27
--- src/sys/dev/vme/vme.c:1.26 Sat Oct 27 17:18:38 2012
+++ src/sys/dev/vme/vme.c Mon Aug 24 05:37:41 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: vme.c,v 1.26 2012/10/27 17:18:38 chs Exp $ */
+/* $NetBSD: vme.c,v 1.27 2020/08/24 05:37:41 msaitoh Exp $ */
/*
* Copyright (c) 1999
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.26 2012/10/27 17:18:38 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vme.c,v 1.27 2020/08/24 05:37:41 msaitoh Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -222,7 +222,7 @@ vmedetach(device_t dev)
struct vmebus_softc *sc = device_private(dev);
if (sc->slaveconfig) {
- /* allow bus master to free its bus ressources */
+ /* allow bus master to free its bus resources */
(*sc->slaveconfig)(device_parent(dev), 0);
}
