Module Name: src
Committed By: andvar
Date: Sat May 28 22:16:44 UTC 2022
Modified Files:
src/lib/libc/citrus: citrus_ctype_template.h
src/sys/arch/alpha/stand: Makefile.bootprogs
src/sys/arch/evbmips/stand/sbmips: Makefile.bootprogs
src/sys/arch/powerpc/include: altivec.h
src/sys/arch/sbmips/stand: Makefile.bootprogs
src/sys/arch/sparc64/dev: psmreg.h
src/sys/dev/ata: ata.c
src/sys/dev/i2c: i2cvar.h
src/sys/dev/pci: hptide.c
src/sys/netinet: sctp_indata.c sctp_pcb.c
Log Message:
fix various typos in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/lib/libc/citrus/citrus_ctype_template.h
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/alpha/stand/Makefile.bootprogs
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/powerpc/include/altivec.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sbmips/stand/Makefile.bootprogs
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/sparc64/dev/psmreg.h
cvs rdiff -u -r1.167 -r1.168 src/sys/dev/ata/ata.c
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/i2c/i2cvar.h
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/pci/hptide.c
cvs rdiff -u -r1.11 -r1.12 src/sys/netinet/sctp_indata.c
cvs rdiff -u -r1.24 -r1.25 src/sys/netinet/sctp_pcb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/citrus/citrus_ctype_template.h
diff -u src/lib/libc/citrus/citrus_ctype_template.h:1.39 src/lib/libc/citrus/citrus_ctype_template.h:1.40
--- src/lib/libc/citrus/citrus_ctype_template.h:1.39 Tue Apr 19 20:32:14 2022
+++ src/lib/libc/citrus/citrus_ctype_template.h Sat May 28 22:16:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: citrus_ctype_template.h,v 1.39 2022/04/19 20:32:14 rillig Exp $ */
+/* $NetBSD: citrus_ctype_template.h,v 1.40 2022/05/28 22:16:43 andvar Exp $ */
/*-
* Copyright (c)2002 Citrus Project,
@@ -90,7 +90,7 @@
* wcsrtombs
* wcsnrtombs
* wctomb
- * These need to be keeped in the ctype encoding information structure,
+ * These need to be kept in the ctype encoding information structure,
* pointed by "cei".
*
* _ENCODING_INFO :
@@ -103,7 +103,7 @@
* It should be expanded to the name of the encoding state structure.
* e.g. For EUC encoding, this macro is expanded to _EUCState.
* Encoding state structure need to contain the context-dependent states,
- * which are "unpacked-form" of mbstate_t type and keeped during sequent
+ * which are "unpacked-form" of mbstate_t type and kept during sequent
* calls of mb/wc functions,
*
* _ENCODING_IS_STATE_DEPENDENT :
Index: src/sys/arch/alpha/stand/Makefile.bootprogs
diff -u src/sys/arch/alpha/stand/Makefile.bootprogs:1.36 src/sys/arch/alpha/stand/Makefile.bootprogs:1.37
--- src/sys/arch/alpha/stand/Makefile.bootprogs:1.36 Sat Apr 8 19:53:19 2017
+++ src/sys/arch/alpha/stand/Makefile.bootprogs Sat May 28 22:16:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.36 2017/04/08 19:53:19 christos Exp $
+# $NetBSD: Makefile.bootprogs,v 1.37 2022/05/28 22:16:43 andvar Exp $
NOMAN= # defined
@@ -57,7 +57,7 @@ UNIFIED_MAX_TOTAL!= expr ${REGION1_SIZE}
UNIFIED_HEAP_LIMIT= (${REGION1_START} + ${REGION1_SIZE})
# two-stage boot loaders must share region 1. The first stage
-# loads into the lowest portion, and uses the higest portion
+# loads into the lowest portion, and uses the highest portion
# for its heap. The second stage loads in between the primary image
# and the heap, and can reuse the memory after it (i.e. the primary's
# heap) for its own heap.
Index: src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs
diff -u src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs:1.5 src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs:1.6
--- src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs:1.5 Mon Mar 15 18:13:54 2021
+++ src/sys/arch/evbmips/stand/sbmips/Makefile.bootprogs Sat May 28 22:16:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.5 2021/03/15 18:13:54 christos Exp $
+# $NetBSD: Makefile.bootprogs,v 1.6 2022/05/28 22:16:43 andvar Exp $
NOSSP=yes
NOPIE=yes
@@ -73,7 +73,7 @@ UNIFIED_MAX_TOTAL!= expr ${REGION1_SIZE}
UNIFIED_HEAP_LIMIT= (${REGION1_START} + ${REGION1_SIZE})
# two-stage boot loaders must share region 1. The first stage
-# loads into the lowest portion, and uses the higest portion
+# loads into the lowest portion, and uses the highest portion
# for its heap. The second stage loads in between the primary image
# and the heap, and can reuse the memory after it (i.e. the primary's
# heap) for its own heap.
Index: src/sys/arch/powerpc/include/altivec.h
diff -u src/sys/arch/powerpc/include/altivec.h:1.18 src/sys/arch/powerpc/include/altivec.h:1.19
--- src/sys/arch/powerpc/include/altivec.h:1.18 Thu Apr 19 21:50:07 2018
+++ src/sys/arch/powerpc/include/altivec.h Sat May 28 22:16:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: altivec.h,v 1.18 2018/04/19 21:50:07 christos Exp $ */
+/* $NetBSD: altivec.h,v 1.19 2022/05/28 22:16:43 andvar Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#ifndef _POWERPC_ALTIVEC_H_
#define _POWERPC_ALTIVEC_H_
-#define VSCR_SA 0x00000001 /* Saturation happended (sticky) */
+#define VSCR_SA 0x00000001 /* Saturation happened (sticky) */
#define VSCR_NJ 0x00010000 /* Non Java-IEEE-C9X FP mode */
#ifdef _KERNEL
Index: src/sys/arch/sbmips/stand/Makefile.bootprogs
diff -u src/sys/arch/sbmips/stand/Makefile.bootprogs:1.14 src/sys/arch/sbmips/stand/Makefile.bootprogs:1.15
--- src/sys/arch/sbmips/stand/Makefile.bootprogs:1.14 Sat Apr 8 19:53:22 2017
+++ src/sys/arch/sbmips/stand/Makefile.bootprogs Sat May 28 22:16:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootprogs,v 1.14 2017/04/08 19:53:22 christos Exp $
+# $NetBSD: Makefile.bootprogs,v 1.15 2022/05/28 22:16:43 andvar Exp $
.include <bsd.own.mk>
.include <bsd.klinks.mk>
@@ -60,7 +60,7 @@ UNIFIED_MAX_TOTAL!= expr ${REGION1_SIZE}
UNIFIED_HEAP_LIMIT= (${REGION1_START} + ${REGION1_SIZE})
# two-stage boot loaders must share region 1. The first stage
-# loads into the lowest portion, and uses the higest portion
+# loads into the lowest portion, and uses the highest portion
# for its heap. The second stage loads in between the primary image
# and the heap, and can reuse the memory after it (i.e. the primary's
# heap) for its own heap.
Index: src/sys/arch/sparc64/dev/psmreg.h
diff -u src/sys/arch/sparc64/dev/psmreg.h:1.3 src/sys/arch/sparc64/dev/psmreg.h:1.4
--- src/sys/arch/sparc64/dev/psmreg.h:1.3 Fri Dec 10 20:36:03 2021
+++ src/sys/arch/sparc64/dev/psmreg.h Sat May 28 22:16:43 2022
@@ -84,7 +84,7 @@
((m & 0x07) << 5)
#define PSM_MODE_SYSCFG 0x00 /* System configuration mode */
-#define PSM_MODE_BQRW 0x01 /* Read write battery fuel guage */
+#define PSM_MODE_BQRW 0x01 /* Read write battery fuel gauge */
#define PSM_MODE_BCB 0x02 /* Battery status block control */
#define PSM_MODE_PMPS 0x03 /* Power management policies/status */
#define PSM_MODE_MISC 0x04 /* Misc. control / status registers */
@@ -129,7 +129,7 @@
((lo & 0x01) << 6) | \
((e & 0x01) << 7)
-/* Mode 1 - Battery fuel guage read / write */
+/* Mode 1 - Battery fuel gauge read / write */
#define PSM_BQRW_CACHED 0x80
#define PSM_BQRW_REGMASK 0x1f
@@ -144,7 +144,7 @@
#define PSM_BCB_CR 0x01 /* Calibration required */
#define PSM_BCB_BCF 0x02 /* Battery control block failure */
-#define PSM_BCB_FGF 0x04 /* Fuel guage failure */
+#define PSM_BCB_FGF 0x04 /* Fuel gauge failure */
#define PSM_BCB_FULL 0x08 /* Battery is full */
#define PSM_BCB_CHG 0x10 /* Battery pack charging */
#define PSM_BCB_USE 0x20 /* Battery pack in use */
Index: src/sys/dev/ata/ata.c
diff -u src/sys/dev/ata/ata.c:1.167 src/sys/dev/ata/ata.c:1.168
--- src/sys/dev/ata/ata.c:1.167 Mon Mar 14 22:15:51 2022
+++ src/sys/dev/ata/ata.c Sat May 28 22:16:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ata.c,v 1.167 2022/03/14 22:15:51 perseant Exp $ */
+/* $NetBSD: ata.c,v 1.168 2022/05/28 22:16:43 andvar Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer. All rights reserved.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.167 2022/03/14 22:15:51 perseant Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ata.c,v 1.168 2022/05/28 22:16:43 andvar Exp $");
#include "opt_ata.h"
@@ -1924,7 +1924,7 @@ ata_probe_caps(struct ata_drive_datas *d
}
/*
* If controller's driver can't set its PIO mode,
- * get the highter one for the drive.
+ * get the higher one for the drive.
*/
if (atac->atac_set_modes == NULL ||
atac->atac_pio_cap >= i + 3) {
Index: src/sys/dev/i2c/i2cvar.h
diff -u src/sys/dev/i2c/i2cvar.h:1.24 src/sys/dev/i2c/i2cvar.h:1.25
--- src/sys/dev/i2c/i2cvar.h:1.24 Fri Apr 16 07:02:09 2021
+++ src/sys/dev/i2c/i2cvar.h Sat May 28 22:16:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: i2cvar.h,v 1.24 2021/04/16 07:02:09 skrll Exp $ */
+/* $NetBSD: i2cvar.h,v 1.25 2022/05/28 22:16:43 andvar Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -188,7 +188,7 @@ const struct device_compatible_entry *
/*
* Constants to indicate the quality of a match made by a driver's
- * match routine, from lowest to higest:
+ * match routine, from lowest to highest:
*
* -- Address only; no other checks were made.
*
Index: src/sys/dev/pci/hptide.c
diff -u src/sys/dev/pci/hptide.c:1.34 src/sys/dev/pci/hptide.c:1.35
--- src/sys/dev/pci/hptide.c:1.34 Mon Oct 7 19:51:55 2013
+++ src/sys/dev/pci/hptide.c Sat May 28 22:16:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: hptide.c,v 1.34 2013/10/07 19:51:55 jakllsch Exp $ */
+/* $NetBSD: hptide.c,v 1.35 2022/05/28 22:16:44 andvar Exp $ */
/*
* Copyright (c) 1999, 2000, 2001 Manuel Bouyer.
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hptide.c,v 1.34 2013/10/07 19:51:55 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hptide.c,v 1.35 2022/05/28 22:16:44 andvar Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -255,7 +255,7 @@ hpt_chip_map(struct pciide_softc *sc, co
sc->sc_pp->ide_product == PCI_PRODUCT_TRIONES_HPT372A ||
sc->sc_pp->ide_product == PCI_PRODUCT_TRIONES_HPT374) {
/*
- * HPT370_REV and highter has a bit to disable interrupts,
+ * HPT370_REV and higher has a bit to disable interrupts,
* make sure to clear it
*/
pciide_pci_write(sc->sc_pc, sc->sc_tag, HPT_CSEL,
Index: src/sys/netinet/sctp_indata.c
diff -u src/sys/netinet/sctp_indata.c:1.11 src/sys/netinet/sctp_indata.c:1.12
--- src/sys/netinet/sctp_indata.c:1.11 Tue May 24 20:50:20 2022
+++ src/sys/netinet/sctp_indata.c Sat May 28 22:16:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sctp_indata.c,v 1.11 2022/05/24 20:50:20 andvar Exp $ */
+/* $NetBSD: sctp_indata.c,v 1.12 2022/05/28 22:16:44 andvar Exp $ */
/* $KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_indata.c,v 1.11 2022/05/24 20:50:20 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_indata.c,v 1.12 2022/05/28 22:16:44 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_ipsec.h"
@@ -2263,7 +2263,7 @@ sctp_sack_check(struct sctp_tcb *stcb, i
if (all_ones ||
(asoc->cumulative_tsn == asoc->highest_tsn_inside_map && at >= 8)) {
/* The complete array was completed by a single FR */
- /* higest becomes the cum-ack */
+ /* highest becomes the cum-ack */
int clr;
asoc->cumulative_tsn = asoc->highest_tsn_inside_map;
/* clear the array */
Index: src/sys/netinet/sctp_pcb.c
diff -u src/sys/netinet/sctp_pcb.c:1.24 src/sys/netinet/sctp_pcb.c:1.25
--- src/sys/netinet/sctp_pcb.c:1.24 Tue May 24 20:50:20 2022
+++ src/sys/netinet/sctp_pcb.c Sat May 28 22:16:44 2022
@@ -1,5 +1,5 @@
/* $KAME: sctp_pcb.c,v 1.39 2005/06/16 18:29:25 jinmei Exp $ */
-/* $NetBSD: sctp_pcb.c,v 1.24 2022/05/24 20:50:20 andvar Exp $ */
+/* $NetBSD: sctp_pcb.c,v 1.25 2022/05/28 22:16:44 andvar Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Cisco Systems, Inc.
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sctp_pcb.c,v 1.24 2022/05/24 20:50:20 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sctp_pcb.c,v 1.25 2022/05/28 22:16:44 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -4617,7 +4617,7 @@ sctp_drain_mbufs(struct sctp_inpcb *inp,
/*
* Another issue, in un-setting the TSN's in the mapping array we
- * DID NOT adjust the higest_tsn marker. This will cause one of
+ * DID NOT adjust the highest_tsn marker. This will cause one of
* two things to occur. It may cause us to do extra work in checking
* for our mapping array movement. More importantly it may cause us
* to SACK every datagram. This may not be a bad thing though since
