Module Name: src
Committed By: andvar
Date: Fri May 20 19:34:23 UTC 2022
Modified Files:
src/sys/arch/arm/include: armreg.h
src/sys/arch/powerpc/powerpc: powerpc_machdep.c
src/sys/arch/sparc64/dev: ffbreg.h
src/sys/arch/sun3/dev: fd.c
src/sys/coda: coda_namecache.c
src/sys/compat/linux/common: linux_emuldata.h
src/sys/dev/ic: ds1687reg.h nec7210reg.h
src/sys/dev/isa: if_elreg.h
src/usr.sbin/syslogd: syslogd.c
Log Message:
s/auxillary/auxiliary/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.134 -r1.135 src/sys/arch/arm/include/armreg.h
cvs rdiff -u -r1.84 -r1.85 src/sys/arch/powerpc/powerpc/powerpc_machdep.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/dev/ffbreg.h
cvs rdiff -u -r1.86 -r1.87 src/sys/arch/sun3/dev/fd.c
cvs rdiff -u -r1.27 -r1.28 src/sys/coda/coda_namecache.c
cvs rdiff -u -r1.19 -r1.20 src/sys/compat/linux/common/linux_emuldata.h
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/ic/ds1687reg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/ic/nec7210reg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/isa/if_elreg.h
cvs rdiff -u -r1.138 -r1.139 src/usr.sbin/syslogd/syslogd.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/include/armreg.h
diff -u src/sys/arch/arm/include/armreg.h:1.134 src/sys/arch/arm/include/armreg.h:1.135
--- src/sys/arch/arm/include/armreg.h:1.134 Sat Nov 27 08:25:18 2021
+++ src/sys/arch/arm/include/armreg.h Fri May 20 19:34:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: armreg.h,v 1.134 2021/11/27 08:25:18 skrll Exp $ */
+/* $NetBSD: armreg.h,v 1.135 2022/05/20 19:34:22 andvar Exp $ */
/*
* Copyright (c) 1998, 2001 Ben Harris
@@ -270,7 +270,7 @@
#define MPCORE_AUXCTL_EX 0x00000010 /* exclusive L1/L2 cache */
#define MPCORE_AUXCTL_SA 0x00000020 /* SMP/AMP */
-/* Marvell PJ4B Auxillary Control Register (CP15.0.R1.c0.1) */
+/* Marvell PJ4B Auxiliary Control Register (CP15.0.R1.c0.1) */
#define PJ4B_AUXCTL_FW __BIT(0) /* Cache and TLB updates broadcast */
#define PJ4B_AUXCTL_SMPNAMP __BIT(6) /* 0 = AMP, 1 = SMP */
#define PJ4B_AUXCTL_L1PARITY __BIT(9) /* L1 parity checking */
Index: src/sys/arch/powerpc/powerpc/powerpc_machdep.c
diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.84 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.85
--- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.84 Tue May 3 20:52:31 2022
+++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Fri May 20 19:34:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: powerpc_machdep.c,v 1.84 2022/05/03 20:52:31 andvar Exp $ */
+/* $NetBSD: powerpc_machdep.c,v 1.85 2022/05/20 19:34:22 andvar Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.84 2022/05/03 20:52:31 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.85 2022/05/20 19:34:22 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_altivec.h"
@@ -139,7 +139,7 @@ setregs(struct lwp *l, struct exec_packa
tf->tf_fixreg[3] = arginfo.ps_nargvstr;
tf->tf_fixreg[4] = (register_t)arginfo.ps_argvstr;
tf->tf_fixreg[5] = (register_t)arginfo.ps_envstr;
- tf->tf_fixreg[6] = 0; /* auxillary vector */
+ tf->tf_fixreg[6] = 0; /* auxiliary vector */
tf->tf_fixreg[7] = 0; /* termination vector */
tf->tf_fixreg[8] = p->p_psstrp; /* NetBSD extension */
Index: src/sys/arch/sparc64/dev/ffbreg.h
diff -u src/sys/arch/sparc64/dev/ffbreg.h:1.11 src/sys/arch/sparc64/dev/ffbreg.h:1.12
--- src/sys/arch/sparc64/dev/ffbreg.h:1.11 Thu Aug 9 00:48:06 2012
+++ src/sys/arch/sparc64/dev/ffbreg.h Fri May 20 19:34:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ffbreg.h,v 1.11 2012/08/09 00:48:06 macallan Exp $ */
+/* $NetBSD: ffbreg.h,v 1.12 2022/05/20 19:34:22 andvar Exp $ */
/* $OpenBSD: creatorreg.h,v 1.5 2002/07/29 06:21:45 jason Exp $ */
/*
@@ -187,7 +187,7 @@
#define FFB_FBC_XPMASK 0x294 /* X PlaneMask */
#define FFB_FBC_YPMASK 0x298
#define FFB_FBC_ZPMASK 0x29c
-#define FFB_FBC_CLIP0MIN 0x2a0 /* Auxilliary Viewport Clips */
+#define FFB_FBC_CLIP0MIN 0x2a0 /* Auxiliary Viewport Clips */
#define FFB_FBC_CLIP0MAX 0x2a4
#define FFB_FBC_CLIP1MIN 0x2a8
#define FFB_FBC_CLIP1MAX 0x2ac
Index: src/sys/arch/sun3/dev/fd.c
diff -u src/sys/arch/sun3/dev/fd.c:1.86 src/sys/arch/sun3/dev/fd.c:1.87
--- src/sys/arch/sun3/dev/fd.c:1.86 Sat Aug 7 16:19:06 2021
+++ src/sys/arch/sun3/dev/fd.c Fri May 20 19:34:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fd.c,v 1.86 2021/08/07 16:19:06 thorpej Exp $ */
+/* $NetBSD: fd.c,v 1.87 2022/05/20 19:34:22 andvar Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -72,7 +72,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.86 2021/08/07 16:19:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.87 2022/05/20 19:34:22 andvar Exp $");
#include "opt_ddb.h"
@@ -340,7 +340,7 @@ static void fdconf(struct fdc_softc *);
/*
* The Floppy Control Register on the sun3x, not to be confused with the
* Floppy ControllER Registers that this driver mostly insterfaces with,
- * controls some of the auxillary functions of the floppy drive. These
+ * controls some of the auxiliary functions of the floppy drive. These
* include asserting the floppy eject and terminal data count (or TC) pins
* of the floppy drive and controller chip respectively.
*
Index: src/sys/coda/coda_namecache.c
diff -u src/sys/coda/coda_namecache.c:1.27 src/sys/coda/coda_namecache.c:1.28
--- src/sys/coda/coda_namecache.c:1.27 Mon Apr 13 19:23:17 2020
+++ src/sys/coda/coda_namecache.c Fri May 20 19:34:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: coda_namecache.c,v 1.27 2020/04/13 19:23:17 ad Exp $ */
+/* $NetBSD: coda_namecache.c,v 1.28 2022/05/20 19:34:22 andvar Exp $ */
/*
*
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: coda_namecache.c,v 1.27 2020/04/13 19:23:17 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: coda_namecache.c,v 1.28 2022/05/20 19:34:22 andvar Exp $");
#include <sys/param.h>
#include <sys/errno.h>
@@ -160,7 +160,7 @@ coda_nc_init(void)
}
/*
- * Auxillary routines -- shouldn't be entry points
+ * Auxiliary routines -- shouldn't be entry points
*/
static struct coda_cache *
Index: src/sys/compat/linux/common/linux_emuldata.h
diff -u src/sys/compat/linux/common/linux_emuldata.h:1.19 src/sys/compat/linux/common/linux_emuldata.h:1.20
--- src/sys/compat/linux/common/linux_emuldata.h:1.19 Sun Apr 26 18:53:33 2020
+++ src/sys/compat/linux/common/linux_emuldata.h Fri May 20 19:34:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_emuldata.h,v 1.19 2020/04/26 18:53:33 thorpej Exp $ */
+/* $NetBSD: linux_emuldata.h,v 1.20 2022/05/20 19:34:22 andvar Exp $ */
/*-
* Copyright (c) 1998,2002 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#define _COMMON_LINUX_EMULDATA_H
/*
- * This is auxillary data the linux compat code
+ * This is auxiliary data the linux compat code
* needs to do its work. A pointer to it is
* stored in the emuldata field of the proc
* structure.
Index: src/sys/dev/ic/ds1687reg.h
diff -u src/sys/dev/ic/ds1687reg.h:1.12 src/sys/dev/ic/ds1687reg.h:1.13
--- src/sys/dev/ic/ds1687reg.h:1.12 Thu Oct 21 13:21:54 2021
+++ src/sys/dev/ic/ds1687reg.h Fri May 20 19:34:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ds1687reg.h,v 1.12 2021/10/21 13:21:54 andvar Exp $ */
+/* $NetBSD: ds1687reg.h,v 1.13 2022/05/20 19:34:22 andvar Exp $ */
/*
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -168,7 +168,7 @@
#define DS1687_X4A_WAF 0x02 /* wakeup alarm flag */
#define DS1687_X4A_KF 0x01 /* kickstart flag */
#define DS1687_BANK1_XCTRL4B 0x4b
- #define DS1687_X4B_ABE 0x80 /* auxillary battery enable */
+ #define DS1687_X4B_ABE 0x80 /* auxiliary battery enable */
#define DS1687_X4B_E32K 0x40 /* enable 32.768kHz output */
#define DS1687_X4B_CS 0x20 /* chrystal select */
#define DS1687_X4B_RCE 0x10 /* RAM clear enable */
Index: src/sys/dev/ic/nec7210reg.h
diff -u src/sys/dev/ic/nec7210reg.h:1.4 src/sys/dev/ic/nec7210reg.h:1.5
--- src/sys/dev/ic/nec7210reg.h:1.4 Mon Apr 28 20:23:50 2008
+++ src/sys/dev/ic/nec7210reg.h Fri May 20 19:34:22 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: nec7210reg.h,v 1.4 2008/04/28 20:23:50 martin Exp $ */
+/* $NetBSD: nec7210reg.h,v 1.5 2022/05/20 19:34:22 andvar Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
#define ADMR_TRM1 0x20
#define ADMR_LON 0x40
#define ADMR_TON 0x80
-#define NEC7210_AUXMR 5 /* (W) auxilliary mode */
+#define NEC7210_AUXMR 5 /* (W) auxiliary mode */
#define AUXMR_CMD 0x00 /* see below */
#define AUXMR_ICR 0x20
#define AUXMR_REGD 0x40
Index: src/sys/dev/isa/if_elreg.h
diff -u src/sys/dev/isa/if_elreg.h:1.4 src/sys/dev/isa/if_elreg.h:1.5
--- src/sys/dev/isa/if_elreg.h:1.4 Thu Oct 27 04:17:29 1994
+++ src/sys/dev/isa/if_elreg.h Fri May 20 19:34:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: if_elreg.h,v 1.4 1994/10/27 04:17:29 cgd Exp $ */
+/* $NetBSD: if_elreg.h,v 1.5 2022/05/20 19:34:23 andvar Exp $ */
/*
* Copyright (c) 1994, Matthew E. Kimmel. Permission is hereby granted
@@ -25,8 +25,8 @@
#define EL_RBC 0xa /* Receive buffer clear */
#define EL_RBH 0xb /* Receive buffer ptr high byte */
#define EL_EAW 0xc /* Ethernet address window */
-#define EL_AS 0xe /* Auxillary status register */
-#define EL_AC 0xe /* Auxillary command register */
+#define EL_AS 0xe /* Auxiliary status register */
+#define EL_AC 0xe /* Auxiliary command register */
#define EL_BUF 0xf /* Data buffer */
/* Receive status register bits */
@@ -62,12 +62,12 @@
#define EL_TXC_DCOLL16 0x04 /* Detect collision 16 */
#define EL_TXC_DSUCCESS 0x08 /* Detect success */
-/* Auxillary status register bits */
+/* Auxiliary status register bits */
#define EL_AS_RXBUSY 0x01 /* Receive busy */
#define EL_AS_DMADONE 0x10 /* DMA finished */
#define EL_AS_TXBUSY 0x80 /* Transmit busy */
-/* Auxillary command register bits */
+/* Auxiliary command register bits */
#define EL_AC_HOST 0x00 /* System bus can access buffer */
#define EL_AC_IRQE 0x01 /* IRQ enable */
#define EL_AC_TXBAD 0x02 /* Transmit frames with bad FCS */
Index: src/usr.sbin/syslogd/syslogd.c
diff -u src/usr.sbin/syslogd/syslogd.c:1.138 src/usr.sbin/syslogd/syslogd.c:1.139
--- src/usr.sbin/syslogd/syslogd.c:1.138 Sat Nov 27 22:30:26 2021
+++ src/usr.sbin/syslogd/syslogd.c Fri May 20 19:34:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: syslogd.c,v 1.138 2021/11/27 22:30:26 rillig Exp $ */
+/* $NetBSD: syslogd.c,v 1.139 2022/05/20 19:34:23 andvar Exp $ */
/*
* Copyright (c) 1983, 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 19
#if 0
static char sccsid[] = "@(#)syslogd.c 8.3 (Berkeley) 4/4/94";
#else
-__RCSID("$NetBSD: syslogd.c,v 1.138 2021/11/27 22:30:26 rillig Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.139 2022/05/20 19:34:23 andvar Exp $");
#endif
#endif /* not lint */
@@ -4756,7 +4756,7 @@ make_timestamp(time_t *in_now, bool iso,
}
}
-/* auxillary code to allocate memory and copy a string */
+/* auxiliary code to allocate memory and copy a string */
bool
copy_string(char **mem, const char *p, const char *q)
{
