 @@ -1,14 +1,14 @@
-/*	$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
  * Copyright (c) 1994-1996 Mark Brinicombe.
  * Copyright (c) 1994 Brini.
  * All rights reserved.
+ *
  * This code is derived from software written for Brini by Mark Brinicombe
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -260,27 +260,27 @@
 #define	XSCALE_AUXCTL_MD_WB_RA	0x00000000 /* mini-D$ wb, read-allocate */
 #define	XSCALE_AUXCTL_MD_WB_RWA	0x00000010 /* mini-D$ wb, read/write-allocate */
 #define	XSCALE_AUXCTL_MD_WT	0x00000020 /* mini-D$ wt, read-allocate */
 #define	XSCALE_AUXCTL_MD_MASK	0x00000030
 /* ARM11 MPCore Auxiliary Control Register (CP15 register 1, opcode2 1) */
 #define	MPCORE_AUXCTL_RS	0x00000001 /* return stack */
 #define	MPCORE_AUXCTL_DB	0x00000002 /* dynamic branch prediction */
 #define	MPCORE_AUXCTL_SB	0x00000004 /* static branch prediction */
 #define	MPCORE_AUXCTL_F 	0x00000008 /* instruction folding enable */
 #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 */
 /* Marvell PJ4B Auxialiary Function Modes Control 0 (CP15.1.R15.c2.0) */
 #define PJ4B_AUXFMC0_L2EN	__BIT(0)  /* Tightly-Coupled L2 cache enable */
 #define PJ4B_AUXFMC0_SMPNAMP	__BIT(1)  /* 0 = AMP, 1 = SMP */
 #define PJ4B_AUXFMC0_L1PARITY	__BIT(2)  /* alias of PJ4B_AUXCTL_L1PARITY */
 #define PJ4B_AUXFMC0_DCSLFD	__BIT(2)  /* Disable DC Speculative linefill */
 #define PJ4B_AUXFMC0_FW		__BIT(8)  /* alias of PJ4B_AUXCTL_FW*/
 /* Cortex-A5 Auxiliary Control Register (CP15 register 1, opcode 1) */
 #define	CORTEXA5_ACTLR_FW	__BIT(0)

 @@ -1,14 +1,14 @@
-/*	$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.
  * Copyright (C) 1995, 1996 TooLs GmbH.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -22,27 +22,27 @@
  * THIS SOFTWARE IS PROVIDED BY TOOLS GMBH ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL TOOLS GMBH BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #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"
 #include "opt_ddb.h"
 #include "opt_modular.h"
 #include "opt_multiprocessor.h"
 #include "opt_ppcarch.h"
 #endif
 #include <sys/param.h>
 #include <sys/conf.h>
 #include <sys/disklabel.h>
 #include <sys/exec.h>
 @@ -129,27 +129,27 @@ setregs(struct lwp *l, struct exec_packa
 	 * Notes:
 	 *	- obj and cleanup are the auxiliary and termination
 	 *	  vectors.  They are fixed up by ld.elf_so.
 	 *	- ps_strings is a NetBSD extension, and will be
 	 * 	  ignored by executables which are strictly
 	 *	  compliant with the SVR4 ABI.
+	 *
 	 * XXX We have to set both regs and retval here due to different
 	 * XXX calling convention in trap.c and init_main.c.
 	 */
 	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 */
 #ifdef _LP64
 	/*
 	 * For native ELF64, entry point to the function
 	 * descriptor which contains the real function address
 	 * and its TOC base address.
 	 */
 	uintptr_t fdesc[3] = { [0] = func, [1] = 0, [2] = 0 };
 	copyin((void *)func, fdesc, sizeof(fdesc));
 	tf->tf_fixreg[2] = fdesc[1] + epp->ep_entryoffset;
 	func = fdesc[0] + epp->ep_entryoffset;

 @@ -1,14 +1,14 @@
-/*	$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 $	*/
 /*
  * Copyright (c) 2002 Jason L. Wright (jason@thought.net)
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -177,27 +177,27 @@
 #define	FFB_FBC_MAGNC		0x26c
 #define	FFB_FBC_FBCFG0		0x270
 #define	FFB_FBC_FBCFG1		0x274
 #define	FFB_FBC_FBCFG2		0x278
 #define	FFB_FBC_FBCFG3		0x27c
 #define	FFB_FBC_PPCFG		0x280
 #define	FFB_FBC_PICK		0x284
 #define	FFB_FBC_FILLMODE	0x288
 #define	FFB_FBC_FBRAMWAC	0x28c	/* FB RAM Write Address Control */
 #define	FFB_FBC_PMASK		0x290	/* RGB Plane Mask */
 #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
 #define	FFB_FBC_CLIP2MIN	0x2b0
 #define	FFB_FBC_CLIP2MAX	0x2b4
 #define	FFB_FBC_CLIP3MIN	0x2b8
 #define	FFB_FBC_CLIP3MAX	0x2bc
 #define	FFB_FBC_RAWBLEND2	0x2c0
 #define	FFB_FBC_RAWPREBLEND	0x2c4
 #define	FFB_FBC_RAWSTENCIL	0x2c8
 #define	FFB_FBC_RAWSTENCILCTL	0x2cc
 #define	FFB_FBC_THREEDRAM1	0x2d0
 #define	FFB_FBC_THREEDRAM2	0x2d4

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Don Ahn.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -62,27 +62,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)fd.c	7.4 (Berkeley) 5/25/91
  */
 #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"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/kernel.h>
 #include <sys/file.h>
 #include <sys/ioctl.h>
 #include <sys/device.h>
 #include <sys/disklabel.h>
 #include <sys/disk.h>
 #include <sys/fdio.h>
 @@ -330,27 +330,27 @@ static void	fdcretry(struct fdc_softc *)
 static void	fdfinish(struct fd_softc *, struct buf *);
 static int	fdformat(dev_t, struct ne7_fd_formb *, struct proc *);
 static void	fd_do_eject(struct fdc_softc *, int);
 static void	fd_mountroot_hook(device_t);
 static void	fdconf(struct fdc_softc *);
 #define IPL_SOFTFD	IPL_BIO
 #define	FDC_SOFTPRI	2
 #define FD_SET_SWINTR()	softint_schedule(fdc->sc_si);
 /*
  * 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.
+ *
  * Often it is necessary to toggle individual bits within this register
  * while keeping the others untouched.  However, the register does not
  * present its latched data to the processor when read.  This prevents the
  * use of a read-modify-write cycle that would normally be used to modify
  * individual bits.  To get around this we must keep a copy of register's
  * current value and always insure that when we wish to modify the register,
  * we actually modify the copy and synchronize the register to it.
  */
 #define	FCR_REG_SYNC()	(*fdc->sc_reg_fcr = fdc->sc_fcr)

 @@ -1,14 +1,14 @@
-/*	$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 $	*/
 /*
+ *
  *             Coda: an Experimental Distributed File System
  *                              Release 3.1
+ *
  *           Copyright (c) 1987-1998 Carnegie Mellon University
  *                          All Rights Reserved
+ *
  * Permission  to  use, copy, modify and distribute this software and its
  * documentation is hereby granted,  provided  that  both  the  copyright
  * notice  and  this  permission  notice  appear  in  all  copies  of the
  * software, derivative works or  modified  versions,  and  any  portions
 @@ -67,27 +67,27 @@
 /*
  * NOTES: rvb@cs
  * 1.	The name cache holds a reference to every vnode in it.  Hence files can not be
  *	 closed or made inactive until they are released.
  * 2.	coda_nc_name(cp) was added to get a name for a cnode pointer for debugging.
  * 3.	coda_nc_find() has debug code to detect when entries are stored with different
  *	 credentials.  We don't understand yet, if/how entries are NOT EQ but still
  *	 EQUAL
  * 4.	I wonder if this name cache could be replace by the vnode name cache.
  *	The latter has no zapping functions, so probably not.
  */
 #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>
 #include <sys/malloc.h>
 #include <sys/select.h>
 #include <sys/kauth.h>
 #include <coda/coda.h>
 #include <coda/cnode.h>
 #include <coda/coda_namecache.h>
 #include <coda/coda_subr.h>
 /*
 @@ -150,27 +150,27 @@ coda_nc_init(void)
     for (i=0; i < coda_nc_size; i++) {	/* initialize the heap */
 	TAILQ_INSERT_HEAD(&coda_nc_lru.head, &coda_nc_heap[i], lru);
+    }
     for (i=0; i < coda_nc_hashsize; i++) {	/* initialize the hashtable */
 	LIST_INIT(&coda_nc_hash[i].head);
+    }
     coda_nc_initialized++;
+}
 /*
- * Auxillary routines -- shouldn't be entry points
+ * Auxiliary routines -- shouldn't be entry points
  */
 static struct coda_cache *
 coda_nc_find(struct cnode *dcp, const char *name, int namelen,
 	kauth_cred_t cred, int hash)
+{
 	/*
 	 * hash to find the appropriate bucket, look through the chain
 	 * for the right entry (especially right cred, unless cred == 0)
 	 */
 	struct coda_cache *cncp;
 	int count = 1;

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Eric Haszlakiewicz.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -23,27 +23,27 @@
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #ifndef _COMMON_LINUX_EMULDATA_H
 #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.
  */
 struct linux_emuldata {
 	int	led_debugreg[8];	/* GDB information for ptrace - for use, */
 				/* see ../arch/i386/linux_ptrace.c */
 	void	*led_child_tidptr;	/* Used during clone() */
 	void	*led_clear_tid;		/* Own TID to clear on exit */
 	long	led_personality;
 };

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Rafal K. Boni.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -158,27 +158,27 @@
 #define DS1687_BANK1_START	0x40	/* BANK1: Start of BANK1 registers */
 #define	DS1687_BANK1_CENTURY	0x48 	/* BANK1: Time of yr: Century (0-99) */
 #define	DS1687_BANK1_ADATE	0x49	/* BANK1: Alarm: Date (1-31) */
 #define DS1687_BANK1_XCTRL4A	0x4a
 	#define DS1687_X4A_VRT	0x80	/* valid RAM / time */
 	#define DS1687_X4A_INCR	0x40	/* increment status */
 	#define DS1687_X4A_BME	0x20	/* burst mode enable */
 	#define DS1687_X4A_PAB	0x08	/* power active bar */
 	#define DS1687_X4A_RCF	0x04	/* read clear flag */
 	#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 */
 	#define DS1687_X4B_PRS	0x08	/* PAB reset select */
 	#define DS1687_X4B_RCIE	0x04	/* RAM clear interrupt enable */
 	#define DS1687_X4B_WIE	0x02	/* wakeup interrupt enable */
 	#define DS1687_X4B_KIE	0x01	/* kickstart interrupt enable */
 #define	DS1687_NBASEREGS	0x0d	/* 14 registers; CMOS follows */
 /* Layout of software shadow copy of TOD registers */
 #define DS1687_NHDW_TODREGS	0x0a	/* 10 basic TOD registers */
 #define DS1687_NSOFT_TODREGS	0x0c	/* ...plus shadow CENTURY, ADATE */

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Gregory McGarry.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -52,27 +52,27 @@
 #define 	IMR2_CO		0x08
 #define 	IMR2_DMAI	0x10
 #define 	IMR2_DMAO	0x20
 #define 	IMR2_SRQ	0x40
 #define NEC7210_SPMR		3	/* (W) serial poll mode */
 #define 	SPMR_RSV	0x80
 #define NEC7210_ADMR		4	/* (W) address mode */
 #define 	ADMR_ADM0	0x01
 #define 	ADMR_ADM1	0x02
 #define 	ADMR_TRM0	0x10
 #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
 #define 	AUXMR_PPOLL	0x60
 #define 	AUXMR_REGA	0x80
 #define 	AUXMR_REGB	0xa0
 #define 	AUXMR_REGE	0xc0
 #define 	AUXMR_EXTERN	0xe0
 #define NEC7210_ADDR		6	/* (W) address */
 #define		ADDR_MASK	0x1f
 #define 	ADDR_DL 	0x20
 #define 	ADDR_DT 	0x40
 #define		ADDR_ARS	0x80

 @@ -1,42 +1,42 @@
-/*	$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
  * to use, copy, modify and distribute this software provided that both
  * the copyright notice and this permission notice appear in all copies
  * of the software, derivative works or modified versions, and any
  * portions thereof.
  */
 /*
  * 3COM Etherlink 3C501 Register Definitions
  */
 /*
  * I/O Ports
  */
 #define	EL_RXS		0x6	/* Receive status register */
 #define	EL_RXC		0x6	/* Receive command register */
 #define	EL_TXS		0x7	/* Transmit status register */
 #define	EL_TXC		0x7	/* Transmit command register */
 #define	EL_GPBL		0x8	/* GP buffer ptr low byte */
 #define	EL_GPBH		0x9	/* GP buffer ptr high byte */
 #define	EL_RBL		0xa	/* Receive buffer ptr low byte */
 #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_AS		0xe	/* Auxiliary status register */
-#define	EL_AC		0xe	/* Auxillary command register */
+#define	EL_AC		0xe	/* Auxiliary command register */
 #define	EL_BUF		0xf	/* Data buffer */
 /* Receive status register bits */
 #define	EL_RXS_OFLOW	0x01	/* Overflow error */
 #define	EL_RXS_FCS	0x02	/* FCS error */
 #define	EL_RXS_DRIB	0x04	/* Dribble error */
 #define	EL_RXS_SHORT	0x08	/* Short frame */
 #define	EL_RXS_NOFLOW	0x10	/* No overflow */
 #define	EL_RXS_GOOD	0x20	/* Received good frame */
 #define	EL_RXS_STALE	0x80	/* Stale receive status */
 /* Receive command register bits */
 #define	EL_RXC_DISABLE	0x00	/* Receiver disabled */
 @@ -52,31 +52,31 @@
 /* Transmit status register bits */
 #define	EL_TXS_UFLOW	0x01	/* Underflow */
 #define	EL_TXS_COLL	0x02	/* Collision */
 #define	EL_TXS_COLL16	0x04	/* Collision 16 */
 #define	EL_TXS_READY	0x08	/* Ready for new frame */
 /* Transmit command register bits */
 #define	EL_TXC_DUFLOW	0x01	/* Detect underflow */
 #define	EL_TXC_DCOLL	0x02	/* Detect collisions */
 #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 */
 #define	EL_AC_TXFRX	0x04	/* Transmit followed by receive */
 #define	EL_AC_RX	0x08	/* Receive */
 #define	EL_AC_LB	0x0c	/* Loopback */
 #define	EL_AC_DRQ	0x20	/* DMA request */
 #define	EL_AC_RIDE	0x40	/* DRQ and IRQ enabled */
 #define	EL_AC_RESET	0x80	/* Reset */
 /* Packet buffer size */
 #define	EL_BUFSIZ	2048

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -29,27 +29,27 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993, 1994\
 	The Regents of the University of California.  All rights reserved.");
 #endif /* not lint */
 #ifndef lint
 #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 */
 /*
  *  syslogd -- log system messages
+ *
  * This program implements a system log. It takes a series of lines.
  * Each line may have a priority, signified as "<n>" as
  * the first characters of the line.  If this is
  * not present, a default priority is used.
+ *
  * To kill syslogd, send a signal 15 (terminate).  A signal 1 (hup) will
  * cause it to reread its configuration file.
 @@ -4746,27 +4746,27 @@ make_timestamp(time_t *in_now, bool iso,
+		}
+	}
 	switch (tlen) {
 	case (size_t)-1:
 		return timestamp;
 	case 0:
 		return strdup(timestamp);
 	default:
 		return strndup(timestamp, tlen);
+	}
+}
-/* 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)
+{
 	const size_t len = 1 + q - p;
 	if (!(*mem = malloc(len))) {
 		logerror("Unable to allocate memory for config");
 		return false;
+	}
 	strlcpy(*mem, p, len);
 	return true;
+}
 /* keyword has to end with ",  everything until next " is copied */