Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix various typos in comments and log messages.

This commit is contained in:
andvar 2022-04-16 18:15:20 +00:00
parent 5db2a0cfc6
commit f84252b461
24 changed files with 70 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
etc/rc.d/swap1
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# $NetBSD: swap1,v 1.13 2018/10/19 14:11:12 martin Exp $ # $NetBSD: swap1,v 1.14 2022/04/16 18:15:20 andvar Exp $
# #
# PROVIDE: localswap # PROVIDE: localswap
@ -16,7 +16,7 @@ stop_cmd="swap1_stop"
dev_free_tmpfs() dev_free_tmpfs()
{ {
# Generate a list of tmpfs filesystems that contain no device nodes, # Generate a list of tmpfs filesystems that contain no device nodes,
# which can presumably be unmounted safetly at shutdown time. # which can presumably be unmounted safely at shutdown time.
# Filenames are quoted and the list contains no unquoted newlines, # Filenames are quoted and the list contains no unquoted newlines,
# so that the output can be reparsed as a single argument list. # so that the output can be reparsed as a single argument list.
mount -t tmpfs | while read -r line mount -t tmpfs | while read -r line

4
games/trek/DOC/trekmanual.nr
View File

@ -1,4 +1,4 @@
.\" $NetBSD: trekmanual.nr,v 1.4 2021/12/08 23:38:51 snj Exp $ .\" $NetBSD: trekmanual.nr,v 1.5 2022/04/16 18:15:20 andvar Exp $
.br .br
.po 10 .po 10
.if n \!. .if n \!.
@ -675,7 +675,7 @@ and starsystems.
.pp .pp
More than one request may be stated More than one request may be stated
on a line on a line
by seperating them by separating them
with semicolons. with semicolons.
.bl "Dock at Starbase" .bl "Dock at Starbase"
Mnemonic: dock Mnemonic: dock

6
lib/libc/gen/fixunsgen_ieee754.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: fixunsgen_ieee754.c,v 1.3 2012/03/25 19:53:41 christos Exp $ */ /* $NetBSD: fixunsgen_ieee754.c,v 1.4 2022/04/16 18:15:20 andvar Exp $ */
/*- /*-
* Copyright (c) 1992, 1993 * Copyright (c) 1992, 1993
@ -36,7 +36,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if !defined(FIXUNSNAME) && defined(LIBC_SCCS) && !defined(lint) #if !defined(FIXUNSNAME) && defined(LIBC_SCCS) && !defined(lint)
__RCSID("$NetBSD: fixunsgen_ieee754.c,v 1.3 2012/03/25 19:53:41 christos Exp $"); __RCSID("$NetBSD: fixunsgen_ieee754.c,v 1.4 2022/04/16 18:15:20 andvar Exp $");
#endif /* LIBC_SCCS and not lint */ #endif /* LIBC_SCCS and not lint */
#include <stddef.h> #include <stddef.h>
@ -71,7 +71,7 @@ FIXUNSNAME(__fixunsgen)(int exp, bool sign, size_t mant_dig, size_t fracbits,
return 0; return 0;
/* /*
* This is simplier than it seems. Basically we are constructing * This is simpler than it seems. Basically we are constructing
* fixed binary representation of the floating point number tossing * fixed binary representation of the floating point number tossing
* away bits that wont be in the modulis we return. * away bits that wont be in the modulis we return.
*/ */

4
lib/libm/src/s_fminf.c
View File

@ -25,7 +25,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__RCSID("$NetBSD: s_fminf.c,v 1.2 2010/03/08 01:05:20 snj Exp $"); __RCSID("$NetBSD: s_fminf.c,v 1.3 2022/04/16 18:15:20 andvar Exp $");
#ifdef notdef #ifdef notdef
__FBSDID("$FreeBSD: src/lib/msun/src/s_fminf.c,v 1.1 2004/06/30 07:04:01 das Exp $"); __FBSDID("$FreeBSD: src/lib/msun/src/s_fminf.c,v 1.1 2004/06/30 07:04:01 das Exp $");
#endif #endif
@ -50,7 +50,7 @@ fminf(float x, float y)
u[1].sngu_sng.sng_frac != 0) u[1].sngu_sng.sng_frac != 0)
return (x); return (x);
/* Handle comparisons of sng_singed zeroes. */ /* Handle comparisons of sng_signed zeroes. */
if (u[0].sngu_sng.sng_sign != u[1].sngu_sng.sng_sign) if (u[0].sngu_sng.sng_sign != u[1].sngu_sng.sng_sign)
return (u[u[1].sngu_sng.sng_sign].sngu_f); return (u[u[1].sngu_sng.sng_sign].sngu_f);

6
lib/librumphijack/hijack.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: hijack.c,v 1.135 2021/09/11 14:22:12 christos Exp $ */ /* $NetBSD: hijack.c,v 1.136 2022/04/16 18:15:20 andvar Exp $ */
/*- /*-
* Copyright (c) 2011 Antti Kantee. All Rights Reserved. * Copyright (c) 2011 Antti Kantee. All Rights Reserved.
@ -34,7 +34,7 @@
#include <rump/rumpuser_port.h> #include <rump/rumpuser_port.h>
#if !defined(lint) #if !defined(lint)
__RCSID("$NetBSD: hijack.c,v 1.135 2021/09/11 14:22:12 christos Exp $"); __RCSID("$NetBSD: hijack.c,v 1.136 2022/04/16 18:15:20 andvar Exp $");
#endif #endif
#include <sys/param.h> #include <sys/param.h>
@ -957,7 +957,7 @@ rcinit(void)
/* /*
* In theory cannot print anything during lookups because * In theory cannot print anything during lookups because
* we might not have the call vector set up. so, the errx() * we might not have the call vector set up. so, the errx()
* is a bit of a strech, but it might work. * is a bit of a stretch, but it might work.
*/ */
for (i = 0; i < DUALCALL__NUM; i++) { for (i = 0; i < DUALCALL__NUM; i++) {

6
sbin/newfs/newfs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: newfs.c,v 1.116 2020/04/17 09:33:37 jdolecek Exp $ */ /* $NetBSD: newfs.c,v 1.117 2022/04/16 18:15:20 andvar Exp $ */
/* /*
* Copyright (c) 1983, 1989, 1993, 1994 * Copyright (c) 1983, 1989, 1993, 1994
@ -78,7 +78,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993, 1994\
#if 0 #if 0
static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95"; static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95";
#else #else
__RCSID("$NetBSD: newfs.c,v 1.116 2020/04/17 09:33:37 jdolecek Exp $"); __RCSID("$NetBSD: newfs.c,v 1.117 2022/04/16 18:15:20 andvar Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -607,7 +607,7 @@ main(int argc, char *argv[])
&& ftruncate(fso, (off_t)fssize * sectorsize) == -1) && ftruncate(fso, (off_t)fssize * sectorsize) == -1)
err(1, "can't ftruncate %s to %" PRId64, special, fssize); err(1, "can't ftruncate %s to %" PRId64, special, fssize);
if (Zflag && fso != -1) { /* pre-zero (and de-sparce) the file */ if (Zflag && fso != -1) { /* pre-zero (and de-sparse) the file */
char *buf; char *buf;
int bufsize, i; int bufsize, i;
off_t bufrem; off_t bufrem;

6
sbin/newfs_ext2fs/newfs_ext2fs.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: newfs_ext2fs.c,v 1.10 2019/03/06 05:11:13 mrg Exp $ */ /* $NetBSD: newfs_ext2fs.c,v 1.11 2022/04/16 18:15:21 andvar Exp $ */
/* /*
* Copyright (c) 1983, 1989, 1993, 1994 * Copyright (c) 1983, 1989, 1993, 1994
@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1989, 1993, 1994\
#if 0 #if 0
static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95"; static char sccsid[] = "@(#)newfs.c 8.13 (Berkeley) 5/1/95";
#else #else
__RCSID("$NetBSD: newfs_ext2fs.c,v 1.10 2019/03/06 05:11:13 mrg Exp $"); __RCSID("$NetBSD: newfs_ext2fs.c,v 1.11 2022/04/16 18:15:21 andvar Exp $");
#endif #endif
#endif /* not lint */ #endif /* not lint */
@ -332,7 +332,7 @@ main(int argc, char *argv[])
&& ftruncate(fso, (off_t)fssize * sectorsize) == -1) && ftruncate(fso, (off_t)fssize * sectorsize) == -1)
err(1, "can't ftruncate %s to %" PRId64, special, fssize); err(1, "can't ftruncate %s to %" PRId64, special, fssize);
if (Zflag && fso != -1) { /* pre-zero (and de-sparce) the file */ if (Zflag && fso != -1) { /* pre-zero (and de-sparse) the file */
char *buf; char *buf;
int bufsize, i; int bufsize, i;
off_t bufrem; off_t bufrem;

4
share/me/tmac.e
View File

@ -1,4 +1,4 @@
.\" $NetBSD: tmac.e,v 1.9 2003/08/07 10:31:32 agc Exp $ .\" $NetBSD: tmac.e,v 1.10 2022/04/16 18:15:21 andvar Exp $
.\" .\"
.nr _0 \n(.c .nr _0 \n(.c
.\" Copyright (c) 1988, 1993 .\" Copyright (c) 1988, 1993
@ -611,7 +611,7 @@
.if \\n(.$>1 \ .if \\n(.$>1 \
. nr $m \\$2 . nr $m \\$2
.if \\n(.$>0 \ .if \\n(.$>0 \
. nr $s \\$1n \" param 1: column seperation . nr $s \\$1n \" param 1: column separation
.nr $l (\\n(.l-((\\n($m-1)*\\n($s))/\\n($m .nr $l (\\n(.l-((\\n($m-1)*\\n($s))/\\n($m
.xl \\n($lu .xl \\n($lu
.mk _k .mk _k

8
sys/arch/luna68k/luna68k/disksubr.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: disksubr.c,v 1.32 2019/04/03 22:10:50 christos Exp $ */ /* $NetBSD: disksubr.c,v 1.33 2022/04/16 18:15:21 andvar Exp $ */
/* /*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California. * Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@ -103,7 +103,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.32 2019/04/03 22:10:50 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.33 2022/04/16 18:15:21 andvar Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -146,8 +146,8 @@ __KERNEL_RCSID(0, "$NetBSD: disksubr.c,v 1.32 2019/04/03 22:10:50 christos Exp $
* Mach writedisklabel logic seems to fail when no BSD label is found. * Mach writedisklabel logic seems to fail when no BSD label is found.
* *
* Kernel handles disklabel in this way; * Kernel handles disklabel in this way;
* - searchs BSD label at offset 64 * - searches BSD label at offset 64
* - if not found, searchs UniOS/ISI label at the end of block * - if not found, searches UniOS/ISI label at the end of block
* - kernel can distinguish whether it was SunOS label or UniOS/ISI * - kernel can distinguish whether it was SunOS label or UniOS/ISI
* label and understand both * label and understand both
* - kernel writes UniOS/ISI label combined with BSD label to update * - kernel writes UniOS/ISI label combined with BSD label to update

6
sys/arch/m68k/m68k/pmap_motorola.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pmap_motorola.c,v 1.75 2021/10/12 08:36:28 andvar Exp $ */ /* $NetBSD: pmap_motorola.c,v 1.76 2022/04/16 18:15:21 andvar Exp $ */
/*- /*-
* Copyright (c) 1999 The NetBSD Foundation, Inc. * Copyright (c) 1999 The NetBSD Foundation, Inc.
@ -119,7 +119,7 @@
#include "opt_m68k_arch.h" #include "opt_m68k_arch.h"
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.75 2021/10/12 08:36:28 andvar Exp $"); __KERNEL_RCSID(0, "$NetBSD: pmap_motorola.c,v 1.76 2022/04/16 18:15:21 andvar Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -276,7 +276,7 @@ TAILQ_HEAD(pv_page_list, pv_page) pv_page_freelist;
int pv_nfree; int pv_nfree;
#ifdef CACHE_HAVE_VAC #ifdef CACHE_HAVE_VAC
u_int pmap_aliasmask; /* seperation at which VA aliasing ok */ u_int pmap_aliasmask; /* separation at which VA aliasing ok */
#endif #endif
#if defined(M68040) || defined(M68060) #if defined(M68040) || defined(M68060)
u_int protostfree; /* prototype (default) free ST map */ u_int protostfree; /* prototype (default) free ST map */

4
sys/arch/sgimips/include/bus_defs.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bus_defs.h,v 1.2 2015/02/18 16:47:58 macallan Exp $ */ /* $NetBSD: bus_defs.h,v 1.3 2022/04/16 18:15:21 andvar Exp $ */
/* /*
* Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc. * Copyright (c) 1996, 1997, 1998, 2001 The NetBSD Foundation, Inc.
@ -37,7 +37,7 @@
/* /*
* Values for sgimips bus space tag, not to be used directly by MI code. * Values for sgimips bus space tag, not to be used directly by MI code.
* XXX these need spacial handling * XXX these need special handling
*/ */
#include <mips/bus_space_defs.h> #include <mips/bus_space_defs.h>

4
sys/arch/sparc/sparc/locore.s
View File

@ -1,4 +1,4 @@
/* $NetBSD: locore.s,v 1.281 2021/08/09 21:08:06 andvar Exp $ */ /* $NetBSD: locore.s,v 1.282 2022/04/16 18:15:21 andvar Exp $ */
/* /*
* Copyright (c) 1996 Paul Kranenburg * Copyright (c) 1996 Paul Kranenburg
@ -4225,7 +4225,7 @@ no_3mmu:
/* /*
* Ok, we have a non-Mbus TI Viking, a MicroSparc. * Ok, we have a non-Mbus TI Viking, a MicroSparc.
* In this scenerio, in order to play with the MMU * In this scenario, in order to play with the MMU
* passthrough safely, we need turn off traps, flip * passthrough safely, we need turn off traps, flip
* the AC bit on in the mmu status register, do our * the AC bit on in the mmu status register, do our
* passthroughs, then restore the mmu reg and %psr * passthroughs, then restore the mmu reg and %psr

4
sys/crypto/blowfish/bf_locl.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: bf_locl.h,v 1.7 2021/10/15 22:32:28 andvar Exp $ */ /* $NetBSD: bf_locl.h,v 1.8 2022/04/16 18:15:21 andvar Exp $ */
/* $KAME: bf_locl.h,v 1.5 2000/08/31 06:03:48 itojun Exp $ */ /* $KAME: bf_locl.h,v 1.5 2000/08/31 06:03:48 itojun Exp $ */
/* crypto/bf/bf_local.h */ /* crypto/bf/bf_local.h */
@ -211,7 +211,7 @@
*(const BF_LONG *)((const unsigned char *)&(S[768])+((R<<BF_3)&BF_M))); *(const BF_LONG *)((const unsigned char *)&(S[768])+((R<<BF_3)&BF_M)));
#else #else
/* This will always work, even on 64 bit machines and strangly enough, /* This will always work, even on 64 bit machines and strangely enough,
* on the Alpha it is faster than the pointer versions (both 32 and 64 * on the Alpha it is faster than the pointer versions (both 32 and 64
* versions of BF_LONG) */ * versions of BF_LONG) */

6
sys/dev/ic/mfi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: mfi.c,v 1.67 2021/12/05 02:47:01 msaitoh Exp $ */ /* $NetBSD: mfi.c,v 1.68 2022/04/16 18:15:21 andvar Exp $ */
/* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */ /* $OpenBSD: mfi.c,v 1.66 2006/11/28 23:59:45 dlg Exp $ */
/* /*
@ -73,7 +73,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.67 2021/12/05 02:47:01 msaitoh Exp $"); __KERNEL_RCSID(0, "$NetBSD: mfi.c,v 1.68 2022/04/16 18:15:21 andvar Exp $");
#include "bio.h" #include "bio.h"
@ -3366,7 +3366,7 @@ mfi_tbolt_create_sgl(struct mfi_ccb *ccb, int flags)
* interrupt thread. * interrupt thread.
* *
* The driver could get the RAID state via the MFI_DCMD_LD_MAP_GET_INFO * The driver could get the RAID state via the MFI_DCMD_LD_MAP_GET_INFO
* That requires a bunch of structure and it is simplier to just do * That requires a bunch of structure and it is simpler to just do
* the MFI_DCMD_LD_GET_LIST versus walking the RAID map. * the MFI_DCMD_LD_GET_LIST versus walking the RAID map.
*/ */

6
sys/dev/pci/if_vioif.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_vioif.c,v 1.79 2022/04/13 10:42:12 uwe Exp $ */ /* $NetBSD: if_vioif.c,v 1.80 2022/04/16 18:15:22 andvar Exp $ */
/* /*
* Copyright (c) 2020 The NetBSD Foundation, Inc. * Copyright (c) 2020 The NetBSD Foundation, Inc.
@ -27,7 +27,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.79 2022/04/13 10:42:12 uwe Exp $"); __KERNEL_RCSID(0, "$NetBSD: if_vioif.c,v 1.80 2022/04/16 18:15:22 andvar Exp $");
#ifdef _KERNEL_OPT #ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h" #include "opt_net_mpsafe.h"
@ -1231,7 +1231,7 @@ vioif_stop(struct ifnet *ifp, int disable)
/* /*
* stop all packet processing: * stop all packet processing:
* 1. stop interrupt handlers by rxq_stopping and txq_stopping * 1. stop interrupt handlers by rxq_stopping and txq_stopping
* 2. wait for stoping workqueue for packet processing * 2. wait for stopping workqueue for packet processing
*/ */
for (i =0; i < sc->sc_act_nvq_pairs; i++) { for (i =0; i < sc->sc_act_nvq_pairs; i++) {
txq = &sc->sc_txq[i]; txq = &sc->sc_txq[i];

6
sys/dev/qbus/qd.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: qd.c,v 1.60 2021/12/12 22:20:52 andvar Exp $ */ /* $NetBSD: qd.c,v 1.61 2022/04/16 18:15:22 andvar Exp $ */
/*- /*-
* Copyright (c) 1988 Regents of the University of California. * Copyright (c) 1988 Regents of the University of California.
@ -58,7 +58,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.60 2021/12/12 22:20:52 andvar Exp $"); __KERNEL_RCSID(0, "$NetBSD: qd.c,v 1.61 2022/04/16 18:15:22 andvar Exp $");
#include "opt_ddb.h" #include "opt_ddb.h"
@ -3390,7 +3390,7 @@ setup_dragon(int unit)
adder->sync_phase_adj = 0x0100; adder->sync_phase_adj = 0x0100;
adder->x_scan_conf = 0x00C8; adder->x_scan_conf = 0x00C8;
/* /*
* got a bug in secound pass ADDER! lets take care of it * got a bug in second pass ADDER! lets take care of it
* *
* normally, just use the code in the following bug fix code, but to * normally, just use the code in the following bug fix code, but to
* make repeated demos look pretty, load the registers as if there was * make repeated demos look pretty, load the registers as if there was

8
sys/dev/usb/xhcireg.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: xhcireg.h,v 1.21 2022/04/06 22:01:45 mlelstv Exp $ */ /* $NetBSD: xhcireg.h,v 1.22 2022/04/16 18:15:22 andvar Exp $ */
/*- /*-
* Copyright (c) 2010 Hans Petter Selasky. All rights reserved. * Copyright (c) 2010 Hans Petter Selasky. All rights reserved.
@ -53,7 +53,7 @@
#define XHCI_HCIVERSION_1_1 0x0110 /* xHCI version 1.1 */ #define XHCI_HCIVERSION_1_1 0x0110 /* xHCI version 1.1 */
#define XHCI_HCIVERSION_1_2 0x0120 /* xHCI version 1.2 */ #define XHCI_HCIVERSION_1_2 0x0120 /* xHCI version 1.2 */
#define XHCI_HCSPARAMS1 0x04 /* RO structual parameters 1 */ #define XHCI_HCSPARAMS1 0x04 /* RO structural parameters 1 */
#define XHCI_HCS1_MAXSLOTS_MASK __BITS(7, 0) #define XHCI_HCS1_MAXSLOTS_MASK __BITS(7, 0)
#define XHCI_HCS1_MAXSLOTS(x) __SHIFTOUT((x), XHCI_HCS1_MAXSLOTS_MASK) #define XHCI_HCS1_MAXSLOTS(x) __SHIFTOUT((x), XHCI_HCS1_MAXSLOTS_MASK)
#define XHCI_HCS1_MAXINTRS_MASK __BITS(18, 8) #define XHCI_HCS1_MAXINTRS_MASK __BITS(18, 8)
@ -61,7 +61,7 @@
#define XHCI_HCS1_MAXPORTS_MASK __BITS(31, 24) #define XHCI_HCS1_MAXPORTS_MASK __BITS(31, 24)
#define XHCI_HCS1_MAXPORTS(x) __SHIFTOUT((x), XHCI_HCS1_MAXPORTS_MASK) #define XHCI_HCS1_MAXPORTS(x) __SHIFTOUT((x), XHCI_HCS1_MAXPORTS_MASK)
#define XHCI_HCSPARAMS2 0x08 /* RO structual parameters 2 */ #define XHCI_HCSPARAMS2 0x08 /* RO structural parameters 2 */
#define XHCI_HCS2_IST_MASK __BITS(3, 0) #define XHCI_HCS2_IST_MASK __BITS(3, 0)
#define XHCI_HCS2_IST(x) __SHIFTOUT((x), XHCI_HCS2_IST_MASK) #define XHCI_HCS2_IST(x) __SHIFTOUT((x), XHCI_HCS2_IST_MASK)
#define XHCI_HCS2_ERSTMAX_MASK __BITS(7, 4) #define XHCI_HCS2_ERSTMAX_MASK __BITS(7, 4)
@ -74,7 +74,7 @@
(__SHIFTOUT((x), XHCI_HCS2_SPBUFHI_MASK) << 5) | \ (__SHIFTOUT((x), XHCI_HCS2_SPBUFHI_MASK) << 5) | \
(__SHIFTOUT((x), XHCI_HCS2_SPBUFLO_MASK)) (__SHIFTOUT((x), XHCI_HCS2_SPBUFLO_MASK))
#define XHCI_HCSPARAMS3 0x0c /* RO structual parameters 3 */ #define XHCI_HCSPARAMS3 0x0c /* RO structural parameters 3 */
#define XHCI_HCS3_U1_DEL_MASK __BITS(7, 0) #define XHCI_HCS3_U1_DEL_MASK __BITS(7, 0)
#define XHCI_HCS3_U1_DEL(x) __SHIFTOUT((x), XHCI_HCS3_U1_DEL_MASK) #define XHCI_HCS3_U1_DEL(x) __SHIFTOUT((x), XHCI_HCS3_U1_DEL_MASK)
#define XHCI_HCS3_U2_DEL_MASK __BITS(15, 8) #define XHCI_HCS3_U2_DEL_MASK __BITS(15, 8)

6
sys/dev/videomode/edid.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: edid.c,v 1.16 2021/12/25 13:51:31 mlelstv Exp $ */ /* $NetBSD: edid.c,v 1.17 2022/04/16 18:15:22 andvar Exp $ */
/*- /*-
* Copyright (c) 2006 Itronix Inc. * Copyright (c) 2006 Itronix Inc.
@ -32,7 +32,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.16 2021/12/25 13:51:31 mlelstv Exp $"); __KERNEL_RCSID(0, "$NetBSD: edid.c,v 1.17 2022/04/16 18:15:22 andvar Exp $");
#ifdef _KERNEL #ifdef _KERNEL
#include <sys/param.h> #include <sys/param.h>
@ -195,7 +195,7 @@ edid_print(struct edid_info *edid)
if (edid->edid_video_input & EDID_VIDEO_INPUT_BLANK_TO_BLACK) if (edid->edid_video_input & EDID_VIDEO_INPUT_BLANK_TO_BLACK)
printf("\tBlank-to-black setup\n"); printf("\tBlank-to-black setup\n");
if (edid->edid_video_input & EDID_VIDEO_INPUT_SEPARATE_SYNCS) if (edid->edid_video_input & EDID_VIDEO_INPUT_SEPARATE_SYNCS)
printf("\tSeperate syncs\n"); printf("\tSeparate syncs\n");
if (edid->edid_video_input & EDID_VIDEO_INPUT_COMPOSITE_SYNC) if (edid->edid_video_input & EDID_VIDEO_INPUT_COMPOSITE_SYNC)
printf("\tComposite sync\n"); printf("\tComposite sync\n");
if (edid->edid_video_input & EDID_VIDEO_INPUT_SYNC_ON_GRN) if (edid->edid_video_input & EDID_VIDEO_INPUT_SYNC_ON_GRN)

4
sys/fs/udf/udf.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: udf.h,v 1.52 2016/05/24 09:55:57 reinoud Exp $ */ /* $NetBSD: udf.h,v 1.53 2022/04/16 18:15:22 andvar Exp $ */
/* /*
* Copyright (c) 2006, 2008 Reinoud Zandijk * Copyright (c) 2006, 2008 Reinoud Zandijk
@ -199,7 +199,7 @@ VFS_PROTOS(udf);
"\7APPENDONLY_LVINT\10WRITE_METAPART_NODES" "\7APPENDONLY_LVINT\10WRITE_METAPART_NODES"
/* logical volume error handling actions */ /* logical volume error handling actions */
#define UDF_UPDATE_TRACKINFO 0x01 /* update trackinfo and re-shedule */ #define UDF_UPDATE_TRACKINFO 0x01 /* update trackinfo and re-schedule */
#define UDF_REMAP_BLOCK 0x02 /* remap the failing block length */ #define UDF_REMAP_BLOCK 0x02 /* remap the failing block length */
#define UDFONERROR_BITS "\20\1UPDATE_TRACKINFO\2REMAP_BLOCK" #define UDFONERROR_BITS "\20\1UPDATE_TRACKINFO\2REMAP_BLOCK"

18
sys/fs/udf/udf_strat_sequential.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: udf_strat_sequential.c,v 1.16 2022/03/08 10:52:43 reinoud Exp $ */ /* $NetBSD: udf_strat_sequential.c,v 1.17 2022/04/16 18:15:22 andvar Exp $ */
/* /*
* Copyright (c) 2006, 2008 Reinoud Zandijk * Copyright (c) 2006, 2008 Reinoud Zandijk
@ -28,7 +28,7 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#ifndef lint #ifndef lint
__KERNEL_RCSID(0, "$NetBSD: udf_strat_sequential.c,v 1.16 2022/03/08 10:52:43 reinoud Exp $"); __KERNEL_RCSID(0, "$NetBSD: udf_strat_sequential.c,v 1.17 2022/04/16 18:15:22 andvar Exp $");
#endif /* not lint */ #endif /* not lint */
@ -118,7 +118,7 @@ udf_wr_nodedscr_callback(struct buf *buf)
/* XXX right flags to mark dirty again on error? */ /* XXX right flags to mark dirty again on error? */
if (buf->b_error) { if (buf->b_error) {
udf_node->i_flags |= IN_MODIFIED | IN_ACCESSED; udf_node->i_flags |= IN_MODIFIED | IN_ACCESSED;
/* XXX TODO reshedule on error */ /* XXX TODO reschedule on error */
} }
/* decrement outstanding_nodedscr */ /* decrement outstanding_nodedscr */
@ -243,12 +243,12 @@ out:
/* --------------------------------------------------------------------- */ /* --------------------------------------------------------------------- */
/* /*
* Main file-system specific sheduler. Due to the nature of optical media * Main file-system specific scheduler. Due to the nature of optical media
* sheduling can't be performed in the traditional way. Most OS * scheduling can't be performed in the traditional way. Most OS
* implementations i've seen thus read or write a file atomically giving all * implementations i've seen thus read or write a file atomically giving all
* kinds of side effects. * kinds of side effects.
* *
* This implementation uses a kernel thread to shedule the queued requests in * This implementation uses a kernel thread to schedule the queued requests in
* such a way that is semi-optimal for optical media; this means aproximately * such a way that is semi-optimal for optical media; this means aproximately
* (R*|(Wr*|Ws*))* since switching between reading and writing is expensive in * (R*|(Wr*|Ws*))* since switching between reading and writing is expensive in
* time. * time.
@ -276,7 +276,7 @@ udf_queuebuf_seq(struct udf_strat_args *args)
queue = UDF_SHED_WRITING; queue = UDF_SHED_WRITING;
} }
/* use our own sheduler lists for more complex sheduling */ /* use our own scheduler lists for more complex scheduling */
mutex_enter(&priv->discstrat_mutex); mutex_enter(&priv->discstrat_mutex);
bufq_put(priv->queues[queue], nestbuf); bufq_put(priv->queues[queue], nestbuf);
vfs_timestamp(&priv->last_queued[queue]); vfs_timestamp(&priv->last_queued[queue]);
@ -642,7 +642,7 @@ udf_discstrat_init_seq(struct udf_strat_args *args)
VOP_IOCTL(ump->devvp, DIOCSSTRATEGY, &dkstrat, FWRITE | FKIOCTL, VOP_IOCTL(ump->devvp, DIOCSSTRATEGY, &dkstrat, FWRITE | FKIOCTL,
NOCRED); NOCRED);
/* initialise our internal sheduler */ /* initialise our internal scheduler */
priv->cur_queue = UDF_SHED_READING; priv->cur_queue = UDF_SHED_READING;
bufq_alloc(&priv->queues[UDF_SHED_READING], "disksort", bufq_alloc(&priv->queues[UDF_SHED_READING], "disksort",
BUFQ_SORT_RAWBLOCK); BUFQ_SORT_RAWBLOCK);
@ -674,7 +674,7 @@ udf_discstrat_finish_seq(struct udf_strat_args *args)
if (ump == NULL) if (ump == NULL)
return; return;
/* stop our sheduling thread */ /* stop our scheduling thread */
KASSERT(priv->run_thread == 1); KASSERT(priv->run_thread == 1);
priv->run_thread = 0; priv->run_thread = 0;
wakeup(priv->queue_lwp); wakeup(priv->queue_lwp);

6
sys/kern/vfs_lockf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: vfs_lockf.c,v 1.74 2021/07/27 09:32:55 manu Exp $ */ /* $NetBSD: vfs_lockf.c,v 1.75 2022/04/16 18:15:22 andvar Exp $ */
/* /*
* Copyright (c) 1982, 1986, 1989, 1993 * Copyright (c) 1982, 1986, 1989, 1993
@ -35,7 +35,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: vfs_lockf.c,v 1.74 2021/07/27 09:32:55 manu Exp $"); __KERNEL_RCSID(0, "$NetBSD: vfs_lockf.c,v 1.75 2022/04/16 18:15:22 andvar Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -365,7 +365,7 @@ lf_split(struct lockf *lock1, struct lockf *lock2, struct lockf **sparelock)
} }
#endif /* LOCKF_DEBUG */ #endif /* LOCKF_DEBUG */
/* /*
* Check to see if spliting into only two pieces. * Check to see if splitting into only two pieces.
*/ */
if (lock1->lf_start == lock2->lf_start) { if (lock1->lf_start == lock2->lf_start) {
lock1->lf_start = lock2->lf_end + 1; lock1->lf_start = lock2->lf_end + 1;

4
sys/net/pfkeyv2.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pfkeyv2.h,v 1.32 2017/07/04 08:11:32 ozaki-r Exp $ */ /* $NetBSD: pfkeyv2.h,v 1.33 2022/04/16 18:15:22 andvar Exp $ */
/* $KAME: pfkeyv2.h,v 1.36 2003/07/25 09:33:37 itojun Exp $ */ /* $KAME: pfkeyv2.h,v 1.36 2003/07/25 09:33:37 itojun Exp $ */
/* /*
@ -504,7 +504,7 @@ struct sadb_x_nat_t_frag {
#define SADB_X_EXT_CYCSEQ 0x0040 /* allowing to cyclic sequence. */ #define SADB_X_EXT_CYCSEQ 0x0040 /* allowing to cyclic sequence. */
/* three of followings are exclusive flags each them */ /* three of followings are exclusive flags each them */
#define SADB_X_EXT_PSEQ 0x0000 /* sequencial padding for ESP */ #define SADB_X_EXT_PSEQ 0x0000 /* sequential padding for ESP */
#define SADB_X_EXT_PRAND 0x0100 /* random padding for ESP */ #define SADB_X_EXT_PRAND 0x0100 /* random padding for ESP */
#define SADB_X_EXT_PZERO 0x0200 /* zero padding for ESP */ #define SADB_X_EXT_PZERO 0x0200 /* zero padding for ESP */
#define SADB_X_EXT_PMASK 0x0300 /* mask for padding flag */ #define SADB_X_EXT_PMASK 0x0300 /* mask for padding flag */

6
tests/lib/libpthread/t_condwait.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: t_condwait.c,v 1.8 2019/08/11 11:42:23 martin Exp $ */ /* $NetBSD: t_condwait.c,v 1.9 2022/04/16 18:15:22 andvar Exp $ */
/* /*
* Copyright (c) 2013 The NetBSD Foundation, Inc. * Copyright (c) 2013 The NetBSD Foundation, Inc.
@ -26,7 +26,7 @@
* POSSIBILITY OF SUCH DAMAGE. * POSSIBILITY OF SUCH DAMAGE.
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__RCSID("$NetBSD: t_condwait.c,v 1.8 2019/08/11 11:42:23 martin Exp $"); __RCSID("$NetBSD: t_condwait.c,v 1.9 2022/04/16 18:15:22 andvar Exp $");
#include <sys/time.h> #include <sys/time.h>
#include <errno.h> #include <errno.h>
@ -43,7 +43,7 @@ __RCSID("$NetBSD: t_condwait.c,v 1.8 2019/08/11 11:42:23 martin Exp $");
#include "h_common.h" #include "h_common.h"
#define WAITTIME 2 /* Timeout wait secound */ #define WAITTIME 2 /* Timeout wait in seconds */
static const int debug = 1; static const int debug = 1;

4
usr.sbin/sysinst/bsddisklabel.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bsddisklabel.c,v 1.59 2021/07/20 16:41:27 martin Exp $ */ /* $NetBSD: bsddisklabel.c,v 1.60 2022/04/16 18:15:23 andvar Exp $ */
/* /*
* Copyright 1997 Piermont Information Systems Inc. * Copyright 1997 Piermont Information Systems Inc.
@ -1776,7 +1776,7 @@ make_bsd_partitions(struct install_partition_desc *install)
have_existing = check_existing_netbsd(parts); have_existing = check_existing_netbsd(parts);
/* /*
* Make sure the cylinder size multiplier/divisor and disk sieze are * Make sure the cylinder size multiplier/divisor and disk size are
* valid * valid
*/ */
if (pm->current_cylsize == 0) if (pm->current_cylsize == 0)