CVS commit: src/usr.bin/audio/play
Module Name:src
Committed By: mrg
Date: Sun May 15 02:16:06 UTC 2022
Modified Files:
src/usr.bin/audio/play: play.c
Log Message:
fix verbose log for 64 bit float
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/usr.bin/audio/play/play.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/audio/play/play.c
diff -u src/usr.bin/audio/play/play.c:1.60 src/usr.bin/audio/play/play.c:1.61
--- src/usr.bin/audio/play/play.c:1.60 Mon Nov 11 15:40:42 2019
+++ src/usr.bin/audio/play/play.c Sun May 15 02:16:06 2022
@@ -1,7 +1,7 @@
-/* $NetBSD: play.c,v 1.60 2019/11/11 15:40:42 joerg Exp $ */
+/* $NetBSD: play.c,v 1.61 2022/05/15 02:16:06 mrg Exp $ */
/*
- * Copyright (c) 1999, 2000, 2001, 2002, 2010, 2015, 2019 Matthew R. Green
+ * Copyright (c) 1999, 2000, 2001, 2002, 2010, 2015, 2019, 2021 Matthew R. Green
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: play.c,v 1.60 2019/11/11 15:40:42 joerg Exp $");
+__RCSID("$NetBSD: play.c,v 1.61 2022/05/15 02:16:06 mrg Exp $");
#endif
#include
@@ -559,7 +559,7 @@ set_audio_mode:
if (sizeof(double) * CHAR_BIT != 64)
return -1;
*conv = float64_to_linear32;
- msg = "32";
+ msg = "64";
}
info.play.encoding = AUDIO_ENCODING_SLINEAR_LE;
info.play.precision = 32;
CVS commit: src/usr.bin/audio/play
Module Name:src Committed By: mrg Date: Sun May 15 02:16:06 UTC 2022 Modified Files: src/usr.bin/audio/play: play.c Log Message: fix verbose log for 64 bit float To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/usr.bin/audio/play/play.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: mrg Date: Sun May 15 02:14:15 UTC 2022 Modified Files: src/sys/arch/sparc/sparc: locore.s Log Message: remove unused Lpanic_savefpstate. To generate a diff of this commit: cvs rdiff -u -r1.282 -r1.283 src/sys/arch/sparc/sparc/locore.s 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/sparc/sparc/locore.s diff -u src/sys/arch/sparc/sparc/locore.s:1.282 src/sys/arch/sparc/sparc/locore.s:1.283 --- src/sys/arch/sparc/sparc/locore.s:1.282 Sat Apr 16 18:15:21 2022 +++ src/sys/arch/sparc/sparc/locore.s Sun May 15 02:14:15 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.282 2022/04/16 18:15:21 andvar Exp $ */ +/* $NetBSD: locore.s,v 1.283 2022/05/15 02:14:15 mrg Exp $ */ /* * Copyright (c) 1996 Paul Kranenburg @@ -5621,10 +5621,6 @@ Lkcerr: * * The IPI version just deals with updating event counters first. */ -Lpanic_savefpstate: - .asciz "cpu%d: NULL fpstate" - _ALIGN - ENTRY(ipi_savefpstate) sethi %hi(CPUINFO_VA+CPUINFO_SAVEFPSTATE), %o5 ldd [%o5 + %lo(CPUINFO_VA+CPUINFO_SAVEFPSTATE)], %o2
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: mrg Date: Sun May 15 02:14:15 UTC 2022 Modified Files: src/sys/arch/sparc/sparc: locore.s Log Message: remove unused Lpanic_savefpstate. To generate a diff of this commit: cvs rdiff -u -r1.282 -r1.283 src/sys/arch/sparc/sparc/locore.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/gsc
Module Name:src
Committed By: gutteridge
Date: Sun May 15 00:25:15 UTC 2022
Modified Files:
src/sys/arch/hppa/gsc: harmony.c
Log Message:
harmony.c: expand and correct a couple of comments
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/gsc/harmony.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/hppa/gsc/harmony.c
diff -u src/sys/arch/hppa/gsc/harmony.c:1.10 src/sys/arch/hppa/gsc/harmony.c:1.11
--- src/sys/arch/hppa/gsc/harmony.c:1.10 Thu Feb 4 15:08:44 2021
+++ src/sys/arch/hppa/gsc/harmony.c Sun May 15 00:25:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: harmony.c,v 1.10 2021/02/04 15:08:44 isaki Exp $ */
+/* $NetBSD: harmony.c,v 1.11 2022/05/15 00:25:15 gutteridge Exp $ */
/* $OpenBSD: harmony.c,v 1.23 2004/02/13 21:28:19 mickey Exp $ */
@@ -136,7 +136,10 @@ const struct audio_hw_if harmony_sa_hw_i
.get_locks = harmony_get_locks,
};
-/* The HW actually supports more frequencies, but these looks enough. */
+/*
+ * The HW actually supports more frequencies, but these are the standard ones.
+ * For the full list, see the definition of harmony_speeds below.
+ */
#define HARMONY_FORMAT(enc, prec) \
{ \
.mode = AUMODE_PLAY | AUMODE_RECORD, \
@@ -343,7 +346,7 @@ harmony_reset_codec(struct harmony_softc
/* start reset */
WRITE_REG(sc, HARMONY_RESET, RESET_RST);
- DELAY(10); /* wait at least 0.05 sec */
+ DELAY(10); /* wait at least 0.1 sec */
harmony_set_gainctl(sc);
WRITE_REG(sc, HARMONY_RESET, 0);
CVS commit: src/sys/arch/hppa/gsc
Module Name:src Committed By: gutteridge Date: Sun May 15 00:25:15 UTC 2022 Modified Files: src/sys/arch/hppa/gsc: harmony.c Log Message: harmony.c: expand and correct a couple of comments To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/hppa/gsc/harmony.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: mrg Date: Sun May 15 00:24:14 UTC 2022 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/gpufw: mi src/etc/mtree: NetBSD.dist.i386 NetBSD.dist.x86_64 src/external/amdgpu-firmware: Makefile Added Files: src/etc/mtree: NetBSD.dist.aarch64 Log Message: install the lower case radeon firmware files into /usr/libdata/firmware. radeon has different case but same name firmware files. the lower case ones are already installed into /libdata/firmware, and to avoid having to provide some special method to build on systems with case-preserving file systems (such as macOS), we install the lower case ones in /usr. this means that anyone that requires the lower case files must either have /usr as part of the / file system, or manually keep them updated. last part of PR#54976, though i doubt we'll try to pull up these. this is enabled on i386, amd64 and arm64. To generate a diff of this commit: cvs rdiff -u -r1.1297 -r1.1298 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/gpufw/mi cvs rdiff -u -r0 -r1.8 src/etc/mtree/NetBSD.dist.aarch64 cvs rdiff -u -r1.2 -r1.3 src/etc/mtree/NetBSD.dist.i386 cvs rdiff -u -r1.14 -r1.15 src/etc/mtree/NetBSD.dist.x86_64 cvs rdiff -u -r1.1 -r1.2 src/external/amdgpu-firmware/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1297 src/distrib/sets/lists/base/mi:1.1298 --- src/distrib/sets/lists/base/mi:1.1297 Sat May 14 17:52:10 2022 +++ src/distrib/sets/lists/base/mi Sun May 15 00:24:14 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1297 2022/05/14 17:52:10 uwe Exp $ +# $NetBSD: mi,v 1.1298 2022/05/15 00:24:14 mrg Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1265,161 +1265,6 @@ ./usr/libdata/firmware/bcm43xx base-firmware-usr ./usr/libdata/firmware/bcm43xx/BCM43430A1.hcd base-firmware-usr firmware ./usr/libdata/firmware/bcm43xx/LICENCE.broadcom_bcm43xx base-firmware-usr firmware -./usr/libdata/firmware/radeon base-obsolete obsolete -./usr/libdata/firmware/radeon/ARUBA_me.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/ARUBA_pfp.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/ARUBA_rlc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BARTS_mc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BARTS_me.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BARTS_pfp.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BARTS_smc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BONAIRE_ce.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BONAIRE_mc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BONAIRE_mc2.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BONAIRE_me.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BONAIRE_mec.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BONAIRE_pfp.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BONAIRE_rlc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BONAIRE_sdma.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BONAIRE_smc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BONAIRE_uvd.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BONAIRE_vce.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/BTC_rlc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CAICOS_mc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CAICOS_me.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CAICOS_pfp.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CAICOS_smc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CAYMAN_mc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CAYMAN_me.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CAYMAN_pfp.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CAYMAN_rlc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CAYMAN_smc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CEDAR_me.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CEDAR_pfp.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CEDAR_rlc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CEDAR_smc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CYPRESS_me.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CYPRESS_pfp.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CYPRESS_rlc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CYPRESS_smc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/CYPRESS_uvd.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/HAINAN_ce.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/HAINAN_mc.bin base-obsolete obsolete -./usr/libdata/firmware/radeon/HAINAN_mc2.bin
CVS commit: src
Module Name:src Committed By: mrg Date: Sun May 15 00:24:14 UTC 2022 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/gpufw: mi src/etc/mtree: NetBSD.dist.i386 NetBSD.dist.x86_64 src/external/amdgpu-firmware: Makefile Added Files: src/etc/mtree: NetBSD.dist.aarch64 Log Message: install the lower case radeon firmware files into /usr/libdata/firmware. radeon has different case but same name firmware files. the lower case ones are already installed into /libdata/firmware, and to avoid having to provide some special method to build on systems with case-preserving file systems (such as macOS), we install the lower case ones in /usr. this means that anyone that requires the lower case files must either have /usr as part of the / file system, or manually keep them updated. last part of PR#54976, though i doubt we'll try to pull up these. this is enabled on i386, amd64 and arm64. To generate a diff of this commit: cvs rdiff -u -r1.1297 -r1.1298 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/gpufw/mi cvs rdiff -u -r0 -r1.8 src/etc/mtree/NetBSD.dist.aarch64 cvs rdiff -u -r1.2 -r1.3 src/etc/mtree/NetBSD.dist.i386 cvs rdiff -u -r1.14 -r1.15 src/etc/mtree/NetBSD.dist.x86_64 cvs rdiff -u -r1.1 -r1.2 src/external/amdgpu-firmware/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4/man4.hppa
Module Name:src Committed By: gutteridge Date: Sun May 15 00:06:09 UTC 2022 Modified Files: src/share/man/man4/man4.hppa: harmony.4 Log Message: harmony.4: add a minor detail, and fix some grammar To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.hppa/harmony.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man4/man4.hppa
Module Name:src Committed By: gutteridge Date: Sun May 15 00:06:09 UTC 2022 Modified Files: src/share/man/man4/man4.hppa: harmony.4 Log Message: harmony.4: add a minor detail, and fix some grammar To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/share/man/man4/man4.hppa/harmony.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/man4.hppa/harmony.4 diff -u src/share/man/man4/man4.hppa/harmony.4:1.2 src/share/man/man4/man4.hppa/harmony.4:1.3 --- src/share/man/man4/man4.hppa/harmony.4:1.2 Fri Feb 17 22:24:46 2017 +++ src/share/man/man4/man4.hppa/harmony.4 Sun May 15 00:06:09 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: harmony.4,v 1.2 2017/02/17 22:24:46 christos Exp $ +.\" $NetBSD: harmony.4,v 1.3 2022/05/15 00:06:09 gutteridge Exp $ .\" .\" $OpenBSD: harmony.4,v 1.7 2004/03/15 13:27:48 miod Exp $ .\" @@ -27,7 +27,7 @@ .\" ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd February 17, 2017 +.Dd May 15, 2022 .Dt HARMONY 4 hppa .Os .Sh NAME @@ -54,7 +54,8 @@ This device is found on most workstations. The .Nm -has a maximum precision of 16 bits and has a stereo input and stereo output. +has a maximum precision of 16 bits with a maximum 48000 Hz sample rate, +and has stereo input and stereo output. .Pp On .Tn HP 9000/712 @@ -69,7 +70,7 @@ bus that is used to communicate with the being sampled at a low accuracy secondary frequency (such as .Xr timeout 9 ) -produces poor quality random bit stream that is fed into the +produces a poor quality random bit stream that is fed into the entropy pool of .Xr rnd 4 . .Sh MACHINES @@ -110,7 +111,7 @@ It was ported to .Nx 1.6 by Chuck Silvers. .Sh CAVEATS -To trigger entropy collection +To trigger entropy collection, the .Tn CHI bus has to be programmed into the data mode that happens once a single buffer of data has been played or recorded.
CVS commit: src/distrib/common/bootimage
Module Name:src
Committed By: mrg
Date: Sun May 15 00:05:24 UTC 2022
Modified Files:
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
allow some invocations of expr(1) to "fail" - expr(1) returns "1" is
the expression expands to "0" or empty, and sometimes these values end
up correctly being 0.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/distrib/common/bootimage/Makefile.bootimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.29 src/distrib/common/bootimage/Makefile.bootimage:1.30
--- src/distrib/common/bootimage/Makefile.bootimage:1.29 Sat Sep 25 08:54:29 2021
+++ src/distrib/common/bootimage/Makefile.bootimage Sun May 15 00:05:24 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.29 2021/09/25 08:54:29 maya Exp $
+# $NetBSD: Makefile.bootimage,v 1.30 2022/05/15 00:05:24 mrg Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -201,8 +201,8 @@ LABELSECTORS?= 2048 # 1MB aligned for mo
.endif
FSSECTORS!= expr ${IMAGESECTORS} - ${SWAPSECTORS} - ${LABELSECTORS} \
- - ${EFISECTORS} - ${GPTSECTORS} - ${FATSECTORS}
-FSSIZE!= expr ${FSSECTORS} \* 512
+ - ${EFISECTORS} - ${GPTSECTORS} - ${FATSECTORS} || test $$? -eq 1 || exit 1
+FSSIZE!= expr ${FSSECTORS} \* 512 || test $$? -eq 1 || exit 1
# parameters for disklabel and MBR
HEADS= 64
@@ -217,9 +217,9 @@ MBRFAT?= 6 # 16-bit FAT, more than 32M
BSDPARTSECTORS!= expr ${IMAGESECTORS} - ${LABELSECTORS} \
- ${EFISECTORS} - ${GPTSECTORS} - ${FATSECTORS}
-FSOFFSET!= expr ${LABELSECTORS} + ${EFISECTORS} + ${FATSECTORS}
+FSOFFSET!= expr ${LABELSECTORS} + ${EFISECTORS} + ${FATSECTORS} || test $$? -eq 1 || exit 1
SWAPOFFSET!= expr ${LABELSECTORS} + ${FSSECTORS} \
- + ${EFISECTORS} + ${FATSECTORS}
+ + ${EFISECTORS} + ${FATSECTORS} || test $$? -eq 1 || exit 1
FATOFFSET= ${LABELSECTORS}
# parameters for sunlabel
CVS commit: src/distrib/common/bootimage
Module Name:src Committed By: mrg Date: Sun May 15 00:05:24 UTC 2022 Modified Files: src/distrib/common/bootimage: Makefile.bootimage Log Message: allow some invocations of expr(1) to "fail" - expr(1) returns "1" is the expression expands to "0" or empty, and sometimes these values end up correctly being 0. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/distrib/common/bootimage/Makefile.bootimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/stty
Module Name:src Committed By: dholland Date: Sat May 14 21:04:34 UTC 2022 Modified Files: src/bin/stty: stty.1 Log Message: Clarify that "stty 0" will normally hang up the tty. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/bin/stty/stty.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/stty
Module Name:src Committed By: dholland Date: Sat May 14 21:04:34 UTC 2022 Modified Files: src/bin/stty: stty.1 Log Message: Clarify that "stty 0" will normally hang up the tty. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/bin/stty/stty.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/stty/stty.1 diff -u src/bin/stty/stty.1:1.45 src/bin/stty/stty.1:1.46 --- src/bin/stty/stty.1:1.45 Mon Oct 30 15:38:52 2017 +++ src/bin/stty/stty.1 Sat May 14 21:04:34 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: stty.1,v 1.45 2017/10/30 15:38:52 wiz Exp $ +.\" $NetBSD: stty.1,v 1.46 2022/05/14 21:04:34 dholland Exp $ .\" .\" Copyright (c) 1990, 1993, 1994 .\" The Regents of the University of California. All rights reserved. @@ -32,7 +32,7 @@ .\" .\" @(#)stty.1 8.5 (Berkeley) 6/1/94 .\" -.Dd August 15, 2016 +.Dd May 14, 2022 .Dt STTY 1 .Os .Sh NAME @@ -114,7 +114,8 @@ if possible. If the baud rate is set to zero, modem control is no longer -asserted. +asserted; this will normally hang up the line, including on ptys and +other devices not physically connected to modems. .It Cm ispeed Ar number Set terminal input baud rate to .Ar number ,
CVS commit: src/external/amdgpu-firmware/radeon
Module Name:src
Committed By: mrg
Date: Sat May 14 20:54:31 UTC 2022
Added Files:
src/external/amdgpu-firmware/radeon: Makefile Makefile.inc README
src/external/amdgpu-firmware/radeon/lc: Makefile
src/external/amdgpu-firmware/radeon/uc: Makefile
Log Message:
install the lower case radeon firmware files into /usr/libdata/firmware.
radeon has different case but same name firmware files. the lower case
ones are already installed into /libdata/firmware, and to avoid having
to provide some special method to build on systems with case-preserving
file systems (such as macOS), we install the lower case ones in /usr.
this means that anyone that requires the lower case files must either
have /usr as part of the / file system, or manually keep them updated.
not yet hooked into build.
part of PR#54976, though i doubt we'll try to pull up these.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/radeon/Makefile \
src/external/amdgpu-firmware/radeon/Makefile.inc \
src/external/amdgpu-firmware/radeon/README
cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/radeon/lc/Makefile
cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/radeon/uc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/amdgpu-firmware/radeon/Makefile
diff -u /dev/null src/external/amdgpu-firmware/radeon/Makefile:1.1
--- /dev/null Sat May 14 20:54:31 2022
+++ src/external/amdgpu-firmware/radeon/Makefile Sat May 14 20:54:31 2022
@@ -0,0 +1,11 @@
+# $NetBSD: Makefile,v 1.1 2022/05/14 20:54:31 mrg Exp $
+
+.include
+
+.if ${MKRADEONFIRMWARE} != "no"
+# Upper case already installed from sys/dev/microcode.
+#SUBDIR= uc
+SUBDIR= lc
+.endif
+
+.include
Index: src/external/amdgpu-firmware/radeon/Makefile.inc
diff -u /dev/null src/external/amdgpu-firmware/radeon/Makefile.inc:1.1
--- /dev/null Sat May 14 20:54:31 2022
+++ src/external/amdgpu-firmware/radeon/Makefile.inc Sat May 14 20:54:31 2022
@@ -0,0 +1,3 @@
+# $NetBSD: Makefile.inc,v 1.1 2022/05/14 20:54:31 mrg Exp $
+
+
Index: src/external/amdgpu-firmware/radeon/README
diff -u /dev/null src/external/amdgpu-firmware/radeon/README:1.1
--- /dev/null Sat May 14 20:54:31 2022
+++ src/external/amdgpu-firmware/radeon/README Sat May 14 20:54:31 2022
@@ -0,0 +1,19 @@
+$NetBSD: README,v 1.1 2022/05/14 20:54:31 mrg Exp $
+
+Radeon ships files with the same name for case-insensitive file systems,
+and we can't build NetBSD on systems that have case-insensitive file
+systems that will be used for the $DESTDIR, we have to install these
+into different subdirs, and there needs to be a different locations for
+them in the installation.
+
+Workaround this by forcing consumers of the newer radeon firmware files
+to have /usr on the same file-system as /, so that /usr/libdata/firmware
+can be used for these.
+
+Hopefully these files won't change again, so we don't have to deal with
+this ever again.
+
+This subdir installs the lower-case versions. To avoid repo bloat, the
+upper-case versions remain in their current location.
+
+-mrg 2022-05-07
Index: src/external/amdgpu-firmware/radeon/lc/Makefile
diff -u /dev/null src/external/amdgpu-firmware/radeon/lc/Makefile:1.1
--- /dev/null Sat May 14 20:54:31 2022
+++ src/external/amdgpu-firmware/radeon/lc/Makefile Sat May 14 20:54:31 2022
@@ -0,0 +1,50 @@
+# $NetBSD: Makefile,v 1.1 2022/05/14 20:54:31 mrg Exp $
+
+NOMAN= # defined
+
+.include
+
+FILES= \
+ banks_k_2_smc.bin \
+ bonaire_ce.bin bonaire_k_smc.bin bonaire_mc.bin bonaire_me.bin \
+ bonaire_mec.bin bonaire_pfp.bin bonaire_rlc.bin bonaire_sdma.bin \
+ bonaire_sdma1.bin bonaire_smc.bin bonaire_uvd.bin bonaire_vce.bin \
+ hainan_ce.bin hainan_k_smc.bin hainan_mc.bin hainan_me.bin \
+ hainan_pfp.bin hainan_rlc.bin hainan_smc.bin hawaii_ce.bin \
+ hawaii_k_smc.bin hawaii_mc.bin hawaii_me.bin hawaii_mec.bin \
+ hawaii_pfp.bin hawaii_rlc.bin hawaii_sdma.bin hawaii_sdma1.bin \
+ hawaii_smc.bin hawaii_uvd.bin hawaii_vce.bin \
+ kabini_ce.bin kabini_me.bin kabini_mec.bin kabini_pfp.bin \
+ kabini_rlc.bin kabini_sdma.bin kabini_sdma1.bin kabini_uvd.bin \
+ kabini_vce.bin \
+ kaveri_ce.bin kaveri_me.bin kaveri_mec.bin kaveri_mec2.bin \
+ kaveri_pfp.bin kaveri_rlc.bin kaveri_sdma.bin kaveri_sdma1.bin \
+ kaveri_uvd.bin kaveri_vce.bin \
+ mullins_ce.bin mullins_me.bin mullins_mec.bin mullins_pfp.bin \
+ mullins_rlc.bin mullins_sdma.bin mullins_sdma1.bin mullins_uvd.bin \
+ mullins_vce.bin \
+ oland_ce.bin oland_k_smc.bin oland_mc.bin oland_me.bin \
+ oland_pfp.bin oland_rlc.bin oland_smc.bin \
+ pitcairn_ce.bin pitcairn_k_smc.bin pitcairn_mc.bin pitcairn_me.bin \
+ pitcairn_pfp.bin pitcairn_rlc.bin pitcairn_smc.bin \
+ si58_mc.bin \
+ tahiti_ce.bin tahiti_k_smc.bin tahiti_mc.bin tahiti_me.bin \
+ tahiti_pfp.bin tahiti_rlc.bin tahiti_smc.bin \
+ verde_ce.bin verde_k_smc.bin verde_mc.bin verde_me.bin \
+ verde_pfp.bin verde_rlc.bin
CVS commit: src/external/amdgpu-firmware/radeon
Module Name:src Committed By: mrg Date: Sat May 14 20:54:31 UTC 2022 Added Files: src/external/amdgpu-firmware/radeon: Makefile Makefile.inc README src/external/amdgpu-firmware/radeon/lc: Makefile src/external/amdgpu-firmware/radeon/uc: Makefile Log Message: install the lower case radeon firmware files into /usr/libdata/firmware. radeon has different case but same name firmware files. the lower case ones are already installed into /libdata/firmware, and to avoid having to provide some special method to build on systems with case-preserving file systems (such as macOS), we install the lower case ones in /usr. this means that anyone that requires the lower case files must either have /usr as part of the / file system, or manually keep them updated. not yet hooked into build. part of PR#54976, though i doubt we'll try to pull up these. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/radeon/Makefile \ src/external/amdgpu-firmware/radeon/Makefile.inc \ src/external/amdgpu-firmware/radeon/README cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/radeon/lc/Makefile cvs rdiff -u -r0 -r1.1 src/external/amdgpu-firmware/radeon/uc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS import: src/external/amdgpu-firmware/radeon/dist
Module Name:src Committed By: mrg Date: Sat May 14 20:49:59 UTC 2022 Update of /cvsroot/src/external/amdgpu-firmware/radeon/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3178 Log Message: initial import of the lower-case radeon firmware files. these share the same license as amdgpu-firmware, so keep them in the same license subdir. skip importing the upper case ones that are already available in sys/dev/microcode. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-20220310 N src/external/amdgpu-firmware/radeon/dist/lc/banks_k_2_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_k_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_mc.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_mec.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_sdma.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_sdma1.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_uvd.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_vce.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_k_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_mc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_k_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_mc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_mec.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_sdma.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_sdma1.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_uvd.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_vce.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_mec.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_sdma.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_sdma1.bin N src/external/amdgpu-firmware/radeon/dist/lc/si58_mc.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_uvd.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_vce.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_mec.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_mec2.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_sdma.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_sdma1.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_uvd.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_vce.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_mec.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_sdma.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_sdma1.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_uvd.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_vce.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_k_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_mc.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/pitcairn_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/pitcairn_k_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/pitcairn_mc.bin N src/external/amdgpu-firmware/radeon/dist/lc/pitcairn_me.bin N
CVS import: src/external/amdgpu-firmware/radeon/dist
Module Name:src Committed By: mrg Date: Sat May 14 20:49:59 UTC 2022 Update of /cvsroot/src/external/amdgpu-firmware/radeon/dist In directory ivanova.netbsd.org:/tmp/cvs-serv3178 Log Message: initial import of the lower-case radeon firmware files. these share the same license as amdgpu-firmware, so keep them in the same license subdir. skip importing the upper case ones that are already available in sys/dev/microcode. Status: Vendor Tag: LINUX-FIRMWARE Release Tags: linux-firmware-20220310 N src/external/amdgpu-firmware/radeon/dist/lc/banks_k_2_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_k_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_mc.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_mec.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_sdma.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_sdma1.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_uvd.bin N src/external/amdgpu-firmware/radeon/dist/lc/bonaire_vce.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_k_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_mc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hainan_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_k_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_mc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_mec.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_sdma.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_sdma1.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_uvd.bin N src/external/amdgpu-firmware/radeon/dist/lc/hawaii_vce.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_mec.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_sdma.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_sdma1.bin N src/external/amdgpu-firmware/radeon/dist/lc/si58_mc.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_uvd.bin N src/external/amdgpu-firmware/radeon/dist/lc/kabini_vce.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_mec.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_mec2.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_sdma.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_sdma1.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_uvd.bin N src/external/amdgpu-firmware/radeon/dist/lc/kaveri_vce.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_mec.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_sdma.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_sdma1.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_uvd.bin N src/external/amdgpu-firmware/radeon/dist/lc/mullins_vce.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_k_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_mc.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_me.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_pfp.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_rlc.bin N src/external/amdgpu-firmware/radeon/dist/lc/oland_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/pitcairn_ce.bin N src/external/amdgpu-firmware/radeon/dist/lc/pitcairn_k_smc.bin N src/external/amdgpu-firmware/radeon/dist/lc/pitcairn_mc.bin N src/external/amdgpu-firmware/radeon/dist/lc/pitcairn_me.bin N
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: riastradh
Date: Sat May 14 19:44:37 UTC 2022
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
xhci(4): Handle race between software abort and hardware stall.
To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/sys/dev/usb/xhci.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/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.165 src/sys/dev/usb/xhci.c:1.166
--- src/sys/dev/usb/xhci.c:1.165 Sat May 14 19:44:26 2022
+++ src/sys/dev/usb/xhci.c Sat May 14 19:44:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.165 2022/05/14 19:44:26 riastradh Exp $ */
+/* $NetBSD: xhci.c,v 1.166 2022/05/14 19:44:37 riastradh Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.165 2022/05/14 19:44:26 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.166 2022/05/14 19:44:37 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2253,6 +2253,10 @@ xhci_pipe_restart_async_task(void *cooki
struct xhci_ring * const tr = xs->xs_xr[dci];
struct usbd_xfer *xfer;
+ XHCIHIST_FUNC();
+ XHCIHIST_CALLARGS("sc=%#jx pipe=%#jx",
+ (uintptr_t)sc, (uintptr_t)pipe, 0, 0);
+
mutex_enter(>sc_lock);
xhci_pipe_restart(pipe);
@@ -2263,8 +2267,26 @@ xhci_pipe_restart_async_task(void *cooki
*/
tr->is_halted = false;
xfer = SIMPLEQ_FIRST(>up_queue);
- if (xfer)
- (*pipe->up_methods->upm_start)(xfer);
+ if (xfer) {
+ /*
+ * If the first xfer of the queue is not in progress,
+ * though, there may be a concurrent software abort
+ * that has already cancelled it and is now in the
+ * middle of a concurrent xhci_pipe_restart waiting to
+ * reacquire the pipe (bus) lock. So only restart the
+ * xfer if it's still USBD_IN_PROGRESS.
+ *
+ * Either way, xfers on the queue can't be in
+ * USBD_NOT_STARTED.
+ */
+ KASSERT(xfer->ux_status != USBD_NOT_STARTED);
+ if (xfer->ux_status == USBD_IN_PROGRESS) {
+ (*pipe->up_methods->upm_start)(xfer);
+ } else {
+ DPRINTF("pipe restart race xfer=%#jx status=%jd",
+ (uintptr_t)xfer, xfer->ux_status, 0, 0);
+ }
+ }
mutex_exit(>sc_lock);
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: riastradh Date: Sat May 14 19:44:37 UTC 2022 Modified Files: src/sys/dev/usb: xhci.c Log Message: xhci(4): Handle race between software abort and hardware stall. To generate a diff of this commit: cvs rdiff -u -r1.165 -r1.166 src/sys/dev/usb/xhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: riastradh
Date: Sat May 14 19:44:26 UTC 2022
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
xhci(4): Fix edge case in simultaneous xfer abort and failure.
On successful usbd_xfer_trycomplete, caller must set ux_status and
call usb_transfer_complete before releasing the pipe (bus) lock.
Failing to call usb_transfer_complete is a mistake. Presumably this
was intended to claim the xfer to complete it only on the last
packet.
I previously introduced the violation of this rule when the code
looked like
xfer->ux_status = err;
if (trb stuff)
usb_transfer_complete(xfer);
I mostly mechanically changed all the assignments of xfer->ux_status
to do usbd_xfer_trycomplete first and then usb_transfer_complete.
In the original, the extra assignment of xfer->ux_status in the event
we _don't_ immediately call usb_transfer_complete was likely
redundant and (except insofar as the abort protocol was broken)
harmless. But now it is a problem because of the contract between
usbd_xfer_trycomplete and usb_transfer_complete under the pipe (bus)
lock. In retrospect, the original probably should have been
if (trb stuff) {
xfer->ux_status = err;
usb_transfer_complete(xfer);
}
and my mechanical transformation should have worked, but also in
retrospect I should have put more thought into the change and done it
a little less mechanically.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/dev/usb/xhci.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/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.164 src/sys/dev/usb/xhci.c:1.165
--- src/sys/dev/usb/xhci.c:1.164 Wed Apr 6 22:01:45 2022
+++ src/sys/dev/usb/xhci.c Sat May 14 19:44:26 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: xhci.c,v 1.164 2022/04/06 22:01:45 mlelstv Exp $ */
+/* $NetBSD: xhci.c,v 1.165 2022/05/14 19:44:26 riastradh Exp $ */
/*
* Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.164 2022/04/06 22:01:45 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.165 2022/05/14 19:44:26 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -2473,18 +2473,18 @@ xhci_event_transfer(struct xhci_softc *
break;
}
- /*
- * Try to claim this xfer for completion. If it has already
- * completed or aborted, drop it on the floor.
- */
- if (!usbd_xfer_trycomplete(xfer))
- return;
-
- /* Set the status. */
- xfer->ux_status = err;
-
if ((trb_3 & XHCI_TRB_3_ED_BIT) == 0 ||
(trb_0 & 0x3) == 0x0) {
+ /*
+ * Try to claim this xfer for completion. If it has
+ * already completed or aborted, drop it on the floor.
+ */
+ if (!usbd_xfer_trycomplete(xfer))
+ return;
+
+ /* Set the status. */
+ xfer->ux_status = err;
+
usb_transfer_complete(xfer);
}
}
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: riastradh
Date: Sat May 14 19:44:26 UTC 2022
Modified Files:
src/sys/dev/usb: xhci.c
Log Message:
xhci(4): Fix edge case in simultaneous xfer abort and failure.
On successful usbd_xfer_trycomplete, caller must set ux_status and
call usb_transfer_complete before releasing the pipe (bus) lock.
Failing to call usb_transfer_complete is a mistake. Presumably this
was intended to claim the xfer to complete it only on the last
packet.
I previously introduced the violation of this rule when the code
looked like
xfer->ux_status = err;
if (trb stuff)
usb_transfer_complete(xfer);
I mostly mechanically changed all the assignments of xfer->ux_status
to do usbd_xfer_trycomplete first and then usb_transfer_complete.
In the original, the extra assignment of xfer->ux_status in the event
we _don't_ immediately call usb_transfer_complete was likely
redundant and (except insofar as the abort protocol was broken)
harmless. But now it is a problem because of the contract between
usbd_xfer_trycomplete and usb_transfer_complete under the pipe (bus)
lock. In retrospect, the original probably should have been
if (trb stuff) {
xfer->ux_status = err;
usb_transfer_complete(xfer);
}
and my mechanical transformation should have worked, but also in
retrospect I should have put more thought into the change and done it
a little less mechanically.
To generate a diff of this commit:
cvs rdiff -u -r1.164 -r1.165 src/sys/dev/usb/xhci.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: uwe Date: Sat May 14 17:52:10 UTC 2022 Modified Files: src/distrib/sets/lists/base: mi src/share/wscons/fonts: Makefile Added Files: src/share/wscons/fonts: ter-i12n.wsf.uue ter-i28n.wsf.uue Log Message: Terminus Font: Import 12pt and 28pt IBM437 fonts too. To generate a diff of this commit: cvs rdiff -u -r1.1296 -r1.1297 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.13 -r1.14 src/share/wscons/fonts/Makefile cvs rdiff -u -r0 -r1.1 src/share/wscons/fonts/ter-i12n.wsf.uue \ src/share/wscons/fonts/ter-i28n.wsf.uue Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: uwe
Date: Sat May 14 17:52:10 UTC 2022
Modified Files:
src/distrib/sets/lists/base: mi
src/share/wscons/fonts: Makefile
Added Files:
src/share/wscons/fonts: ter-i12n.wsf.uue ter-i28n.wsf.uue
Log Message:
Terminus Font: Import 12pt and 28pt IBM437 fonts too.
To generate a diff of this commit:
cvs rdiff -u -r1.1296 -r1.1297 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.13 -r1.14 src/share/wscons/fonts/Makefile
cvs rdiff -u -r0 -r1.1 src/share/wscons/fonts/ter-i12n.wsf.uue \
src/share/wscons/fonts/ter-i28n.wsf.uue
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1296 src/distrib/sets/lists/base/mi:1.1297
--- src/distrib/sets/lists/base/mi:1.1296 Sat May 14 14:02:08 2022
+++ src/distrib/sets/lists/base/mi Sat May 14 17:52:10 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1296 2022/05/14 14:02:08 uwe Exp $
+# $NetBSD: mi,v 1.1297 2022/05/14 17:52:10 uwe Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -5213,11 +5213,13 @@
./usr/share/wscons/fonts/spleen-5x8.fnt base-util-share share
./usr/share/wscons/fonts/spleen-6x12.fnt base-util-share share
./usr/share/wscons/fonts/spleen-8x16.fnt base-util-share share
+./usr/share/wscons/fonts/ter-i12n.wsf base-util-share share
./usr/share/wscons/fonts/ter-i16b.wsf base-util-share share
./usr/share/wscons/fonts/ter-i16n.wsf base-util-share share
./usr/share/wscons/fonts/ter-i16v.wsf base-util-share share
./usr/share/wscons/fonts/ter-i20n.wsf base-util-share share
./usr/share/wscons/fonts/ter-i24n.wsf base-util-share share
+./usr/share/wscons/fonts/ter-i28n.wsf base-util-share share
./usr/share/wscons/fonts/ter-i32n.wsf base-util-share share
./usr/share/wscons/fonts/vt220h.808 base-util-share share
./usr/share/wscons/fonts/vt220h.810 base-util-share share
Index: src/share/wscons/fonts/Makefile
diff -u src/share/wscons/fonts/Makefile:1.13 src/share/wscons/fonts/Makefile:1.14
--- src/share/wscons/fonts/Makefile:1.13 Sat May 14 14:02:08 2022
+++ src/share/wscons/fonts/Makefile Sat May 14 17:52:10 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2022/05/14 14:02:08 uwe Exp $
+# $NetBSD: Makefile,v 1.14 2022/05/14 17:52:10 uwe Exp $
FONTS= vt220l.814 vt220h.814 vt220l.808 vt220h.808 \
vt220l.816 vt220h.816 vt220l.810 vt220h.810 \
@@ -17,11 +17,13 @@ FONTS= vt220l.814 vt220h.814 vt220l.808
# b - bold
# v - CRT VGA Bold (8 columns, rendered in 9)
+FONTS += ter-i12n.wsf
FONTS += ter-i16b.wsf
FONTS += ter-i16n.wsf
FONTS += ter-i16v.wsf
FONTS += ter-i20n.wsf
FONTS += ter-i24n.wsf
+FONTS += ter-i28n.wsf
FONTS += ter-i32n.wsf
Added files:
Index: src/share/wscons/fonts/ter-i12n.wsf.uue
diff -u /dev/null src/share/wscons/fonts/ter-i12n.wsf.uue:1.1
--- /dev/null Sat May 14 17:52:10 2022
+++ src/share/wscons/fonts/ter-i12n.wsf.uue Sat May 14 17:52:10 2022
@@ -0,0 +1,83 @@
+$NetBSD: ter-i12n.wsf.uue,v 1.1 2022/05/14 17:52:10 uwe Exp $
+
+Terminus Font 4.49.1
+
+Copyright (C) 2020 Dimitar Toshkov Zhekov,
+with Reserved Font Name "Terminus Font".
+
+SPDX-License-Identifier: OFL-1.1-RFN
+
+begin 644 ter-i12n.wsf
+M5U-&5%1E(3,A+2TA'@`>/RT_(3,_'@`
+M`%#X^/AP<"```"!P^'`@('`@J/BH('``("!P^/AP
+M('`P>'@P`/S\_/S,A(3,_/S\_``P2$@P`/S\_/S,
+MM+3,_/S\_```/`P4<(B(B'``<(B(B'`@^"``>$AX0$!`0(``
+M>$AX2$A(2%"``""H<-APJ"```,#P_/SPP`P\_/P\#```
+M('#X("#X<"``4%!04%``4%``>*BHJ&@H*"@P2"!02"@0
+M2##X^/@`('#X(/AP(/@`('#X("`@("``("`@
+M("#X<"```!`8_!@0`"!@_&`@`("`@(#X
+M`$C,_,Q(`#`P>'C\_/S\>'@P,```
+M("`@("``("!04%``4%#X4%#X4%``('"HH'`H
+MJ'`@2*A0$"`H5$@`(%!0(&@@("``$"!`
+M0$!`(!``0"`0$!`0($!0(/@@4``@(/@@(```
+M("!``/@`("``"`@0$"`@0$``
+M<(B8J,B(B'``(&`@("`@('``<(B("!`@0/@`<(@(,`@(
+MB'``"!@H2(CX"`@`^("`\`@(B'``<("`\(B(B'``^`@(
+M$!`@("``<(B(<(B(B'``<(B(B'@("'`@(```("``
+M```@(```("!```@0($`@$`@```#X``#X`$`@$`@0($``
+M<(B($"``("``<(B8J*B8@'@`<(B(B/B(B(@`\(B(\(B(
+MB/``<(B`@("`B'``X)"(B(B(D.``^("`\("`@/@`^("`
+M\("`@(``<(B`@+B(B'``B(B(^(B(B(@`<"`@("`@('``
+M.!`0$!"0D&``B)"@P,"@D(@`@("`@("`@/@`B-BHJ(B(B(@`
+MB(C(J)B(B(@`<(B(B(B(B'``\(B(B/"`@(``<(B(B(B(
+MJ'`(\(B(B/"@D(@`<(B`<`@(B'``^"`@("`@("``B(B(
+MB(B(B'``B(B(4%!0("``B(B(B*BHV(@`B(A0("!0B(@`
+MB(A04"`@("``^`@0($"`@/@`<$!`0$!`0'``0$`@(!`0"`@`
+M```
+M``!PB(B(B(@```#X`/@`^"`@^"`@`/@```!`(!`($"!``/@`
CVS commit: src/games/gomoku
Module Name:src Committed By: rillig Date: Sat May 14 16:21:04 UTC 2022 Modified Files: src/games/gomoku: bdisp.c gomoku.h pickmove.c Log Message: gomoku: clean up unused code and lint warnings No binary change. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/games/gomoku/bdisp.c cvs rdiff -u -r1.20 -r1.21 src/games/gomoku/gomoku.h cvs rdiff -u -r1.22 -r1.23 src/games/gomoku/pickmove.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/gomoku
Module Name:src
Committed By: rillig
Date: Sat May 14 16:21:04 UTC 2022
Modified Files:
src/games/gomoku: bdisp.c gomoku.h pickmove.c
Log Message:
gomoku: clean up unused code and lint warnings
No binary change.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/games/gomoku/bdisp.c
cvs rdiff -u -r1.20 -r1.21 src/games/gomoku/gomoku.h
cvs rdiff -u -r1.22 -r1.23 src/games/gomoku/pickmove.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/gomoku/bdisp.c
diff -u src/games/gomoku/bdisp.c:1.18 src/games/gomoku/bdisp.c:1.19
--- src/games/gomoku/bdisp.c:1.18 Sun May 2 12:50:44 2021
+++ src/games/gomoku/bdisp.c Sat May 14 16:21:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bdisp.c,v 1.18 2021/05/02 12:50:44 rillig Exp $ */
+/* $NetBSD: bdisp.c,v 1.19 2022/05/14 16:21:04 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)bdisp.c 8.2 (Berkeley) 5/3/95";
#else
-__RCSID("$NetBSD: bdisp.c,v 1.18 2021/05/02 12:50:44 rillig Exp $");
+__RCSID("$NetBSD: bdisp.c,v 1.19 2022/05/14 16:21:04 rillig Exp $");
#endif
#endif /* not lint */
@@ -262,7 +262,7 @@ get_key(const char *allowed)
{
int ch;
- while (1) {
+ for (;;) {
ch = getch();
if (allowed != NULL &&
ch != '\0' && strchr(allowed, ch) == NULL) {
@@ -448,16 +448,13 @@ get_coord(void)
case 'Q':
case 'q':
return RESIGN;
- break;
case 'S':
case 's':
return SAVE;
- break;
case ' ':
case '\r':
(void) mvaddstr(BSZ3, (BSZ -6)/2, " ");
return PT(curx+1,cury+1);
- break;
}
curx = nx % BSZ;
Index: src/games/gomoku/gomoku.h
diff -u src/games/gomoku/gomoku.h:1.20 src/games/gomoku/gomoku.h:1.21
--- src/games/gomoku/gomoku.h:1.20 Sat Mar 22 18:58:57 2014
+++ src/games/gomoku/gomoku.h Sat May 14 16:21:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gomoku.h,v 1.20 2014/03/22 18:58:57 dholland Exp $ */
+/* $NetBSD: gomoku.h,v 1.21 2022/05/14 16:21:04 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -268,8 +268,6 @@ extern int debug;
extern int interactive;
extern const char *plyr[];
-#define ASSERT(x)
-
void bdinit(struct spotstr *);
int get_coord(void);
int get_key(const char *allowedkeys);
Index: src/games/gomoku/pickmove.c
diff -u src/games/gomoku/pickmove.c:1.22 src/games/gomoku/pickmove.c:1.23
--- src/games/gomoku/pickmove.c:1.22 Sat Oct 19 17:23:08 2013
+++ src/games/gomoku/pickmove.c Sat May 14 16:21:04 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pickmove.c,v 1.22 2013/10/19 17:23:08 christos Exp $ */
+/* $NetBSD: pickmove.c,v 1.23 2022/05/14 16:21:04 rillig Exp $ */
/*
* Copyright (c) 1994
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)pickmove.c 8.2 (Berkeley) 5/3/95";
#else
-__RCSID("$NetBSD: pickmove.c,v 1.22 2013/10/19 17:23:08 christos Exp $");
+__RCSID("$NetBSD: pickmove.c,v 1.23 2022/05/14 16:21:04 rillig Exp $");
#endif
#endif /* not lint */
@@ -806,7 +806,7 @@ static struct combostr *ecombo[MAXDEPTH]
static void
makeempty(struct combostr *ocbp)
{
- struct combostr *cbp, *tcbp, **cbpp;
+ struct combostr *cbp, **cbpp;
struct elist *ep, *nep;
struct spotstr *sp;
int s, d, m, emask, i;
@@ -835,8 +835,7 @@ makeempty(struct combostr *ocbp)
*/
ep = [nframes];
cbpp = [nframes];
- for (cbp = ocbp; (tcbp = cbp->c_link[1]) != NULL;
- cbp = cbp->c_link[0]) {
+ for (cbp = ocbp; cbp->c_link[1] != NULL; cbp = cbp->c_link[0]) {
ep--;
ep->e_combo = cbp;
*--cbpp = cbp->c_link[1];
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: riastradh
Date: Sat May 14 15:29:08 UTC 2022
Modified Files:
src/sys/dev/usb: uvideo.c
Log Message:
uvideo(4): Fix missing line breaks in debug messages.
To generate a diff of this commit:
cvs rdiff -u -r1.80 -r1.81 src/sys/dev/usb/uvideo.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/dev/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.80 src/sys/dev/usb/uvideo.c:1.81
--- src/sys/dev/usb/uvideo.c:1.80 Sat May 14 15:28:50 2022
+++ src/sys/dev/usb/uvideo.c Sat May 14 15:29:08 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.80 2022/05/14 15:28:50 riastradh Exp $ */
+/* $NetBSD: uvideo.c,v 1.81 2022/05/14 15:29:08 riastradh Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.80 2022/05/14 15:28:50 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.81 2022/05/14 15:29:08 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -1333,7 +1333,7 @@ uvideo_stream_init_frame_based_format(st
DPRINTF(("%s: uncompressed\n", __func__));
if (format_desc->bLength <
sizeof(uvideo_vs_format_uncompressed_descriptor_t)) {
- DPRINTF(("uvideo: truncated uncompressed format: %d",
+ DPRINTF(("uvideo: truncated uncompressed format: %d\n",
format_desc->bLength));
return USBD_INVAL;
}
@@ -1363,7 +1363,7 @@ uvideo_stream_init_frame_based_format(st
DPRINTF(("%s: frame-based\n", __func__));
if (format_desc->bLength <
sizeof(uvideo_format_frame_based_descriptor_t)) {
- DPRINTF(("uvideo: truncated frame-based format: %d",
+ DPRINTF(("uvideo: truncated frame-based format: %d\n",
format_desc->bLength));
return USBD_INVAL;
}
@@ -1377,7 +1377,7 @@ uvideo_stream_init_frame_based_format(st
DPRINTF(("%s: mjpeg\n", __func__));
if (format_desc->bLength <
sizeof(uvideo_vs_format_mjpeg_descriptor_t)) {
- DPRINTF(("uvideo: truncated mjpeg format: %d",
+ DPRINTF(("uvideo: truncated mjpeg format: %d\n",
format_desc->bLength));
return USBD_INVAL;
}
@@ -1421,7 +1421,7 @@ uvideo_stream_init_frame_based_format(st
if (desc->bDescriptorType != UDESC_CS_INTERFACE)
break;
if (desc->bLength < sizeof(*uvdesc)) {
- DPRINTF(("uvideo: truncated CS descriptor, length %d",
+ DPRINTF(("uvideo: truncated CS descriptor, length %d\n",
desc->bLength));
break;
}
@@ -1431,7 +1431,7 @@ uvideo_stream_init_frame_based_format(st
if (uvdesc->bLength < subtypelen) {
DPRINTF(("uvideo:"
" truncated CS subtype-0x%x descriptor,"
-" length %d < %d",
+" length %d < %d\n",
uvdesc->bDescriptorSubtype,
uvdesc->bLength, subtypelen));
break;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: riastradh Date: Sat May 14 15:29:08 UTC 2022 Modified Files: src/sys/dev/usb: uvideo.c Log Message: uvideo(4): Fix missing line breaks in debug messages. To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/dev/usb/uvideo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: riastradh Date: Sat May 14 15:28:59 UTC 2022 Modified Files: src/sys/dev/usb: uvideoreg.h Log Message: uvideo(4): Fix lengths of various frame descriptors. This driver doesn't use the frame interval members, which are either fixed (if continuous) or flexible (if discrete) and so can't be encoded in C types correctly. If we did use them, it would be necessary to use pointer arithmetic on char pointers in the enclosing descriptor buffer. But we don't, so this is simpler, and fixes the sizeof checks to avoid running off the end of invalid descriptors. Should fix failure to parse legitimate descriptors (without regressing to choking on malicious ones): -uvideo: found format (index 1) type 9 size 1280x720 size 1843200 stride 2560 interval 33 - ^ picking this one -uvideo: found format (index 2) type 9 size 640x480 size 614400 stride 1280 interval 33 +uvideo: truncated CS subtype-0x7 descriptor, length 30 < 38uvideo: unimplemented VS CS descriptor len=30 type=0x24 subtype=0x07 +uvideo: unimplemented VS CS descriptor len=30 type=0x24 subtype=0x07 To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/uvideoreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: riastradh
Date: Sat May 14 15:28:59 UTC 2022
Modified Files:
src/sys/dev/usb: uvideoreg.h
Log Message:
uvideo(4): Fix lengths of various frame descriptors.
This driver doesn't use the frame interval members, which are either
fixed (if continuous) or flexible (if discrete) and so can't be
encoded in C types correctly. If we did use them, it would be
necessary to use pointer arithmetic on char pointers in the enclosing
descriptor buffer. But we don't, so this is simpler, and fixes the
sizeof checks to avoid running off the end of invalid descriptors.
Should fix failure to parse legitimate descriptors (without
regressing to choking on malicious ones):
-uvideo: found format (index 1) type 9 size 1280x720 size 1843200 stride 2560
interval 33
- ^ picking this one
-uvideo: found format (index 2) type 9 size 640x480 size 614400 stride 1280
interval 33
+uvideo: truncated CS subtype-0x7 descriptor, length 30 < 38uvideo:
unimplemented VS CS descriptor len=30 type=0x24 subtype=0x07
+uvideo: unimplemented VS CS descriptor len=30 type=0x24 subtype=0x07
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/usb/uvideoreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uvideoreg.h
diff -u src/sys/dev/usb/uvideoreg.h:1.6 src/sys/dev/usb/uvideoreg.h:1.7
--- src/sys/dev/usb/uvideoreg.h:1.6 Sun Nov 14 08:32:07 2021
+++ src/sys/dev/usb/uvideoreg.h Sat May 14 15:28:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideoreg.h,v 1.6 2021/11/14 08:32:07 andvar Exp $ */
+/* $NetBSD: uvideoreg.h,v 1.7 2022/05/14 15:28:59 riastradh Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -435,9 +435,8 @@ typedef struct {
uDWord dwMaxVideoFrameBufferSize;
uDWord dwDefaultFrameInterval;
uByte bFrameIntervalType;
- uvideo_frame_interval_t uFrameInterval;
} UPACKED uvideo_vs_frame_uncompressed_descriptor_t;
-
+CTASSERT(sizeof(uvideo_vs_frame_uncompressed_descriptor_t) == 26);
/* Frame based Format and Frame descriptors. This is for generic
* frame based payloads not covered by other types (e.g, uncompressed
@@ -471,9 +470,8 @@ typedef struct {
uDWord dwDefaultFrameInterval;
uByte bFrameIntervalType;
uDWord dwBytesPerLine;
- uvideo_frame_interval_t uFrameInterval;
} UPACKED uvideo_frame_frame_based_descriptor_t;
-
+CTASSERT(sizeof(uvideo_frame_frame_based_descriptor_t) == 26);
/* MJPEG format and frame descriptors */
@@ -506,9 +504,8 @@ typedef struct {
uDWord dwMaxVideoFrameBufferSize;
uDWord dwDefaultFrameInterval;
uByte bFrameIntervalType;
- uvideo_frame_interval_t uFrameInterval;
} UPACKED uvideo_vs_frame_mjpeg_descriptor_t;
-
+CTASSERT(sizeof(uvideo_vs_frame_mjpeg_descriptor_t) == 26);
typedef struct {
uByte bLength;
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: riastradh
Date: Sat May 14 15:28:50 UTC 2022
Modified Files:
src/sys/dev/usb: uvideo.c
Log Message:
uvideo(4): Avoid exposing streams with invalid descriptors.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/usb/uvideo.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/dev/usb/uvideo.c
diff -u src/sys/dev/usb/uvideo.c:1.79 src/sys/dev/usb/uvideo.c:1.80
--- src/sys/dev/usb/uvideo.c:1.79 Sun Apr 24 09:55:48 2022
+++ src/sys/dev/usb/uvideo.c Sat May 14 15:28:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: uvideo.c,v 1.79 2022/04/24 09:55:48 hannken Exp $ */
+/* $NetBSD: uvideo.c,v 1.80 2022/05/14 15:28:50 riastradh Exp $ */
/*
* Copyright (c) 2008 Patrick Mahoney
@@ -42,7 +42,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.79 2022/04/24 09:55:48 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvideo.c,v 1.80 2022/05/14 15:28:50 riastradh Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -613,6 +613,16 @@ uvideo_attach(device_t parent, device_t
aprint_error_dev(self, "couldn't establish power handler\n");
SLIST_FOREACH(vs, >sc_stream_list, entries) {
+ /*
+ * If the descriptor is invalid, there may be no
+ * default format.
+ *
+ * XXX Maybe this should just be removed from the list
+ * at some other point, but finding the right other
+ * point is not trivial.
+ */
+ if (vs->vs_default_format == NULL)
+ continue;
/* XXX initialization of vs_videodev is racy */
vs->vs_videodev = video_attach_mi(_hw_if, sc->sc_dev,
vs);
CVS commit: src/sys/dev/usb
Module Name:src Committed By: riastradh Date: Sat May 14 15:28:50 UTC 2022 Modified Files: src/sys/dev/usb: uvideo.c Log Message: uvideo(4): Avoid exposing streams with invalid descriptors. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/dev/usb/uvideo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/cgram
Module Name:src
Committed By: rillig
Date: Sat May 14 14:20:10 UTC 2022
Modified Files:
src/games/cgram: cgram.c
Log Message:
cgram: clear bottom line of the screen at the end
Previously, the prompt line of the shell overwrote only part of the
prompt of cgram, the rest was still visible.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/games/cgram/cgram.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/cgram/cgram.c
diff -u src/games/cgram/cgram.c:1.27 src/games/cgram/cgram.c:1.28
--- src/games/cgram/cgram.c:1.27 Mon Mar 28 20:00:29 2022
+++ src/games/cgram/cgram.c Sat May 14 14:20:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cgram.c,v 1.27 2022/03/28 20:00:29 rillig Exp $ */
+/* $NetBSD: cgram.c,v 1.28 2022/05/14 14:20:10 rillig Exp $ */
/*-
* Copyright (c) 2013, 2021 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: cgram.c,v 1.27 2022/03/28 20:00:29 rillig Exp $");
+__RCSID("$NetBSD: cgram.c,v 1.28 2022/05/14 14:20:10 rillig Exp $");
#endif
#include
@@ -579,6 +579,10 @@ loop(void)
static void
done(void)
{
+ move(LINES - 1, 0);
+ clrtoeol();
+ refresh();
+
endwin();
stringarray_done();
CVS commit: src/games/cgram
Module Name:src Committed By: rillig Date: Sat May 14 14:20:10 UTC 2022 Modified Files: src/games/cgram: cgram.c Log Message: cgram: clear bottom line of the screen at the end Previously, the prompt line of the shell overwrote only part of the prompt of cgram, the rest was still visible. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/games/cgram/cgram.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On Sat, May 14, 2022 at 14:02:08 +, Valeriy E. Ushakov wrote: > Module Name: src > Committed By: uwe > Date: Sat May 14 14:02:08 UTC 2022 > > Modified Files: > src/distrib/sets/lists/base: mi > src/doc: 3RDPARTY > src/share/wscons/fonts: Makefile > Added Files: > src/share/wscons/fonts: ter-i16b.wsf.uue ter-i16n.wsf.uue > ter-i16v.wsf.uue ter-i20n.wsf.uue ter-i24n.wsf.uue ter-i32n.wsf.uue > > Log Message: > Terminus Font: Import IBM-encoded versions from 4.49.1 > > Terminus Font is a clean, fixed width bitmap font, designed for long > (8 and more hours per day) work with computers. > > The font has a very good script coverage and subsets with other > encodings can be imported in the future. > > This commit imports IBM437 encoded (WSDISPLAY_FONTENC_ISO) subsets > converted to WSF format. wsfont metadata are stored in the files, so > you can load them without any additional arguments to wsfontload(8). *sigh* The log should say "WSDISPLAY_FONTENC_IBM", sorry. -uwe
CVS commit: src
Module Name:src
Committed By: uwe
Date: Sat May 14 14:02:08 UTC 2022
Modified Files:
src/distrib/sets/lists/base: mi
src/doc: 3RDPARTY
src/share/wscons/fonts: Makefile
Added Files:
src/share/wscons/fonts: ter-i16b.wsf.uue ter-i16n.wsf.uue
ter-i16v.wsf.uue ter-i20n.wsf.uue ter-i24n.wsf.uue ter-i32n.wsf.uue
Log Message:
Terminus Font: Import IBM-encoded versions from 4.49.1
Terminus Font is a clean, fixed width bitmap font, designed for long
(8 and more hours per day) work with computers.
The font has a very good script coverage and subsets with other
encodings can be imported in the future.
This commit imports IBM437 encoded (WSDISPLAY_FONTENC_ISO) subsets
converted to WSF format. wsfont metadata are stored in the files, so
you can load them without any additional arguments to wsfontload(8).
To generate a diff of this commit:
cvs rdiff -u -r1.1295 -r1.1296 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1855 -r1.1856 src/doc/3RDPARTY
cvs rdiff -u -r1.12 -r1.13 src/share/wscons/fonts/Makefile
cvs rdiff -u -r0 -r1.1 src/share/wscons/fonts/ter-i16b.wsf.uue \
src/share/wscons/fonts/ter-i16n.wsf.uue \
src/share/wscons/fonts/ter-i16v.wsf.uue \
src/share/wscons/fonts/ter-i20n.wsf.uue \
src/share/wscons/fonts/ter-i24n.wsf.uue \
src/share/wscons/fonts/ter-i32n.wsf.uue
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1295 src/distrib/sets/lists/base/mi:1.1296
--- src/distrib/sets/lists/base/mi:1.1295 Fri May 13 16:39:32 2022
+++ src/distrib/sets/lists/base/mi Sat May 14 14:02:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1295 2022/05/13 16:39:32 brad Exp $
+# $NetBSD: mi,v 1.1296 2022/05/14 14:02:08 uwe Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -5213,6 +5213,12 @@
./usr/share/wscons/fonts/spleen-5x8.fnt base-util-share share
./usr/share/wscons/fonts/spleen-6x12.fnt base-util-share share
./usr/share/wscons/fonts/spleen-8x16.fnt base-util-share share
+./usr/share/wscons/fonts/ter-i16b.wsf base-util-share share
+./usr/share/wscons/fonts/ter-i16n.wsf base-util-share share
+./usr/share/wscons/fonts/ter-i16v.wsf base-util-share share
+./usr/share/wscons/fonts/ter-i20n.wsf base-util-share share
+./usr/share/wscons/fonts/ter-i24n.wsf base-util-share share
+./usr/share/wscons/fonts/ter-i32n.wsf base-util-share share
./usr/share/wscons/fonts/vt220h.808 base-util-share share
./usr/share/wscons/fonts/vt220h.810 base-util-share share
./usr/share/wscons/fonts/vt220h.814 base-util-share share
Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.1855 src/doc/3RDPARTY:1.1856
--- src/doc/3RDPARTY:1.1855 Tue May 10 05:41:54 2022
+++ src/doc/3RDPARTY Sat May 14 14:02:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: 3RDPARTY,v 1.1855 2022/05/10 05:41:54 wiz Exp $
+# $NetBSD: 3RDPARTY,v 1.1856 2022/05/14 14:02:08 uwe Exp $
#
# This file contains a list of the software that has been integrated into
# NetBSD where we are not the primary maintainer.
@@ -2275,3 +2275,20 @@ Responsible: brad
License: BSD (3-clause)
Location: sys/dev/i2c/sensirion_voc_algorithm.c sys/dev/i2c/sensirion_voc_algorithm.h
Notes:
+
+Package: Terminus Font
+Version: 4.49.1
+Current Vers: 4.49.1
+Maintainer: Dimitar Toshkov Zhekov
+Archive Site: http://terminus-font.sourceforge.net/
+Home Page: http://terminus-font.sourceforge.net/
+Date: 2020-12-28
+Mailing List:
+Responsible:
+License: OFL-1.1-RFN
+Location: share/wscons/fonts
+Notes:
+Suitably encoded BDF files are prepared from the Unicode encoded
+masters using upstream build scripts. BDF files are converted to the
+WSF files with xsrc/local/programs/bdfload. File names for the
+re-encoded subsets follow the convention used by the upstream.
Index: src/share/wscons/fonts/Makefile
diff -u src/share/wscons/fonts/Makefile:1.12 src/share/wscons/fonts/Makefile:1.13
--- src/share/wscons/fonts/Makefile:1.12 Wed Jul 8 11:24:49 2020
+++ src/share/wscons/fonts/Makefile Sat May 14 14:02:08 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2020/07/08 11:24:49 fcambus Exp $
+# $NetBSD: Makefile,v 1.13 2022/05/14 14:02:08 uwe Exp $
FONTS= vt220l.814 vt220h.814 vt220l.808 vt220h.808 \
vt220l.816 vt220h.816 vt220l.810 vt220h.810 \
@@ -7,6 +7,24 @@ FONTS= vt220l.814 vt220h.814 vt220l.808
spleen-5x8.fnt spleen-6x12.fnt spleen-8x16.fnt \
spleen-12x24.fnt spleen-16x32.fnt spleen-32x64.fnt
+
+# Terminus Font by Dimitar Toshkov Zhekov
+# The naming of the files follows upstream conventions:
+#
+# i - IBM437
+#
+# n - normal
+# b - bold
+# v - CRT VGA Bold (8 columns, rendered in 9)
+
+FONTS += ter-i16b.wsf
+FONTS += ter-i16n.wsf
+FONTS += ter-i16v.wsf
+FONTS += ter-i20n.wsf
+FONTS += ter-i24n.wsf
+FONTS += ter-i32n.wsf
+
+
FILES=${FONTS}
UUDECODE_FILES=${FONTS}
Added
CVS commit: src
Module Name:src Committed By: uwe Date: Sat May 14 14:02:08 UTC 2022 Modified Files: src/distrib/sets/lists/base: mi src/doc: 3RDPARTY src/share/wscons/fonts: Makefile Added Files: src/share/wscons/fonts: ter-i16b.wsf.uue ter-i16n.wsf.uue ter-i16v.wsf.uue ter-i20n.wsf.uue ter-i24n.wsf.uue ter-i32n.wsf.uue Log Message: Terminus Font: Import IBM-encoded versions from 4.49.1 Terminus Font is a clean, fixed width bitmap font, designed for long (8 and more hours per day) work with computers. The font has a very good script coverage and subsets with other encodings can be imported in the future. This commit imports IBM437 encoded (WSDISPLAY_FONTENC_ISO) subsets converted to WSF format. wsfont metadata are stored in the files, so you can load them without any additional arguments to wsfontload(8). To generate a diff of this commit: cvs rdiff -u -r1.1295 -r1.1296 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1855 -r1.1856 src/doc/3RDPARTY cvs rdiff -u -r1.12 -r1.13 src/share/wscons/fonts/Makefile cvs rdiff -u -r0 -r1.1 src/share/wscons/fonts/ter-i16b.wsf.uue \ src/share/wscons/fonts/ter-i16n.wsf.uue \ src/share/wscons/fonts/ter-i16v.wsf.uue \ src/share/wscons/fonts/ter-i20n.wsf.uue \ src/share/wscons/fonts/ter-i24n.wsf.uue \ src/share/wscons/fonts/ter-i32n.wsf.uue Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/kernel
Module Name:src
Committed By: christos
Date: Sat May 14 14:02:03 UTC 2022
Modified Files:
src/tests/kernel: t_sysv.c
Log Message:
PR/56831: Eric van Gyzen: race condition in tests/kernel/t_sysv.c
https://cgit.freebsd.org/src/commit/?id=20917cac7bcf216225a7b66f7b3a56f3764c5acc
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/kernel/t_sysv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/t_sysv.c
diff -u src/tests/kernel/t_sysv.c:1.5 src/tests/kernel/t_sysv.c:1.6
--- src/tests/kernel/t_sysv.c:1.5 Fri Feb 2 21:57:15 2018
+++ src/tests/kernel/t_sysv.c Sat May 14 10:02:03 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: t_sysv.c,v 1.5 2018/02/03 02:57:15 pgoyette Exp $ */
+/* $NetBSD: t_sysv.c,v 1.6 2022/05/14 14:02:03 christos Exp $ */
/*-
* Copyright (c) 1999, 2007 The NetBSD Foundation, Inc.
@@ -53,11 +53,9 @@
#include
#include
-volatile int did_sigsys, did_sigchild;
-volatile int child_status, child_count;
+volatile int did_sigsys;
void sigsys_handler(int);
-void sigchld_handler(int);
key_t get_ftok(int);
@@ -120,16 +118,14 @@ write_int(const char *path, const int va
static int
read_int(const char *path)
{
- int input;
+ int input, value;
input = open(path, O_RDONLY);
if (input == -1)
return -1;
- else {
- int value;
- read(input, , sizeof(value));
- return value;
- }
+
+ read(input, , sizeof(value));
+ return value;
}
@@ -140,23 +136,6 @@ sigsys_handler(int signo)
did_sigsys = 1;
}
-void
-sigchld_handler(int signo)
-{
- int c_status;
-
- did_sigchild = 1;
- /*
- * Reap the child and return its status
- */
- if (wait(_status) == -1)
- child_status = -errno;
- else
- child_status = c_status;
-
- child_count--;
-}
-
key_t get_ftok(int id)
{
int fd;
@@ -179,8 +158,9 @@ key_t get_ftok(int id)
rmdir(tmpdir);
atf_tc_fail("open() of temp file failed: %d", errno);
return (key_t)-1;
- } else
- close(fd);
+ }
+
+ close(fd);
key = ftok(token_key, id);
ATF_REQUIRE_MSG(key != (key_t)-1, "ftok() failed");
@@ -204,10 +184,10 @@ ATF_TC_BODY(msg, tc)
struct sigaction sa;
struct msqid_ds m_ds;
struct testmsg m;
- sigset_t sigmask;
int sender_msqid;
int loop;
int c_status;
+ pid_t wait_result;
/*
* Install a SIGSYS handler so that we can exit gracefully if
@@ -220,18 +200,6 @@ ATF_TC_BODY(msg, tc)
ATF_REQUIRE_MSG(sigaction(SIGSYS, , NULL) != -1,
"sigaction SIGSYS: %d", errno);
- /*
- * Install a SIGCHLD handler to deal with all possible exit
- * conditions of the receiver.
- */
- did_sigchild = 0;
- child_count = 0;
- sa.sa_handler = sigchld_handler;
- sigemptyset(_mask);
- sa.sa_flags = 0;
- ATF_REQUIRE_MSG(sigaction(SIGCHLD, , NULL) != -1,
- "sigaction SIGCHLD: %d", errno);
-
msgkey = get_ftok(4160);
ATF_REQUIRE_MSG(msgkey != (key_t)-1, "get_ftok failed");
@@ -264,13 +232,14 @@ ATF_TC_BODY(msg, tc)
print_msqid_ds(_ds, 0600);
+ fflush(stdout);
+
switch ((child_pid = fork())) {
case -1:
atf_tc_fail("fork: %d", errno);
return;
case 0:
- child_count++;
receiver();
break;
@@ -288,7 +257,7 @@ ATF_TC_BODY(msg, tc)
0) != -1, "sender: msgsnd 1: %d", errno);
ATF_REQUIRE_MSG(msgrcv(sender_msqid, , MESSAGE_TEXT_LEN,
- MTYPE_1_ACK, 0) == MESSAGE_TEXT_LEN,
+ MTYPE_1_ACK, 0) == MESSAGE_TEXT_LEN,
"sender: msgrcv 1 ack: %d", errno);
print_msqid_ds(_ds, 0600);
@@ -298,40 +267,29 @@ ATF_TC_BODY(msg, tc)
*/
m.mtype = MTYPE_2;
strcpy(m.mtext, m2_str);
- ATF_REQUIRE_MSG(msgsnd(sender_msqid, , MESSAGE_TEXT_LEN, 0) != -1,
- "sender: msgsnd 2: %d", errno);
+ ATF_REQUIRE_MSG(msgsnd(sender_msqid, , MESSAGE_TEXT_LEN, 0)
+ != -1, "sender: msgsnd 2: %d", errno);
ATF_REQUIRE_MSG(msgrcv(sender_msqid, , MESSAGE_TEXT_LEN,
- MTYPE_2_ACK, 0) == MESSAGE_TEXT_LEN,
+ MTYPE_2_ACK, 0) == MESSAGE_TEXT_LEN,
"sender: msgrcv 2 ack: %d", errno);
}
/*
* Wait for child to finish
*/
- sigemptyset();
- (void) sigsuspend();
+ wait_result = wait(_status);
+ ATF_REQUIRE_EQ_MSG(wait_result, child_pid, "wait returned %d (%s)",
+ wait_result, wait_result == -1 ? strerror(errno) : "");
+ ATF_REQUIRE_MSG(WIFEXITED(c_status), "child abnormal exit: %d (sig %d)",
+ c_status, WTERMSIG(c_status));
+ ATF_REQUIRE_EQ_MSG(WEXITSTATUS(c_status), 0, "child status: %d",
+ WEXITSTATUS(c_status));
- /*
- * ...and any other signal is an unexpected error.
- */
- if (did_sigchild) {
- c_status = child_status;
- if (c_status < 0)
- atf_tc_fail("waitpid: %d", -c_status);
- else if (WIFEXITED(c_status) == 0)
- atf_tc_fail("child abnormal exit: %d", c_status);
- else if (WEXITSTATUS(c_status) != 0)
- atf_tc_fail("c status: %d", WEXITSTATUS(c_status));
- else {
- ATF_REQUIRE_MSG(msgctl(sender_msqid, IPC_STAT, _ds)
- != -1, "msgctl IPC_STAT: %d", errno);
+ ATF_REQUIRE_MSG(msgctl(sender_msqid,
CVS commit: src/tests/kernel
Module Name:src Committed By: christos Date: Sat May 14 14:02:03 UTC 2022 Modified Files: src/tests/kernel: t_sysv.c Log Message: PR/56831: Eric van Gyzen: race condition in tests/kernel/t_sysv.c https://cgit.freebsd.org/src/commit/?id=20917cac7bcf216225a7b66f7b3a56f3764c5acc To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/kernel/t_sysv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Sat May 14 12:25:16 UTC 2022 Modified Files: src/usr.bin/make: var.c Log Message: make: clean up comments in Var_Parse To generate a diff of this commit: cvs rdiff -u -r1.1020 -r1.1021 src/usr.bin/make/var.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Sat May 14 12:25:16 UTC 2022
Modified Files:
src/usr.bin/make: var.c
Log Message:
make: clean up comments in Var_Parse
To generate a diff of this commit:
cvs rdiff -u -r1.1020 -r1.1021 src/usr.bin/make/var.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.1020 src/usr.bin/make/var.c:1.1021
--- src/usr.bin/make/var.c:1.1020 Mon May 9 21:24:42 2022
+++ src/usr.bin/make/var.c Sat May 14 12:25:16 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.1020 2022/05/09 21:24:42 rillig Exp $ */
+/* $NetBSD: var.c,v 1.1021 2022/05/14 12:25:16 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -139,7 +139,7 @@
#include "metachar.h"
/* "@(#)var.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: var.c,v 1.1020 2022/05/09 21:24:42 rillig Exp $");
+MAKE_RCSID("$NetBSD: var.c,v 1.1021 2022/05/14 12:25:16 rillig Exp $");
/*
* Variables are defined using one of the VAR=value assignments. Their
@@ -,9 +,8 @@ Var_Parse_FastLane(const char **pp, VarE
*
* Input:
* *pp The string to parse.
- * In CondParser_FuncCallEmpty, it may also point to the
- * "y" of "empty(VARNAME:Modifiers)", which is
- * syntactically the same.
+ * When called from CondParser_FuncCallEmpty, it can
+ * also point to the "y" of "empty(VARNAME:Modifiers)".
* scope The scope for finding variables
* emode Controls the exact details of parsing and evaluation
*
@@ -4477,16 +4476,14 @@ Var_Parse(const char **pp, GNode *scope,
{
const char *p = *pp;
const char *const start = p;
- /* true if have modifiers for the variable. */
- bool haveModifier;
- /* Starting character if variable in parens or braces. */
- char startc;
- /* Ending character if variable in parens or braces. */
- char endc;
+ bool haveModifier; /* true for ${VAR:...}, false for ${VAR} */
+ char startc; /* the actual '{' or '(' or '\0' */
+ char endc; /* the expected '}' or ')' or '\0' */
/*
- * true if the variable is local and we're expanding it in a
- * non-local scope. This is done to support dynamic sources.
- * The result is just the expression, unaltered.
+ * true if the expression is based on one of the 7 predefined
+ * variables that are local to a target, and the expression is
+ * expanded in a non-local scope. The result is the text of the
+ * expression, unaltered. This is needed to support dynamic sources.
*/
bool dynamic;
const char *extramodifiers;
@@ -4503,11 +4500,7 @@ Var_Parse(const char **pp, GNode *scope,
extramodifiers = NULL; /* extra modifiers to apply first */
dynamic = false;
- /*
- * Appease GCC, which thinks that the variable might not be
- * initialized.
- */
- endc = '\0';
+ endc = '\0'; /* Appease GCC. */
startc = p[1];
if (startc != '(' && startc != '{') {
@@ -4540,7 +4533,9 @@ Var_Parse(const char **pp, GNode *scope,
* XXX: This assignment creates an alias to the current value of the
* variable. This means that as long as the value of the expression
* stays the same, the value of the variable must not change.
- * Using the '::=' modifier, it could be possible to do exactly this.
+ * Using the '::=' modifier, it could be possible to trigger exactly
+ * this situation.
+ *
* At the bottom of this function, the resulting value is compared to
* the then-current value of the variable. This might also invoke
* undefined behavior.
CVS commit: src/external/mpl/bind/lib/libdns
Module Name:src Committed By: rillig Date: Sat May 14 11:43:25 UTC 2022 Modified Files: src/external/mpl/bind/lib/libdns: Makefile Log Message: libdns: suppress a few lint warnings that occur too often To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/lib/libdns/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/mpl/bind/lib/libdns/Makefile diff -u src/external/mpl/bind/lib/libdns/Makefile:1.7 src/external/mpl/bind/lib/libdns/Makefile:1.8 --- src/external/mpl/bind/lib/libdns/Makefile:1.7 Thu Apr 29 17:26:14 2021 +++ src/external/mpl/bind/lib/libdns/Makefile Sat May 14 11:43:25 2022 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2021/04/29 17:26:14 christos Exp $ +# $NetBSD: Makefile,v 1.8 2022/05/14 11:43:25 rillig Exp $ LIB=dns #USE_SHLIBDIR= yes @@ -33,6 +33,16 @@ DNSSEC_SRCS+= gssapi_link.c CWARNFLAGS.clang+= -Wno-error=tautological-constant-compare .endif +# util.h, ISC_REQUIRE +LINTFLAGS+= -X 129 # expression has null effect +# opensslecdsa_link.c, DST_RET does not conform to macro conventions. +LINTFLAGS+= -X 193 # statement not reached +# Most casts are to isc__magic_t and thus look intentional. +LINTFLAGS+= -X 247 # pointer cast from '%s' to '%s' may be troublesome +# 'uint32_tobuffer(token.value.as_ulong' looks obviously wrong but is used in +# a lot of places. +LINTFLAGS+= -X 132 # conversion from '%s' to '%s' may lose accuracy +LINTFLAGS+= -X 298 # conversion from '%s' to '%s' may lose accuracy, arg #%d SRCS= acl.c adb.c badcache.c byaddr.c cache.c callbacks.c catz.c \ clientinfo.c compress.c client.c dyndb.c tsec.c ecdb.c ecs.c \
CVS commit: src/external/mpl/bind/lib/libdns
Module Name:src Committed By: rillig Date: Sat May 14 11:43:25 UTC 2022 Modified Files: src/external/mpl/bind/lib/libdns: Makefile Log Message: libdns: suppress a few lint warnings that occur too often To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/mpl/bind/lib/libdns/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat May 14 11:42:17 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Tickets #1446 - #1449 To generate a diff of this commit: cvs rdiff -u -r1.1.2.90 -r1.1.2.91 src/doc/CHANGES-9.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.3 diff -u src/doc/CHANGES-9.3:1.1.2.90 src/doc/CHANGES-9.3:1.1.2.91 --- src/doc/CHANGES-9.3:1.1.2.90 Fri May 13 11:20:04 2022 +++ src/doc/CHANGES-9.3 Sat May 14 11:42:17 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.3,v 1.1.2.90 2022/05/13 11:20:04 martin Exp $ +# $NetBSD: CHANGES-9.3,v 1.1.2.91 2022/05/14 11:42:17 martin Exp $ A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3 release: @@ -1590,3 +1590,26 @@ sys/dev/pci/ixgbe/ix_txrx.c 1.98 as seen on Xen. [bouyer, ticket #1445] +sys/arch/hppa/hppa/hppa_machdep.c 1.33 + + PR 56830: RAS support is slightly incorrect on hppa. + [skrll, ticket #1446] + +distrib/sets/lists/base/mi 1.1295 +distrib/sets/lists/man/mi 1.1739 +external/mpl/bind/bin/confgen/ddns-confgen/Makefile 1.2 + + Provide tsig-keygen(8). + [brad, ticket #1447] + +sys/arch/hppa/hppa/idle_machdep.c 1.4 +sys/arch/hppa/hppa/machdep.c 1.17 + + Add some special NOPs to help qemu. + [skrll, ticket #1448] + +sbin/bioctl/bioctl.c1.19 + + bioctl(8): Don't print garbage bv_seconds. + [msaitoh, ticket #1449] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sat May 14 11:42:17 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Tickets #1446 - #1449 To generate a diff of this commit: cvs rdiff -u -r1.1.2.90 -r1.1.2.91 src/doc/CHANGES-9.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sbin/bioctl
Module Name:src
Committed By: martin
Date: Sat May 14 11:40:07 UTC 2022
Modified Files:
src/sbin/bioctl [netbsd-9]: bioctl.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1449):
sbin/bioctl/bioctl.c: revision 1.19
bioctl(8): Don't print garbage bv_seconds.
This bug was added in bioctl.c rev. 1.7.
Before:
Volume Status Size Device/LabelLevel Stripe
=
0 Online 5.5T mfi0 RAID 564K 65535 seconds
After:
Volume Status Size Device/LabelLevel Stripe
=
0 Online 5.5T mfi0 RAID 564K
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.2.1 src/sbin/bioctl/bioctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/bioctl/bioctl.c
diff -u src/sbin/bioctl/bioctl.c:1.18 src/sbin/bioctl/bioctl.c:1.18.2.1
--- src/sbin/bioctl/bioctl.c:1.18 Mon Feb 4 04:36:41 2019
+++ src/sbin/bioctl/bioctl.c Sat May 14 11:40:07 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: bioctl.c,v 1.18 2019/02/04 04:36:41 mrg Exp $ */
+/* $NetBSD: bioctl.c,v 1.18.2.1 2022/05/14 11:40:07 martin Exp $ */
/* $OpenBSD: bioctl.c,v 1.52 2007/03/20 15:26:06 jmc Exp $ */
/*
@@ -31,7 +31,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: bioctl.c,v 1.18 2019/02/04 04:36:41 mrg Exp $");
+__RCSID("$NetBSD: bioctl.c,v 1.18.2.1 2022/05/14 11:40:07 martin Exp $");
#endif
#include
@@ -245,7 +245,7 @@ bio_show_volumes(struct biotmp *bt)
bv.bv_cookie = bl.bl_cookie;
bv.bv_volid = bt->volid;
bv.bv_percent = -1;
- bv.bv_seconds = -1;
+ bv.bv_seconds = 0;
if (ioctl(bt->fd, BIOCVOL, ) == -1)
err(EXIT_FAILURE, "BIOCVOL");
CVS commit: [netbsd-9] src/sbin/bioctl
Module Name:src Committed By: martin Date: Sat May 14 11:40:07 UTC 2022 Modified Files: src/sbin/bioctl [netbsd-9]: bioctl.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1449): sbin/bioctl/bioctl.c: revision 1.19 bioctl(8): Don't print garbage bv_seconds. This bug was added in bioctl.c rev. 1.7. Before: Volume Status Size Device/LabelLevel Stripe = 0 Online 5.5T mfi0 RAID 564K 65535 seconds After: Volume Status Size Device/LabelLevel Stripe = 0 Online 5.5T mfi0 RAID 564K To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.18.2.1 src/sbin/bioctl/bioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/hppa/hppa
Module Name:src
Committed By: martin
Date: Sat May 14 11:38:32 UTC 2022
Modified Files:
src/sys/arch/hppa/hppa [netbsd-9]: idle_machdep.c machdep.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1448):
sys/arch/hppa/hppa/idle_machdep.c: revision 1.4
sys/arch/hppa/hppa/machdep.c: revision 1.17
Add some special NOPs to help qemu.
thanks to Helge Deller for the heads-up.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 src/sys/arch/hppa/hppa/idle_machdep.c
cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/arch/hppa/hppa/machdep.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/hppa/hppa/idle_machdep.c
diff -u src/sys/arch/hppa/hppa/idle_machdep.c:1.3 src/sys/arch/hppa/hppa/idle_machdep.c:1.3.4.1
--- src/sys/arch/hppa/hppa/idle_machdep.c:1.3 Mon Apr 15 20:45:08 2019
+++ src/sys/arch/hppa/hppa/idle_machdep.c Sat May 14 11:38:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: idle_machdep.c,v 1.3 2019/04/15 20:45:08 skrll Exp $ */
+/* $NetBSD: idle_machdep.c,v 1.3.4.1 2022/05/14 11:38:31 martin Exp $ */
/*
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: idle_machdep.c,v 1.3 2019/04/15 20:45:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: idle_machdep.c,v 1.3.4.1 2022/05/14 11:38:31 martin Exp $");
#include
#include
@@ -36,5 +36,8 @@ __KERNEL_RCSID(0, "$NetBSD: idle_machdep
void
cpu_idle(void)
{
- /* do nothing */
+/*
+ * This NOP instruction is used by qemu to detect the idle loop.
+ */
+ __asm volatile("or %%r10,%%r10,%%r10" ::: "memory");
}
Index: src/sys/arch/hppa/hppa/machdep.c
diff -u src/sys/arch/hppa/hppa/machdep.c:1.10 src/sys/arch/hppa/hppa/machdep.c:1.10.4.1
--- src/sys/arch/hppa/hppa/machdep.c:1.10 Sat Apr 6 03:06:25 2019
+++ src/sys/arch/hppa/hppa/machdep.c Sat May 14 11:38:31 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.10 2019/04/06 03:06:25 thorpej Exp $ */
+/* $NetBSD: machdep.c,v 1.10.4.1 2022/05/14 11:38:31 martin Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.10 2019/04/06 03:06:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.10.4.1 2022/05/14 11:38:31 martin Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -1459,8 +1459,13 @@ cpu_reboot(int howto, char *user_boot_st
:: "r" (CMD_RESET), "r" (HPPA_LBCAST + iomod_command));
}
- for (;;)
- /* loop while bus reset is coming up */ ;
+ for (;;) {
+ /*
+ * loop while bus reset is coming up. This NOP instruction
+ * is used by qemu to detect the 'death loop'.
+ */
+ __asm volatile("or %%r31, %%r31, %%r31" ::: "memory");
+ }
/* NOTREACHED */
}
CVS commit: [netbsd-9] src/sys/arch/hppa/hppa
Module Name:src Committed By: martin Date: Sat May 14 11:38:32 UTC 2022 Modified Files: src/sys/arch/hppa/hppa [netbsd-9]: idle_machdep.c machdep.c Log Message: Pull up following revision(s) (requested by skrll in ticket #1448): sys/arch/hppa/hppa/idle_machdep.c: revision 1.4 sys/arch/hppa/hppa/machdep.c: revision 1.17 Add some special NOPs to help qemu. thanks to Helge Deller for the heads-up. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.4.1 src/sys/arch/hppa/hppa/idle_machdep.c cvs rdiff -u -r1.10 -r1.10.4.1 src/sys/arch/hppa/hppa/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Sat May 14 11:37:07 UTC 2022
Modified Files:
src/distrib/sets/lists/base [netbsd-9]: mi
src/distrib/sets/lists/man [netbsd-9]: mi
src/external/mpl/bind/bin/confgen/ddns-confgen [netbsd-9]: Makefile
Log Message:
Pull up following revision(s) (requested by brad in ticket #1447):
external/mpl/bind/bin/confgen/ddns-confgen/Makefile: revision 1.2
distrib/sets/lists/man/mi: revision 1.1739
distrib/sets/lists/base/mi: revision 1.1295
Add LINKS and MLINKS to the ddns-confgen Makefile to provide
tsig-keygen. This helps to allow pkgsrc/security/acmesh to function
and should be provided in all BIND >= 9.13 installs anyway.
To generate a diff of this commit:
cvs rdiff -u -r1.1209.2.6 -r1.1209.2.7 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.1649.2.9 -r1.1649.2.10 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.1 -r1.1.6.1 \
src/external/mpl/bind/bin/confgen/ddns-confgen/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1209.2.6 src/distrib/sets/lists/base/mi:1.1209.2.7
--- src/distrib/sets/lists/base/mi:1.1209.2.6 Sun Oct 11 11:26:24 2020
+++ src/distrib/sets/lists/base/mi Sat May 14 11:37:07 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1209.2.6 2020/10/11 11:26:24 martin Exp $
+# $NetBSD: mi,v 1.1209.2.7 2022/05/14 11:37:07 martin Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -2029,6 +2029,7 @@
./usr/sbin/traceroute6base-netutil-bin use_inet6
./usr/sbin/trpt base-netutil-bin
./usr/sbin/trsp base-obsolete obsolete
+./usr/sbin/tsig-keygenbase-bind-bin
./usr/sbin/unboundbase-netutil-bin unbound
./usr/sbin/unbound-anchor base-netutil-bin unbound
./usr/sbin/unbound-checkconf base-netutil-bin unbound
Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1649.2.9 src/distrib/sets/lists/man/mi:1.1649.2.10
--- src/distrib/sets/lists/man/mi:1.1649.2.9 Tue Aug 3 16:10:24 2021
+++ src/distrib/sets/lists/man/mi Sat May 14 11:37:06 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1649.2.9 2021/08/03 16:10:24 snj Exp $
+# $NetBSD: mi,v 1.1649.2.10 2022/05/14 11:37:06 martin Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -3181,6 +3181,7 @@
./usr/share/man/cat8/trivial-rewrite.0 man-postfix-catman postfix,.cat
./usr/share/man/cat8/trpt.0 man-netutil-catman .cat
./usr/share/man/cat8/trsp.0 man-obsolete obsolete
+./usr/share/man/cat8/tsig-keygen.0 man-bind-catman .cat
./usr/share/man/cat8/ttyflags.0 man-sysutil-catman .cat
./usr/share/man/cat8/tunefs.0 man-sysutil-catman .cat
./usr/share/man/cat8/umbctl.0 man-netutil-catman .cat
@@ -6071,6 +6072,7 @@
./usr/share/man/html8/traceroute6.html man-netutil-htmlman use_inet6,html
./usr/share/man/html8/trivial-rewrite.html man-postfix-htmlman postfix,html
./usr/share/man/html8/trpt.html man-netutil-htmlman html
+./usr/share/man/html8/tsig-keygen.html man-bind-htmlman html
./usr/share/man/html8/ttyflags.html man-sysutil-htmlman html
./usr/share/man/html8/tunefs.html man-sysutil-htmlman html
./usr/share/man/html8/umbctl.html man-netutil-htmlman html
@@ -9308,6 +9310,7 @@
./usr/share/man/man8/trivial-rewrite.8 man-postfix-man postfix,.man
./usr/share/man/man8/trpt.8 man-netutil-man .man
./usr/share/man/man8/trsp.8 man-obsolete obsolete
+./usr/share/man/man8/tsig-keygen.8 man-bind-man .man
./usr/share/man/man8/ttyflags.8 man-sysutil-man .man
./usr/share/man/man8/tunefs.8 man-sysutil-man .man
./usr/share/man/man8/umbctl.8 man-netutil-man .man
Index: src/external/mpl/bind/bin/confgen/ddns-confgen/Makefile
diff -u src/external/mpl/bind/bin/confgen/ddns-confgen/Makefile:1.1 src/external/mpl/bind/bin/confgen/ddns-confgen/Makefile:1.1.6.1
--- src/external/mpl/bind/bin/confgen/ddns-confgen/Makefile:1.1 Sun Aug 12 13:02:24 2018
+++ src/external/mpl/bind/bin/confgen/ddns-confgen/Makefile Sat May 14 11:37:06 2022
@@ -1,5 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2018/08/12 13:02:24 christos Exp $
+# $NetBSD: Makefile,v 1.1.6.1 2022/05/14 11:37:06 martin Exp $
.include "${.PARSEDIR}/../Makefile.inc"
+LINKS= ${BINDIR}/ddns-confgen ${BINDIR}/tsig-keygen
+MLINKS= ddns-confgen.8 tsig-keygen.8
+
.include
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sat May 14 11:37:07 UTC 2022 Modified Files: src/distrib/sets/lists/base [netbsd-9]: mi src/distrib/sets/lists/man [netbsd-9]: mi src/external/mpl/bind/bin/confgen/ddns-confgen [netbsd-9]: Makefile Log Message: Pull up following revision(s) (requested by brad in ticket #1447): external/mpl/bind/bin/confgen/ddns-confgen/Makefile: revision 1.2 distrib/sets/lists/man/mi: revision 1.1739 distrib/sets/lists/base/mi: revision 1.1295 Add LINKS and MLINKS to the ddns-confgen Makefile to provide tsig-keygen. This helps to allow pkgsrc/security/acmesh to function and should be provided in all BIND >= 9.13 installs anyway. To generate a diff of this commit: cvs rdiff -u -r1.1209.2.6 -r1.1209.2.7 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1649.2.9 -r1.1649.2.10 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.1 -r1.1.6.1 \ src/external/mpl/bind/bin/confgen/ddns-confgen/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/hppa/hppa
Module Name:src
Committed By: martin
Date: Sat May 14 11:32:43 UTC 2022
Modified Files:
src/sys/arch/hppa/hppa [netbsd-9]: hppa_machdep.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #1446):
sys/arch/hppa/hppa/hppa_machdep.c: revision 1.33
port-hppa/56830: RAS support is slightly incorrect on hppa
When searching for RAS use tf_iioq_head without the HPPA_PC_PRIV_MASK bits
set.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.29.34.1 src/sys/arch/hppa/hppa/hppa_machdep.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/hppa/hppa/hppa_machdep.c
diff -u src/sys/arch/hppa/hppa/hppa_machdep.c:1.29 src/sys/arch/hppa/hppa/hppa_machdep.c:1.29.34.1
--- src/sys/arch/hppa/hppa/hppa_machdep.c:1.29 Mon Feb 24 07:23:43 2014
+++ src/sys/arch/hppa/hppa/hppa_machdep.c Sat May 14 11:32:43 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: hppa_machdep.c,v 1.29 2014/02/24 07:23:43 skrll Exp $ */
+/* $NetBSD: hppa_machdep.c,v 1.29.34.1 2022/05/14 11:32:43 martin Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: hppa_machdep.c,v 1.29 2014/02/24 07:23:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hppa_machdep.c,v 1.29.34.1 2022/05/14 11:32:43 martin Exp $");
#include
#include
@@ -279,7 +279,9 @@ hppa_ras(struct lwp *l)
p = l->l_proc;
tf = l->l_md.md_regs;
- rasaddr = (intptr_t)ras_lookup(p, (void *)tf->tf_iioq_head);
+
+ rasaddr = (intptr_t)ras_lookup(p,
+ (void *)(tf->tf_iioq_head & ~HPPA_PC_PRIV_MASK));
if (rasaddr != -1) {
rasaddr |= HPPA_PC_PRIV_USER;
tf->tf_iioq_head = rasaddr;
CVS commit: [netbsd-9] src/sys/arch/hppa/hppa
Module Name:src Committed By: martin Date: Sat May 14 11:32:43 UTC 2022 Modified Files: src/sys/arch/hppa/hppa [netbsd-9]: hppa_machdep.c Log Message: Pull up following revision(s) (requested by skrll in ticket #1446): sys/arch/hppa/hppa/hppa_machdep.c: revision 1.33 port-hppa/56830: RAS support is slightly incorrect on hppa When searching for RAS use tf_iioq_head without the HPPA_PC_PRIV_MASK bits set. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.29.34.1 src/sys/arch/hppa/hppa/hppa_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/libxcb/libxcb
Module Name:src
Committed By: rillig
Date: Sat May 14 11:26:23 UTC 2022
Modified Files:
src/external/mit/xorg/lib/libxcb/libxcb: Makefile
Log Message:
libxcb: suppress lint warnings that are not useful
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libxcb/libxcb/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/libxcb/libxcb/Makefile
diff -u src/external/mit/xorg/lib/libxcb/libxcb/Makefile:1.10 src/external/mit/xorg/lib/libxcb/libxcb/Makefile:1.11
--- src/external/mit/xorg/lib/libxcb/libxcb/Makefile:1.10 Thu Jun 7 18:16:55 2018
+++ src/external/mit/xorg/lib/libxcb/libxcb/Makefile Sat May 14 11:26:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2018/06/07 18:16:55 rjs Exp $
+# $NetBSD: Makefile,v 1.11 2022/05/14 11:26:23 rillig Exp $
.include
@@ -29,6 +29,14 @@ CPPFLAGS+= -I${X11SRCDIR.${LIB}}/../incl
#CPPFLAGS+= -I${.CURDIR}/../files
CPPFLAGS+= -I${DESTDIR}${X11INCDIR}/xcb
+# Mostly autogenerated code, the casts are used in pointer arithmetics as well
+# as for iovec.
+LINTFLAGS+= -X 132 # conversion from '%s' to '%s' may lose accuracy
+LINTFLAGS+= -X 135 # converting '%s' to '%s' may cause alignment problem
+LINTFLAGS+= -X 247 # pointer cast from '%s' to '%s' may be troublesome
+LINTFLAGS+= -X 275 # cast discards 'const' from type '%s'
+LINTFLAGS+= -X 298 # conversion from '%s' to '%s' may lose accuracy, arg #%d
+
LIBDPLIBS=\
Xau ${.CURDIR}/../../libXau \
Xdmcp ${.CURDIR}/../../libXdmcp
CVS commit: src/external/mit/xorg/lib/libxcb/libxcb
Module Name:src Committed By: rillig Date: Sat May 14 11:26:23 UTC 2022 Modified Files: src/external/mit/xorg/lib/libxcb/libxcb: Makefile Log Message: libxcb: suppress lint warnings that are not useful To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/external/mit/xorg/lib/libxcb/libxcb/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/lgpl3/mpc/lib/libmpc
Module Name:src Committed By: rillig Date: Sat May 14 11:12:31 UTC 2022 Modified Files: src/external/lgpl3/mpc/lib/libmpc: Makefile Log Message: libmpc: suppress wrong lint warnings To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/mpc/lib/libmpc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/lgpl3/mpc/lib/libmpc
Module Name:src
Committed By: rillig
Date: Sat May 14 11:12:31 UTC 2022
Modified Files:
src/external/lgpl3/mpc/lib/libmpc: Makefile
Log Message:
libmpc: suppress wrong lint warnings
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/lgpl3/mpc/lib/libmpc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/lgpl3/mpc/lib/libmpc/Makefile
diff -u src/external/lgpl3/mpc/lib/libmpc/Makefile:1.5 src/external/lgpl3/mpc/lib/libmpc/Makefile:1.6
--- src/external/lgpl3/mpc/lib/libmpc/Makefile:1.5 Sat Sep 26 07:57:56 2020
+++ src/external/lgpl3/mpc/lib/libmpc/Makefile Sat May 14 11:12:31 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2020/09/26 07:57:56 mrg Exp $
+# $NetBSD: Makefile,v 1.6 2022/05/14 11:12:31 rillig Exp $
.include
@@ -106,6 +106,12 @@ CPPFLAGS+= -I${.CURDIR}
CPPFLAGS+= -I${NETBSDSRCDIR}/external/lgpl3/gmp/lib/libgmp/arch/${GMP_MACHINE_ARCH}
CPPFLAGS+= -I${NETBSDSRCDIR}/external/lgpl3/mpfr/dist/src
+# mostly mpfr.h, MPFR_VALUE_OF
+LINTFLAGS+= -X 161 # constant in conditional context
+# mostly mpc.h, MPC_RND_IM;
+# mpc_rnd_t is declared as int even though only 8 bits are actually used
+LINTFLAGS+= -X 117 # bitwise '>>' on signed value possibly nonportable
+
.include
.PATH: ${.CURDIR}/../../dist/src
CVS commit: src/sys/arch
Module Name:src
Committed By: hgutch
Date: Sat May 14 07:11:23 UTC 2022
Modified Files:
src/sys/arch/sparc/stand/ofwboot: Locore.c
src/sys/arch/sparc64/sparc64: ofw_machdep.c
Log Message:
PR 56829: Fix "map" call to Open Firmware and no longer mess up OFW stack.
This unbreaks miniroot.fs.
Thanks to Björn Johannesson for originally pointing this out and to
mrg@ for pointing out the actual issue and suggesting a fix.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc/stand/ofwboot/Locore.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/sparc64/sparc64/ofw_machdep.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/sparc/stand/ofwboot/Locore.c
diff -u src/sys/arch/sparc/stand/ofwboot/Locore.c:1.16 src/sys/arch/sparc/stand/ofwboot/Locore.c:1.17
--- src/sys/arch/sparc/stand/ofwboot/Locore.c:1.16 Fri Sep 15 13:25:34 2017
+++ src/sys/arch/sparc/stand/ofwboot/Locore.c Sat May 14 07:11:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: Locore.c,v 1.16 2017/09/15 13:25:34 martin Exp $ */
+/* $NetBSD: Locore.c,v 1.17 2022/05/14 07:11:23 hgutch Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -664,8 +664,6 @@ OF_map_phys(paddr_t paddr, off_t size, v
cell_t vaddr;
cell_t paddr_hi;
cell_t paddr_lo;
- cell_t status;
- cell_t retaddr;
} args;
#ifdef __notyet
@@ -676,7 +674,7 @@ OF_map_phys(paddr_t paddr, off_t size, v
#endif
args.name = ADR2CELL("call-method");
args.nargs = 7;
- args.nreturns = 1;
+ args.nreturns = 0;
args.method = ADR2CELL("map");
args.ihandle = HDL2CELL(mmuh);
args.mode = mode;
@@ -687,9 +685,7 @@ OF_map_phys(paddr_t paddr, off_t size, v
if (openfirmware() == -1)
return -1;
- if (args.status)
- return -1;
- return (vaddr_t)args.retaddr;
+ return 0;
}
Index: src/sys/arch/sparc64/sparc64/ofw_machdep.c
diff -u src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.50 src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.51
--- src/sys/arch/sparc64/sparc64/ofw_machdep.c:1.50 Thu Mar 17 08:08:03 2022
+++ src/sys/arch/sparc64/sparc64/ofw_machdep.c Sat May 14 07:11:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_machdep.c,v 1.50 2022/03/17 08:08:03 andvar Exp $ */
+/* $NetBSD: ofw_machdep.c,v 1.51 2022/05/14 07:11:23 hgutch Exp $ */
/*
* Copyright (C) 1996 Wolfgang Solfrank.
@@ -34,7 +34,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.50 2022/03/17 08:08:03 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_machdep.c,v 1.51 2022/05/14 07:11:23 hgutch Exp $");
#include
#include
@@ -339,8 +339,6 @@ prom_map_phys(paddr_t paddr, off_t size,
cell_t vaddr;
cell_t phys_hi;
cell_t phys_lo;
- cell_t status;
- cell_t retaddr;
} args;
if (mmuh == -1 && ((mmuh = get_mmu_handle()) == -1)) {
@@ -349,7 +347,7 @@ prom_map_phys(paddr_t paddr, off_t size,
}
args.name = ADR2CELL(&"call-method");
args.nargs = 7;
- args.nreturns = 1;
+ args.nreturns = 0;
args.method = ADR2CELL(&"map");
args.ihandle = HDL2CELL(mmuh);
args.mode = mode;
@@ -360,9 +358,7 @@ prom_map_phys(paddr_t paddr, off_t size,
if (openfirmware() == -1)
return -1;
- if (args.status)
- return -1;
- return (int)args.retaddr;
+ return 0;
}
CVS commit: src/sys/arch
Module Name:src Committed By: hgutch Date: Sat May 14 07:11:23 UTC 2022 Modified Files: src/sys/arch/sparc/stand/ofwboot: Locore.c src/sys/arch/sparc64/sparc64: ofw_machdep.c Log Message: PR 56829: Fix "map" call to Open Firmware and no longer mess up OFW stack. This unbreaks miniroot.fs. Thanks to Björn Johannesson for originally pointing this out and to mrg@ for pointing out the actual issue and suggesting a fix. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/sparc/stand/ofwboot/Locore.c cvs rdiff -u -r1.50 -r1.51 src/sys/arch/sparc64/sparc64/ofw_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/hppa/hppa
Module Name:src
Committed By: skrll
Date: Sat May 14 06:07:53 UTC 2022
Modified Files:
src/sys/arch/hppa/hppa: idle_machdep.c machdep.c
Log Message:
Add some special NOPs to help qemu.
thanks to Helge Deller for the heads-up.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/hppa/idle_machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hppa/hppa/machdep.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/hppa/hppa/idle_machdep.c
diff -u src/sys/arch/hppa/hppa/idle_machdep.c:1.3 src/sys/arch/hppa/hppa/idle_machdep.c:1.4
--- src/sys/arch/hppa/hppa/idle_machdep.c:1.3 Mon Apr 15 20:45:08 2019
+++ src/sys/arch/hppa/hppa/idle_machdep.c Sat May 14 06:07:53 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: idle_machdep.c,v 1.3 2019/04/15 20:45:08 skrll Exp $ */
+/* $NetBSD: idle_machdep.c,v 1.4 2022/05/14 06:07:53 skrll Exp $ */
/*
* Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: idle_machdep.c,v 1.3 2019/04/15 20:45:08 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: idle_machdep.c,v 1.4 2022/05/14 06:07:53 skrll Exp $");
#include
#include
@@ -36,5 +36,8 @@ __KERNEL_RCSID(0, "$NetBSD: idle_machdep
void
cpu_idle(void)
{
- /* do nothing */
+/*
+ * This NOP instruction is used by qemu to detect the idle loop.
+ */
+ __asm volatile("or %%r10,%%r10,%%r10" ::: "memory");
}
Index: src/sys/arch/hppa/hppa/machdep.c
diff -u src/sys/arch/hppa/hppa/machdep.c:1.16 src/sys/arch/hppa/hppa/machdep.c:1.17
--- src/sys/arch/hppa/hppa/machdep.c:1.16 Mon Sep 14 16:11:32 2020
+++ src/sys/arch/hppa/hppa/machdep.c Sat May 14 06:07:53 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.16 2020/09/14 16:11:32 skrll Exp $ */
+/* $NetBSD: machdep.c,v 1.17 2022/05/14 06:07:53 skrll Exp $ */
/*-
* Copyright (c) 2001, 2002 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.16 2020/09/14 16:11:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.17 2022/05/14 06:07:53 skrll Exp $");
#include "opt_cputype.h"
#include "opt_ddb.h"
@@ -1447,8 +1447,13 @@ cpu_reboot(int howto, char *user_boot_st
:: "r" (CMD_RESET), "r" (HPPA_LBCAST + iomod_command));
}
- for (;;)
- /* loop while bus reset is coming up */ ;
+ for (;;) {
+ /*
+ * loop while bus reset is coming up. This NOP instruction
+ * is used by qemu to detect the 'death loop'.
+ */
+ __asm volatile("or %%r31, %%r31, %%r31" ::: "memory");
+ }
/* NOTREACHED */
}
CVS commit: src/sys/arch/hppa/hppa
Module Name:src Committed By: skrll Date: Sat May 14 06:07:53 UTC 2022 Modified Files: src/sys/arch/hppa/hppa: idle_machdep.c machdep.c Log Message: Add some special NOPs to help qemu. thanks to Helge Deller for the heads-up. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/hppa/hppa/idle_machdep.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/hppa/hppa/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
