CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Fri Jul 21 05:51:12 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: msg_181.c
Log Message:
tests/lint: document an example of a non-constant initializer
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_181.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/usr.bin/xlint/lint1/msg_181.c
diff -u src/tests/usr.bin/xlint/lint1/msg_181.c:1.5 src/tests/usr.bin/xlint/lint1/msg_181.c:1.6
--- src/tests/usr.bin/xlint/lint1/msg_181.c:1.5 Tue Mar 28 14:44:35 2023
+++ src/tests/usr.bin/xlint/lint1/msg_181.c Fri Jul 21 05:51:12 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_181.c,v 1.5 2023/03/28 14:44:35 rillig Exp $ */
+/* $NetBSD: msg_181.c,v 1.6 2023/07/21 05:51:12 rillig Exp $ */
# 3 "msg_181.c"
// Test for message: {}-enclosed initializer required [181]
@@ -8,3 +8,16 @@
/* expect+1: error: {}-enclosed initializer required [181] */
struct { int x; } missing_braces = 3;
struct { int x; } including_braces = { 3 };
+
+
+// C11 6.6p7 requires the initializer of an object with static storage duration
+// to be a constant expression or an address constant, and a compound literal
+// is neither. C11 6.6p10 allows an implementation to accept "other forms of
+// constant expressions", and GCC accepts compound literals that contain only
+// constant expressions.
+struct number {
+ int value;
+} num = (struct number){
+.value = 3,
+};
+/* expect-1: error: {}-enclosed initializer required [181] */
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Fri Jul 21 05:51:12 UTC 2023 Modified Files: src/tests/usr.bin/xlint/lint1: msg_181.c Log Message: tests/lint: document an example of a non-constant initializer To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/msg_181.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: nat Date: Fri Jul 21 02:42:54 UTC 2023 Modified Files: src/doc: CHANGES Log Message: Add missing dot. To generate a diff of this commit: cvs rdiff -u -r1.2982 -r1.2983 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2982 src/doc/CHANGES:1.2983 --- src/doc/CHANGES:1.2982 Fri Jul 21 02:16:20 2023 +++ src/doc/CHANGES Fri Jul 21 02:42:54 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2982 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2983 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -162,4 +162,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0: openpam(3): update to 20230627 (ximenia) [christos 20230630] gcc(1): Import GCC 10.5. [mrg 20230710] dhcpcd: Import version 10.0.2. [roy 20230719] - bta2dpd(8): Add throttle when playing from file [nat 20230720] + bta2dpd(8): Add throttle when playing from file. [nat 20230720]
CVS commit: src/doc
Module Name:src Committed By: nat Date: Fri Jul 21 02:42:54 UTC 2023 Modified Files: src/doc: CHANGES Log Message: Add missing dot. To generate a diff of this commit: cvs rdiff -u -r1.2982 -r1.2983 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: nat Date: Fri Jul 21 02:16:20 UTC 2023 Modified Files: src/doc: CHANGES Log Message: Mention changes to bta2dpd(8). To generate a diff of this commit: cvs rdiff -u -r1.2981 -r1.2982 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: nat Date: Fri Jul 21 02:16:20 UTC 2023 Modified Files: src/doc: CHANGES Log Message: Mention changes to bta2dpd(8). To generate a diff of this commit: cvs rdiff -u -r1.2981 -r1.2982 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2981 src/doc/CHANGES:1.2982 --- src/doc/CHANGES:1.2981 Wed Jul 19 13:59:01 2023 +++ src/doc/CHANGES Fri Jul 21 02:16:20 2023 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2981 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2982 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -162,3 +162,4 @@ Changes from NetBSD 10.0 to NetBSD 11.0: openpam(3): update to 20230627 (ximenia) [christos 20230630] gcc(1): Import GCC 10.5. [mrg 20230710] dhcpcd: Import version 10.0.2. [roy 20230719] + bta2dpd(8): Add throttle when playing from file [nat 20230720]
CVS commit: src/usr.sbin/bta2dpd/bta2dpd
Module Name:src Committed By: nat Date: Fri Jul 21 02:11:18 UTC 2023 Modified Files: src/usr.sbin/bta2dpd/bta2dpd: sbc_encode.c Log Message: Reorder for readability. No functional change intended. XXX pullup-10. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.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.sbin/bta2dpd/bta2dpd/sbc_encode.c diff -u src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c:1.12 src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c:1.13 --- src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c:1.12 Thu Jul 20 12:33:27 2023 +++ src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c Fri Jul 21 02:11:18 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: sbc_encode.c,v 1.12 2023/07/20 12:33:27 nat Exp $ */ +/* $NetBSD: sbc_encode.c,v 1.13 2023/07/21 02:11:18 nat Exp $ */ /*- * Copyright (c) 2015 - 2016 Nathanial Sloss @@ -952,8 +952,6 @@ stream(int in, int outfd, uint8_t mode, memcpy(whole + offset, frameData, (size_t)next_pkt); free(frameData); - tries = 1; - /* Wait if necessary to avoid rapid playback. */ gettimeofday(, NULL); timeNow = myTime.tv_sec * 100 + myTime.tv_usec; @@ -967,6 +965,7 @@ stream(int in, int outfd, uint8_t mode, } prevTime = timeNow; + tries = 1; send_again: len = write(outfd, whole, totalSize);
CVS commit: src/usr.sbin/bta2dpd/bta2dpd
Module Name:src Committed By: nat Date: Fri Jul 21 02:11:18 UTC 2023 Modified Files: src/usr.sbin/bta2dpd/bta2dpd: sbc_encode.c Log Message: Reorder for readability. No functional change intended. XXX pullup-10. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.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/i386/conf
Module Name:src Committed By: riastradh Date: Fri Jul 21 02:10:37 UTC 2023 Modified Files: src/sys/arch/i386/conf: XEN3PAE_DOMU Log Message: i386/XEN3PAE_DOMU: Enable KDTRACE_HOOKS. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/conf/XEN3PAE_DOMU 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/i386/conf/XEN3PAE_DOMU diff -u src/sys/arch/i386/conf/XEN3PAE_DOMU:1.19 src/sys/arch/i386/conf/XEN3PAE_DOMU:1.20 --- src/sys/arch/i386/conf/XEN3PAE_DOMU:1.19 Thu Feb 9 14:09:48 2023 +++ src/sys/arch/i386/conf/XEN3PAE_DOMU Fri Jul 21 02:10:37 2023 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3PAE_DOMU,v 1.19 2023/02/09 14:09:48 abs Exp $ +# $NetBSD: XEN3PAE_DOMU,v 1.20 2023/07/21 02:10:37 riastradh Exp $ include "arch/i386/conf/std.xen" @@ -60,6 +60,7 @@ options DDB_HISTORY_SIZE=512 # enable h #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600 #makeoptions DEBUG="-g" # compile full symbol table options DDB_COMMANDONENTER="trace;show registers" +options KDTRACE_HOOKS # kernel DTrace hooks # Compatibility options include "conf/compat_netbsd09.config"
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riastradh Date: Fri Jul 21 02:10:37 UTC 2023 Modified Files: src/sys/arch/i386/conf: XEN3PAE_DOMU Log Message: i386/XEN3PAE_DOMU: Enable KDTRACE_HOOKS. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/i386/conf/XEN3PAE_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riastradh Date: Fri Jul 21 02:08:45 UTC 2023 Modified Files: src/sys/arch/i386/conf: XEN3PAE_DOM0 Log Message: i386/XEN3PAE_DOM0: Enable KDTRACE_HOOKS. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/conf/XEN3PAE_DOM0 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/i386/conf/XEN3PAE_DOM0 diff -u src/sys/arch/i386/conf/XEN3PAE_DOM0:1.37 src/sys/arch/i386/conf/XEN3PAE_DOM0:1.38 --- src/sys/arch/i386/conf/XEN3PAE_DOM0:1.37 Thu Feb 9 14:09:48 2023 +++ src/sys/arch/i386/conf/XEN3PAE_DOM0 Fri Jul 21 02:08:45 2023 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3PAE_DOM0,v 1.37 2023/02/09 14:09:48 abs Exp $ +# $NetBSD: XEN3PAE_DOM0,v 1.38 2023/07/21 02:08:45 riastradh Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -76,6 +76,7 @@ options DDB_HISTORY_SIZE=512 # enable h #options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600 #makeoptions DEBUG="-g" # compile full symbol table options DDB_COMMANDONENTER="show registers" +options KDTRACE_HOOKS # kernel DTrace hooks # Compatibility options include "conf/compat_netbsd09.config"
CVS commit: src/sys/arch/i386/conf
Module Name:src Committed By: riastradh Date: Fri Jul 21 02:08:45 UTC 2023 Modified Files: src/sys/arch/i386/conf: XEN3PAE_DOM0 Log Message: i386/XEN3PAE_DOM0: Enable KDTRACE_HOOKS. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/i386/conf/XEN3PAE_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: riastradh Date: Fri Jul 21 02:04:52 UTC 2023 Modified Files: src/sys/arch/amd64/conf: XEN3_DOMU Log Message: amd64/XEN3_DOMU: Enable KDTRACE_HOOKS. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/arch/amd64/conf/XEN3_DOMU 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/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.100 src/sys/arch/amd64/conf/XEN3_DOMU:1.101 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.100 Thu Feb 9 14:09:48 2023 +++ src/sys/arch/amd64/conf/XEN3_DOMU Fri Jul 21 02:04:52 2023 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.100 2023/02/09 14:09:48 abs Exp $ +# $NetBSD: XEN3_DOMU,v 1.101 2023/07/21 02:04:52 riastradh Exp $ include "arch/amd64/conf/std.xen" @@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOMU-$Revision: 1.100 $" +#ident "XEN3_DOMU-$Revision: 1.101 $" maxusers 32 # estimated number of users @@ -54,6 +54,7 @@ options DDB_HISTORY_SIZE=512 # enable h #makeoptions DEBUG="-g" # compile full symbol table makeoptions COPTS="-O2 -fno-omit-frame-pointer" options DDB_COMMANDONENTER="trace;show registers" +options KDTRACE_HOOKS # kernel DTrace hooks # Compatibility options include "conf/compat_netbsd15.config"
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: riastradh Date: Fri Jul 21 02:04:52 UTC 2023 Modified Files: src/sys/arch/amd64/conf: XEN3_DOMU Log Message: amd64/XEN3_DOMU: Enable KDTRACE_HOOKS. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/arch/amd64/conf/XEN3_DOMU Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netipsec
Module Name:src
Committed By: knakahara
Date: Fri Jul 21 00:44:38 UTC 2023
Modified Files:
src/sys/netipsec: key.c
Log Message:
Use kmem_free instead of kmem_intr_free, as key_freesaval() is not called in
softint after key.c:r1.223.
E.g. key_freesaval() was called the following call path before SAD MP-ify.
esp_input_cb()
KEY_FREESAV()
key_freesav()
key_delsav()
key_freesaval()
ok'ed by ozaki-r@n.o.
To generate a diff of this commit:
cvs rdiff -u -r1.280 -r1.281 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.280 src/sys/netipsec/key.c:1.281
--- src/sys/netipsec/key.c:1.280 Thu Dec 8 08:07:07 2022
+++ src/sys/netipsec/key.c Fri Jul 21 00:44:38 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.280 2022/12/08 08:07:07 knakahara Exp $ */
+/* $NetBSD: key.c,v 1.281 2023/07/21 00:44:38 knakahara Exp $ */
/* $FreeBSD: key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.280 2022/12/08 08:07:07 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.281 2023/07/21 00:44:38 knakahara Exp $");
/*
* This code is referred to RFC 2367
@@ -3589,21 +3589,21 @@ key_freesaval(struct secasvar *sav)
key_sa_refcnt(sav));
if (sav->replay != NULL)
- kmem_intr_free(sav->replay, sav->replay_len);
+ kmem_free(sav->replay, sav->replay_len);
if (sav->key_auth != NULL)
- kmem_intr_free(sav->key_auth, sav->key_auth_len);
+ kmem_free(sav->key_auth, sav->key_auth_len);
if (sav->key_enc != NULL)
- kmem_intr_free(sav->key_enc, sav->key_enc_len);
+ kmem_free(sav->key_enc, sav->key_enc_len);
if (sav->lft_c_counters_percpu != NULL) {
percpu_free(sav->lft_c_counters_percpu,
sizeof(lifetime_counters_t));
}
if (sav->lft_c != NULL)
- kmem_intr_free(sav->lft_c, sizeof(*(sav->lft_c)));
+ kmem_free(sav->lft_c, sizeof(*(sav->lft_c)));
if (sav->lft_h != NULL)
- kmem_intr_free(sav->lft_h, sizeof(*(sav->lft_h)));
+ kmem_free(sav->lft_h, sizeof(*(sav->lft_h)));
if (sav->lft_s != NULL)
- kmem_intr_free(sav->lft_s, sizeof(*(sav->lft_s)));
+ kmem_free(sav->lft_s, sizeof(*(sav->lft_s)));
}
/*
CVS commit: src/sys/netipsec
Module Name:src Committed By: knakahara Date: Fri Jul 21 00:44:38 UTC 2023 Modified Files: src/sys/netipsec: key.c Log Message: Use kmem_free instead of kmem_intr_free, as key_freesaval() is not called in softint after key.c:r1.223. E.g. key_freesaval() was called the following call path before SAD MP-ify. esp_input_cb() KEY_FREESAV() key_freesav() key_delsav() key_freesaval() ok'ed by ozaki-r@n.o. To generate a diff of this commit: cvs rdiff -u -r1.280 -r1.281 src/sys/netipsec/key.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/mips/cavium/dev
Module Name:src
Committed By: gutteridge
Date: Thu Jul 20 23:31:28 UTC 2023
Modified Files:
src/sys/arch/mips/cavium/dev: octeon_gmx.c
Log Message:
octeon_gmx.c: fix spelling in (default disabled) error messages
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mips/cavium/dev/octeon_gmx.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/mips/cavium/dev/octeon_gmx.c
diff -u src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.22 src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.23
--- src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.22 Fri Jun 3 12:10:50 2022
+++ src/sys/arch/mips/cavium/dev/octeon_gmx.c Thu Jul 20 23:31:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_gmx.c,v 1.22 2022/06/03 12:10:50 andvar Exp $ */
+/* $NetBSD: octeon_gmx.c,v 1.23 2023/07/20 23:31:27 gutteridge Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.22 2022/06/03 12:10:50 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.23 2023/07/20 23:31:27 gutteridge Exp $");
#include
#include
@@ -585,10 +585,10 @@ octgmx_set_filter(struct octgmx_port_sof
SET(ctl, RXN_ADR_CTL_BCST);
}
if (ISSET(ifp->if_flags, IFF_PROMISC)) {
- dprintf("promiscas(reject cam)\n");
+ dprintf("promiscuous (reject cam)\n");
CLR(ctl, RXN_ADR_CTL_CAM_MODE);
} else {
- dprintf("not promiscas(accept cam)\n");
+ dprintf("not promiscuous (accept cam)\n");
SET(ctl, RXN_ADR_CTL_CAM_MODE);
}
CVS commit: src/sys/arch/mips/cavium/dev
Module Name:src Committed By: gutteridge Date: Thu Jul 20 23:31:28 UTC 2023 Modified Files: src/sys/arch/mips/cavium/dev: octeon_gmx.c Log Message: octeon_gmx.c: fix spelling in (default disabled) error messages To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mips/cavium/dev/octeon_gmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: gutteridge Date: Thu Jul 20 23:28:44 UTC 2023 Modified Files: src/lib/libc/sys: socket.2 Log Message: socket.2: simplify and improve some phrasing To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/lib/libc/sys/socket.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/socket.2 diff -u src/lib/libc/sys/socket.2:1.49 src/lib/libc/sys/socket.2:1.50 --- src/lib/libc/sys/socket.2:1.49 Thu Jun 8 00:27:34 2023 +++ src/lib/libc/sys/socket.2 Thu Jul 20 23:28:44 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: socket.2,v 1.49 2023/06/08 00:27:34 uwe Exp $ +.\" $NetBSD: socket.2,v 1.50 2023/07/20 23:28:44 gutteridge Exp $ .\" .\" Copyright (c) 1983, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -89,9 +89,8 @@ system call. Not implemented. .El .Pp -The following flags can be or'ed to the type to condition the returned -file descriptor: -The following flags are valid: +The following flags can be or'ed to the socket type to add conditions to +the returned file descriptor: .Pp .Bl -tag -offset indent -width Dv .It Dv SOCK_CLOEXEC
CVS commit: src/lib/libc/sys
Module Name:src Committed By: gutteridge Date: Thu Jul 20 23:28:44 UTC 2023 Modified Files: src/lib/libc/sys: socket.2 Log Message: socket.2: simplify and improve some phrasing To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/lib/libc/sys/socket.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src
Committed By: riastradh
Date: Thu Jul 20 21:48:49 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs:
amdgpu_dcn_calcs.c
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20:
amdgpu_dcn20_resource.c
Log Message:
amdgpu: Mark float-dependent variables volatile.
This way they are computed -- using FP instructions -- before
DC_FP_END, after which point FP instructions will trap or behave
unpredictably.
This is a workaround, not a proper solution -- really, the
DC_FP_START/END calls should happen in a separate compilation unit
built without -mhard-float or whatever, but that's a lot more work to
make happen for now.
PR kern/57059
XXX pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c
cvs rdiff -u -r1.4 -r1.5 \
src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.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/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c:1.3 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c:1.4
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c:1.3 Sun Dec 19 11:35:07 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c Thu Jul 20 21:48:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn_calcs.c,v 1.3 2021/12/19 11:35:07 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn_calcs.c,v 1.4 2023/07/20 21:48:49 riastradh Exp $ */
/*
* Copyright 2017 Advanced Micro Devices, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn_calcs.c,v 1.3 2021/12/19 11:35:07 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn_calcs.c,v 1.4 2023/07/20 21:48:49 riastradh Exp $");
#include "dm_services.h"
#include "dc.h"
@@ -626,7 +626,7 @@ static void calc_wm_sets_and_perf_params
static bool dcn_bw_apply_registry_override(struct dc *dc)
{
- bool updated = false;
+ volatile bool updated = false;
DC_FP_START();
if ((int)(dc->dcn_soc->sr_exit_time * 1000) != dc->debug.sr_exit_time_ns
@@ -733,7 +733,7 @@ bool dcn_validate_bandwidth(
struct dcn_bw_internal_vars *v = >dcn_bw_vars;
int i, input_idx, k;
int vesa_sync_start, asic_blank_end, asic_blank_start;
- bool bw_limit_pass;
+ volatile bool bw_limit_pass;
float bw_limit;
PERFORMANCE_TRACE_START();
@@ -1502,7 +1502,7 @@ void dcn_bw_notify_pplib_of_wm_ranges(st
{
struct pp_smu_funcs_rv *pp = NULL;
struct pp_smu_wm_range_sets ranges = {0};
- int min_fclk_khz, min_dcfclk_khz, socclk_khz;
+ volatile int min_fclk_khz, min_dcfclk_khz, socclk_khz;
const int overdrive = 500; /* 5 GHz to cover Overdrive */
if (dc->res_pool->pp_smu)
Index: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c:1.4 src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c:1.5
--- src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c:1.4 Sun Dec 19 11:59:31 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c Thu Jul 20 21:48:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_dcn20_resource.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $ */
+/* $NetBSD: amdgpu_dcn20_resource.c,v 1.5 2023/07/20 21:48:49 riastradh Exp $ */
/*
* Copyright 2016 Advanced Micro Devices, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn20_resource.c,v 1.4 2021/12/19 11:59:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_dcn20_resource.c,v 1.5 2023/07/20 21:48:49 riastradh Exp $");
#include
@@ -2932,7 +2932,7 @@ validate_out:
bool dcn20_validate_bandwidth(struct dc *dc, struct dc_state *context,
bool fast_validate)
{
- bool voltage_supported = false;
+ volatile bool voltage_supported = false;
bool full_pstate_supported = false;
bool dummy_pstate_supported = false;
double p_state_latency_us;
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/display/dc
Module Name:src Committed By: riastradh Date: Thu Jul 20 21:48:49 UTC 2023 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs: amdgpu_dcn_calcs.c src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20: amdgpu_dcn20_resource.c Log Message: amdgpu: Mark float-dependent variables volatile. This way they are computed -- using FP instructions -- before DC_FP_END, after which point FP instructions will trap or behave unpredictably. This is a workaround, not a proper solution -- really, the DC_FP_START/END calls should happen in a separate compilation unit built without -mhard-float or whatever, but that's a lot more work to make happen for now. PR kern/57059 XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/calcs/amdgpu_dcn_calcs.c cvs rdiff -u -r1.4 -r1.5 \ src/sys/external/bsd/drm2/dist/drm/amd/display/dc/dcn20/amdgpu_dcn20_resource.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/pax
Module Name:src
Committed By: lukem
Date: Thu Jul 20 20:10:59 UTC 2023
Modified Files:
src/bin/pax: ar_io.c
Log Message:
pax: fix -Wformat for host tool
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/bin/pax/ar_io.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/ar_io.c
diff -u src/bin/pax/ar_io.c:1.59 src/bin/pax/ar_io.c:1.60
--- src/bin/pax/ar_io.c:1.59 Mon Feb 4 04:36:41 2019
+++ src/bin/pax/ar_io.c Thu Jul 20 20:10:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ar_io.c,v 1.59 2019/02/04 04:36:41 mrg Exp $ */
+/* $NetBSD: ar_io.c,v 1.60 2023/07/20 20:10:59 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)ar_io.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: ar_io.c,v 1.59 2019/02/04 04:36:41 mrg Exp $");
+__RCSID("$NetBSD: ar_io.c,v 1.60 2023/07/20 20:10:59 lukem Exp $");
#endif
#endif /* not lint */
@@ -457,7 +457,7 @@ ar_close(void)
/* mimic cpio's block count first */
if (frmt && strcmp(NM_CPIO, argv0) == 0) {
(void)fprintf(listf, OFFT_F " blocks\n",
- (rdcnt ? rdcnt : wrcnt) / 5120);
+ (OFFT_T)((rdcnt ? rdcnt : wrcnt) / 5120));
}
ar_summary(0);
CVS commit: src/bin/pax
Module Name:src Committed By: lukem Date: Thu Jul 20 20:10:59 UTC 2023 Modified Files: src/bin/pax: ar_io.c Log Message: pax: fix -Wformat for host tool To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/bin/pax/ar_io.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/bin/pax
Module Name:src
Committed By: lukem
Date: Thu Jul 20 20:09:49 UTC 2023
Modified Files:
src/bin/pax: options.c
Log Message:
pax: need for ffs()
Fixes warning as host tool on NetBSD 9.99
To generate a diff of this commit:
cvs rdiff -u -r1.119 -r1.120 src/bin/pax/options.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/pax/options.c
diff -u src/bin/pax/options.c:1.119 src/bin/pax/options.c:1.120
--- src/bin/pax/options.c:1.119 Fri Apr 3 16:13:32 2020
+++ src/bin/pax/options.c Thu Jul 20 20:09:49 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: options.c,v 1.119 2020/04/03 16:13:32 joerg Exp $ */
+/* $NetBSD: options.c,v 1.120 2023/07/20 20:09:49 lukem Exp $ */
/*-
* Copyright (c) 1992 Keith Muller.
@@ -42,7 +42,7 @@
#if 0
static char sccsid[] = "@(#)options.c 8.2 (Berkeley) 4/18/94";
#else
-__RCSID("$NetBSD: options.c,v 1.119 2020/04/03 16:13:32 joerg Exp $");
+__RCSID("$NetBSD: options.c,v 1.120 2023/07/20 20:09:49 lukem Exp $");
#endif
#endif /* not lint */
@@ -61,6 +61,7 @@ __RCSID("$NetBSD: options.c,v 1.119 2020
#include
#include
#include
+#include
#include
#include
#include
CVS commit: src/bin/pax
Module Name:src Committed By: lukem Date: Thu Jul 20 20:09:49 UTC 2023 Modified Files: src/bin/pax: options.c Log Message: pax: need for ffs() Fixes warning as host tool on NetBSD 9.99 To generate a diff of this commit: cvs rdiff -u -r1.119 -r1.120 src/bin/pax/options.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: mrg
Date: Thu Jul 20 20:00:34 UTC 2023
Modified Files:
src/sys/dev/usb: ehci.c files.usb if_urtwn.c ugen.c ums.c usb.c
Log Message:
various debug updates for some usb drivers
- several new *_DEBUG_DEFAULT options that allow usb debug values to
be set to a default that is non-zero:
EHCI_DEBUG_DEFAULT, UGEN_DEBUG_DEFAULT, URTWN_DEBUG_DEFAULT,
UMS_DEBUG_DEFAULT, and USB_DEBUG_DEFAULT
- ugen debug uses fewer usbhist lines for the same info
- ums.c converted from printf() to usbhist
To generate a diff of this commit:
cvs rdiff -u -r1.315 -r1.316 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.178 -r1.179 src/sys/dev/usb/files.usb
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/usb/if_urtwn.c
cvs rdiff -u -r1.171 -r1.172 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/usb/ums.c
cvs rdiff -u -r1.200 -r1.201 src/sys/dev/usb/usb.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.315 src/sys/dev/usb/ehci.c:1.316
--- src/sys/dev/usb/ehci.c:1.315 Tue Dec 13 21:29:04 2022
+++ src/sys/dev/usb/ehci.c Thu Jul 20 20:00:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.315 2022/12/13 21:29:04 jakllsch Exp $ */
+/* $NetBSD: ehci.c,v 1.316 2023/07/20 20:00:34 mrg Exp $ */
/*
* Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.315 2022/12/13 21:29:04 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.316 2023/07/20 20:00:34 mrg Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -95,7 +95,12 @@ __KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.3
#ifndef EHCI_DEBUG
#define ehcidebug 0
#else
-static int ehcidebug = 0;
+
+#ifndef EHCI_DEBUG_DEFAULT
+#define EHCI_DEBUG_DEFAULT 0
+#endif
+
+static int ehcidebug = EHCI_DEBUG_DEFAULT;
SYSCTL_SETUP(sysctl_hw_ehci_setup, "sysctl hw.ehci setup")
{
Index: src/sys/dev/usb/files.usb
diff -u src/sys/dev/usb/files.usb:1.178 src/sys/dev/usb/files.usb:1.179
--- src/sys/dev/usb/files.usb:1.178 Thu Jun 30 06:30:44 2022
+++ src/sys/dev/usb/files.usb Thu Jul 20 20:00:34 2023
@@ -1,4 +1,4 @@
-# $NetBSD: files.usb,v 1.178 2022/06/30 06:30:44 macallan Exp $
+# $NetBSD: files.usb,v 1.179 2023/07/20 20:00:34 mrg Exp $
#
# Config file and device description for machine-independent USB code.
# Included by ports that need it. Ports that use it must provide
@@ -6,9 +6,11 @@
defflag USBVERBOSE
defflag opt_usb.h USB_FRAG_DMA_WORKAROUND
+defparam opt_usb.h USB_DEBUG_DEFAULT: USB_DEBUG
# HC controllers
defflag opt_usb.h EHCI_DEBUG: USB_DEBUG
+defparam opt_usb.h EHCI_DEBUG_DEFAULT: EHCI_DEBUG
defflag opt_usb.h OHCI_DEBUG: USB_DEBUG
defflag opt_usb.h UHCI_DEBUG: USB_DEBUG
defflag opt_usb.h DWC2_DEBUG: USB_DEBUG
@@ -46,6 +48,7 @@ defflag opt_usb.h UDSBR_DEBUG: USB_DEBUG
defflag opt_usb.h UFTDI_DEBUG: USB_DEBUG
defflag opt_usb.h UGENSA_DEBUG: USB_DEBUG
defflag opt_usb.h UGEN_DEBUG: USB_DEBUG
+defparam opt_usb.h UGEN_DEBUG_DEFAULT: UGEN_DEBUG
defflag opt_usb.h UHIDEV_DEBUG: USB_DEBUG
defflag opt_usb.h UHID_DEBUG: USB_DEBUG
defflag opt_usb.h UHMODEM_DEBUG: USB_DEBUG
@@ -62,6 +65,7 @@ defflag opt_usb.h UMIDIQUIRK_DEBUG: USB_
defflag opt_usb.h UMIDI_DEBUG: USB_DEBUG
defflag opt_usb.h UMODEM_DEBUG: USB_DEBUG
defflag opt_usb.h UMS_DEBUG: USB_DEBUG
+defparam opt_usb.h UMS_DEBUG_DEFAULT: UMS_DEBUG
defflag opt_usb.h UPGT_DEBUG: USB_DEBUG
defflag opt_usb.h UPLCOM_DEBUG: USB_DEBUG
defflag opt_usb.h UPL_DEBUG: USB_DEBUG
@@ -69,6 +73,7 @@ defflag opt_usb.h URAL_DEBUG: USB_DEBUG
defflag opt_usb.h URL_DEBUG: USB_DEBUG
defflag opt_usb.h URNDIS_DEBUG: USB_DEBUG
defflag opt_usb.h URTWN_DEBUG: USB_DEBUG
+defparam opt_usb.h URTWN_DEBUG_DEFAULT: URTWN_DEBUG
defflag opt_usb.h URTW_DEBUG: USB_DEBUG
defflag opt_usb.h USBNET_DEBUG: USB_DEBUG
defflag opt_usb.h USCANNER_DEBUG: USB_DEBUG
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.105 src/sys/dev/usb/if_urtwn.c:1.106
--- src/sys/dev/usb/if_urtwn.c:1.105 Sun Jul 31 12:59:26 2022
+++ src/sys/dev/usb/if_urtwn.c Thu Jul 20 20:00:34 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.105 2022/07/31 12:59:26 mlelstv Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.106 2023/07/20 20:00:34 mrg Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.105 2022/07/31 12:59:26 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.106 2023/07/20 20:00:34 mrg Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -95,7 +95,13 @@ __KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v
#define DBG_RF __BIT(5)
#define DBG_REG __BIT(6)
#define DBG_ALL 0xU
-u_int urtwn_debug = 0;
+
+#ifndef URTWN_DEBUG_DEFAULT
+#define URTWN_DEBUG_DEFAULT 0
+#endif
+
+u_int urtwn_debug = URTWN_DEBUG_DEFAULT;
+
#define DPRINTFN(n, fmt, a, b, c, d) do { \
if
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Thu Jul 20 20:00:34 UTC 2023 Modified Files: src/sys/dev/usb: ehci.c files.usb if_urtwn.c ugen.c ums.c usb.c Log Message: various debug updates for some usb drivers - several new *_DEBUG_DEFAULT options that allow usb debug values to be set to a default that is non-zero: EHCI_DEBUG_DEFAULT, UGEN_DEBUG_DEFAULT, URTWN_DEBUG_DEFAULT, UMS_DEBUG_DEFAULT, and USB_DEBUG_DEFAULT - ugen debug uses fewer usbhist lines for the same info - ums.c converted from printf() to usbhist To generate a diff of this commit: cvs rdiff -u -r1.315 -r1.316 src/sys/dev/usb/ehci.c cvs rdiff -u -r1.178 -r1.179 src/sys/dev/usb/files.usb cvs rdiff -u -r1.105 -r1.106 src/sys/dev/usb/if_urtwn.c cvs rdiff -u -r1.171 -r1.172 src/sys/dev/usb/ugen.c cvs rdiff -u -r1.103 -r1.104 src/sys/dev/usb/ums.c cvs rdiff -u -r1.200 -r1.201 src/sys/dev/usb/usb.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/ctags
Module Name:src
Committed By: lukem
Date: Thu Jul 20 20:00:07 UTC 2023
Modified Files:
src/usr.bin/ctags: Makefile ctags.c
Log Message:
ctags: fix pointer-sign issues
Refactor init() to avoid -Wpointer-sign for host builds.
Uses same cast pattern used in ctags.h.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/ctags/Makefile \
src/usr.bin/ctags/ctags.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/ctags/Makefile
diff -u src/usr.bin/ctags/Makefile:1.13 src/usr.bin/ctags/Makefile:1.14
--- src/usr.bin/ctags/Makefile:1.13 Fri Aug 10 12:10:27 2012
+++ src/usr.bin/ctags/Makefile Thu Jul 20 20:00:07 2023
@@ -1,12 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2012/08/10 12:10:27 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2023/07/20 20:00:07 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
PROG= ctags
CPPFLAGS+=-I${.CURDIR}
SRCS= C.c ctags.c fortran.c lisp.c print.c tree.c yacc.c
-.if !defined(HOSTPROGNAME)
-COPTS.ctags.c+= -Wno-pointer-sign
-.endif
-
.include
Index: src/usr.bin/ctags/ctags.c
diff -u src/usr.bin/ctags/ctags.c:1.13 src/usr.bin/ctags/ctags.c:1.14
--- src/usr.bin/ctags/ctags.c:1.13 Sun Feb 3 03:19:29 2019
+++ src/usr.bin/ctags/ctags.c Thu Jul 20 20:00:07 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: ctags.c,v 1.13 2019/02/03 03:19:29 mrg Exp $ */
+/* $NetBSD: ctags.c,v 1.14 2023/07/20 20:00:07 lukem Exp $ */
/*
* Copyright (c) 1987, 1993, 1994, 1995
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = "@(#)ctags.c 8.4 (Berkeley) 2/7/95";
#endif
-__RCSID("$NetBSD: ctags.c,v 1.13 2019/02/03 03:19:29 mrg Exp $");
+__RCSID("$NetBSD: ctags.c,v 1.14 2023/07/20 20:00:07 lukem Exp $");
#endif /* not lint */
#include
@@ -194,7 +194,7 @@ void
init(void)
{
int i;
- unsigned const char *sp;
+ const char *sp;
for (i = 0; i < 256; i++) {
_wht[i] = _etk[i] = _itk[i] = _btk[i] = NO;
@@ -202,19 +202,19 @@ init(void)
}
#define CWHITE " \f\t\n"
for (sp = CWHITE; *sp; sp++) /* white space chars */
- _wht[*sp] = YES;
+ _wht[(unsigned)*sp] = YES;
#define CTOKEN " \t\n\"'#()[]{}=-+%*/&|^~!<>;,.:?"
for (sp = CTOKEN; *sp; sp++) /* token ending chars */
- _etk[*sp] = YES;
+ _etk[(unsigned)*sp] = YES;
#define CINTOK "ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz0123456789"
for (sp = CINTOK; *sp; sp++) /* valid in-token chars */
- _itk[*sp] = YES;
+ _itk[(unsigned)*sp] = YES;
#define CBEGIN "ABCDEFGHIJKLMNOPQRSTUVWXYZ_abcdefghijklmnopqrstuvwxyz"
for (sp = CBEGIN; *sp; sp++) /* token starting chars */
- _btk[*sp] = YES;
+ _btk[(unsigned)*sp] = YES;
#define CNOTGD ",;"
for (sp = CNOTGD; *sp; sp++) /* invalid after-function chars */
- _gd[*sp] = NO;
+ _gd[(unsigned)*sp] = NO;
}
/*
CVS commit: src/usr.bin/ctags
Module Name:src Committed By: lukem Date: Thu Jul 20 20:00:07 UTC 2023 Modified Files: src/usr.bin/ctags: Makefile ctags.c Log Message: ctags: fix pointer-sign issues Refactor init() to avoid -Wpointer-sign for host builds. Uses same cast pattern used in ctags.h. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/usr.bin/ctags/Makefile \ src/usr.bin/ctags/ctags.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu
Module Name:src
Committed By: mrg
Date: Thu Jul 20 18:02:45 UTC 2023
Modified Files:
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_fence.c
Log Message:
avoid calling drm_sched_fini() for AMDGPU_RING_TYPE_KIQ rings.
drm_sched_init() is not called for these rings, and we'd panic trying
to mutex_destroy() a mutex that wasn't initialised.
this seems like a general bug, not a bug in netbsd port.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.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/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c
diff -u src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c:1.10 src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c:1.11
--- src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c:1.10 Sun Dec 19 12:02:39 2021
+++ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c Thu Jul 20 18:02:45 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: amdgpu_fence.c,v 1.10 2021/12/19 12:02:39 riastradh Exp $ */
+/* $NetBSD: amdgpu_fence.c,v 1.11 2023/07/20 18:02:45 mrg Exp $ */
/*
* Copyright 2009 Jerome Glisse.
@@ -31,7 +31,7 @@
*Dave Airlie
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: amdgpu_fence.c,v 1.10 2021/12/19 12:02:39 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: amdgpu_fence.c,v 1.11 2023/07/20 18:02:45 mrg Exp $");
#include
#include
@@ -541,7 +541,9 @@ void amdgpu_fence_driver_fini(struct amd
}
amdgpu_irq_put(adev, ring->fence_drv.irq_src,
ring->fence_drv.irq_type);
- drm_sched_fini(>sched);
+ if (ring->funcs->type != AMDGPU_RING_TYPE_KIQ) {
+ drm_sched_fini(>sched);
+ }
del_timer_sync(>fence_drv.fallback_timer);
for (j = 0; j <= ring->fence_drv.num_fences_mask; ++j)
dma_fence_put(ring->fence_drv.fences[j]);
CVS commit: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu
Module Name:src Committed By: mrg Date: Thu Jul 20 18:02:45 UTC 2023 Modified Files: src/sys/external/bsd/drm2/dist/drm/amd/amdgpu: amdgpu_fence.c Log Message: avoid calling drm_sched_fini() for AMDGPU_RING_TYPE_KIQ rings. drm_sched_init() is not called for these rings, and we'd panic trying to mutex_destroy() a mutex that wasn't initialised. this seems like a general bug, not a bug in netbsd port. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 \ src/sys/external/bsd/drm2/dist/drm/amd/amdgpu/amdgpu_fence.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/compat
Module Name:src Committed By: lukem Date: Thu Jul 20 16:22:30 UTC 2023 Modified Files: src/tools/compat: configure nbtool_config.h.in Log Message: tools/compat: regen To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/tools/compat/configure cvs rdiff -u -r1.55 -r1.56 src/tools/compat/nbtool_config.h.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/configure diff -u src/tools/compat/configure:1.104 src/tools/compat/configure:1.105 --- src/tools/compat/configure:1.104 Thu Jul 20 15:18:34 2023 +++ src/tools/compat/configure Thu Jul 20 16:22:30 2023 @@ -5306,7 +5306,7 @@ for ac_func in atoll asprintf asnprintf dprintf esetfunc fgetln flock fpurge __fpurge futimes getline \ getopt getopt_long group_from_gid gid_from_group \ heapsort isblank issetugid lchflags lchmod lchown lutimes mkstemp \ - mkdtemp poll pread putc_unlocked pwcache_userdb pwcache_groupdb \ + mkdtemp poll posix_spawn pread putc_unlocked pwcache_userdb pwcache_groupdb \ pwrite raise_default_signal random reallocarr reallocarray setenv \ setgroupent setprogname setpassent \ snprintb_m snprintf strlcat strlcpy strmode \ Index: src/tools/compat/nbtool_config.h.in diff -u src/tools/compat/nbtool_config.h.in:1.55 src/tools/compat/nbtool_config.h.in:1.56 --- src/tools/compat/nbtool_config.h.in:1.55 Tue May 30 19:04:42 2023 +++ src/tools/compat/nbtool_config.h.in Thu Jul 20 16:22:30 2023 @@ -1,6 +1,6 @@ /* nbtool_config.h.in. Generated from configure.ac by autoheader. */ -/* $NetBSD: nbtool_config.h.in,v 1.55 2023/05/30 19:04:42 lukem Exp $*/ +/* $NetBSD: nbtool_config.h.in,v 1.56 2023/07/20 16:22:30 lukem Exp $*/ #ifndef __NETBSD_NBTOOL_CONFIG_H__ #define __NETBSD_NBTOOL_CONFIG_H__ @@ -581,6 +581,9 @@ /* Define to 1 if you have the `poll' function. */ #undef HAVE_POLL +/* Define to 1 if you have the `posix_spawn' function. */ +#undef HAVE_POSIX_SPAWN + /* Define to 1 if you have the `pread' function. */ #undef HAVE_PREAD
CVS commit: src/tools/compat
Module Name:src Committed By: lukem Date: Thu Jul 20 16:22:30 UTC 2023 Modified Files: src/tools/compat: configure nbtool_config.h.in Log Message: tools/compat: regen To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/tools/compat/configure cvs rdiff -u -r1.55 -r1.56 src/tools/compat/nbtool_config.h.in 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: lukem
Date: Thu Jul 20 16:21:24 UTC 2023
Modified Files:
src/tools/compat: configure.ac
src/usr.bin/xinstall: Makefile xinstall.c
Log Message:
tools: binstall can use posix_spawn() instead of vfork()
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/tools/compat/configure.ac
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/xinstall/Makefile
cvs rdiff -u -r1.126 -r1.127 src/usr.bin/xinstall/xinstall.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/compat/configure.ac
diff -u src/tools/compat/configure.ac:1.106 src/tools/compat/configure.ac:1.107
--- src/tools/compat/configure.ac:1.106 Thu Jul 20 15:15:23 2023
+++ src/tools/compat/configure.ac Thu Jul 20 16:21:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.106 2023/07/20 15:15:23 lukem Exp $
+# $NetBSD: configure.ac,v 1.107 2023/07/20 16:21:23 lukem Exp $
#
# Autoconf definition file for libnbcompat.
#
@@ -228,7 +228,7 @@ AC_CHECK_FUNCS(atoll asprintf asnprintf
dprintf esetfunc fgetln flock fpurge __fpurge futimes getline \
getopt getopt_long group_from_gid gid_from_group \
heapsort isblank issetugid lchflags lchmod lchown lutimes mkstemp \
- mkdtemp poll pread putc_unlocked pwcache_userdb pwcache_groupdb \
+ mkdtemp poll posix_spawn pread putc_unlocked pwcache_userdb pwcache_groupdb \
pwrite raise_default_signal random reallocarr reallocarray setenv \
setgroupent setprogname setpassent \
snprintb_m snprintf strlcat strlcpy strmode \
Index: src/usr.bin/xinstall/Makefile
diff -u src/usr.bin/xinstall/Makefile:1.30 src/usr.bin/xinstall/Makefile:1.31
--- src/usr.bin/xinstall/Makefile:1.30 Sat Jun 3 09:09:19 2023
+++ src/usr.bin/xinstall/Makefile Thu Jul 20 16:21:23 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2023/06/03 09:09:19 lukem Exp $
+# $NetBSD: Makefile,v 1.31 2023/07/20 16:21:23 lukem Exp $
# @(#)Makefile 8.1 (Berkeley) 6/6/93
.include
@@ -11,7 +11,6 @@ MAN= install.1
CPPFLAGS+= -I${NETBSDSRCDIR}/usr.sbin/mtree
.if (${HOSTPROG:U} == "")
-CPPFLAGS+= -DHAVE_POSIX_SPAWN
DPADD+= ${LIBUTIL}
LDADD+= -lutil
.endif
Index: src/usr.bin/xinstall/xinstall.c
diff -u src/usr.bin/xinstall/xinstall.c:1.126 src/usr.bin/xinstall/xinstall.c:1.127
--- src/usr.bin/xinstall/xinstall.c:1.126 Fri Oct 30 20:05:00 2020
+++ src/usr.bin/xinstall/xinstall.c Thu Jul 20 16:21:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: xinstall.c,v 1.126 2020/10/30 20:05:00 rillig Exp $ */
+/* $NetBSD: xinstall.c,v 1.127 2023/07/20 16:21:23 lukem Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -64,6 +64,7 @@
#include "nbtool_config.h"
#else
#define HAVE_FUTIMES 1
+#define HAVE_POSIX_SPAWN 1
#define HAVE_STRUCT_STAT_ST_FLAGS 1
#endif
@@ -77,7 +78,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
#if 0
static char sccsid[] = "@(#)xinstall.c 8.1 (Berkeley) 7/21/93";
#else
-__RCSID("$NetBSD: xinstall.c,v 1.126 2020/10/30 20:05:00 rillig Exp $");
+__RCSID("$NetBSD: xinstall.c,v 1.127 2023/07/20 16:21:23 lukem Exp $");
#endif
#endif /* not lint */
CVS commit: src
Module Name:src Committed By: lukem Date: Thu Jul 20 16:21:24 UTC 2023 Modified Files: src/tools/compat: configure.ac src/usr.bin/xinstall: Makefile xinstall.c Log Message: tools: binstall can use posix_spawn() instead of vfork() To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/tools/compat/configure.ac cvs rdiff -u -r1.30 -r1.31 src/usr.bin/xinstall/Makefile cvs rdiff -u -r1.126 -r1.127 src/usr.bin/xinstall/xinstall.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/make
Module Name:src Committed By: lukem Date: Thu Jul 20 15:20:00 UTC 2023 Modified Files: src/tools/make: configure Added Files: src/tools/make: aclocal.m4 Log Message: tools/make: regen To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/tools/make/aclocal.m4 cvs rdiff -u -r1.8 -r1.9 src/tools/make/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/compat
Module Name:src
Committed By: lukem
Date: Thu Jul 20 15:18:34 UTC 2023
Modified Files:
src/tools/compat: aclocal.m4 configure
Log Message:
tools/compat: regen
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tools/compat/aclocal.m4
cvs rdiff -u -r1.103 -r1.104 src/tools/compat/configure
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/compat/aclocal.m4
diff -u src/tools/compat/aclocal.m4:1.1 src/tools/compat/aclocal.m4:1.2
--- src/tools/compat/aclocal.m4:1.1 Tue May 30 19:04:42 2023
+++ src/tools/compat/aclocal.m4 Thu Jul 20 15:18:34 2023
@@ -13,3 +13,4 @@
m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
m4_include([buildaux/ax_check_compile_flag.m4])
+m4_include([buildaux/nb_check_cc_flag.m4])
Index: src/tools/compat/configure
diff -u src/tools/compat/configure:1.103 src/tools/compat/configure:1.104
--- src/tools/compat/configure:1.103 Sat Jun 3 09:18:14 2023
+++ src/tools/compat/configure Thu Jul 20 15:18:34 2023
@@ -6278,7 +6278,7 @@ done
-cc_fail_unknown=
+nb_cv_check_cc_flags=
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=unknown-warning-option" >&5
$as_echo_n "checking whether C compiler accepts -Werror=unknown-warning-option... " >&6; }
if ${ax_cv_check_cflags___Werror_unknown_warning_option+:} false; then :
@@ -6309,17 +6309,13 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Werror_unknown_warning_option" >&5
$as_echo "$ax_cv_check_cflags___Werror_unknown_warning_option" >&6; }
if test "x$ax_cv_check_cflags___Werror_unknown_warning_option" = xyes; then :
- as_fn_append cc_fail_unknown -Werror=unknown-warning-option
+ nb_cv_check_cc_flags=-Werror=unknown-warning-option
else
:
fi
-
-
-
-
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$cc_fail_unknown_-no-cpp-precomp" | $as_tr_sh`
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$nb_cv_check_cc_flags_-no-cpp-precomp" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -no-cpp-precomp" >&5
$as_echo_n "checking whether C compiler accepts -no-cpp-precomp... " >&6; }
if eval \${$as_CACHEVAR+:} false; then :
@@ -6327,7 +6323,7 @@ if eval \${$as_CACHEVAR+:} false; then :
else
ax_check_save_flags=$CFLAGS
- CFLAGS="$CFLAGS $cc_fail_unknown -no-cpp-precomp"
+ CFLAGS="$CFLAGS $nb_cv_check_cc_flags -no-cpp-precomp"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6359,14 +6355,7 @@ fi
-
-
-
-
-
-
-
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$cc_fail_unknown_-Waddress-of-packed-member" | $as_tr_sh`
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$nb_cv_check_cc_flags_-Waddress-of-packed-member" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Waddress-of-packed-member" >&5
$as_echo_n "checking whether C compiler accepts -Waddress-of-packed-member... " >&6; }
if eval \${$as_CACHEVAR+:} false; then :
@@ -6374,7 +6363,7 @@ if eval \${$as_CACHEVAR+:} false; then :
else
ax_check_save_flags=$CFLAGS
- CFLAGS="$CFLAGS $cc_fail_unknown -Waddress-of-packed-member"
+ CFLAGS="$CFLAGS $nb_cv_check_cc_flags -Waddress-of-packed-member"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6405,14 +6394,7 @@ fi
-
-
-
-
-
-
-
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$cc_fail_unknown_-Wcast-function-type" | $as_tr_sh`
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$nb_cv_check_cc_flags_-Wcast-function-type" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wcast-function-type" >&5
$as_echo_n "checking whether C compiler accepts -Wcast-function-type... " >&6; }
if eval \${$as_CACHEVAR+:} false; then :
@@ -6420,7 +6402,7 @@ if eval \${$as_CACHEVAR+:} false; then :
else
ax_check_save_flags=$CFLAGS
- CFLAGS="$CFLAGS $cc_fail_unknown -Wcast-function-type"
+ CFLAGS="$CFLAGS $nb_cv_check_cc_flags -Wcast-function-type"
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
@@ -6451,14 +6433,7 @@ fi
-
-
-
-
-
-
-
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$cc_fail_unknown_-Werror=address-of-packed-member" | $as_tr_sh`
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags_$nb_cv_check_cc_flags_-Werror=address-of-packed-member" | $as_tr_sh`
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Werror=address-of-packed-member" >&5
$as_echo_n "checking whether C compiler accepts -Werror=address-of-packed-member... " >&6; }
if eval \${$as_CACHEVAR+:} false; then :
@@ -6466,7 +6441,7 @@ if eval \${$as_CACHEVAR+:} false; then :
else
ax_check_save_flags=$CFLAGS
- CFLAGS="$CFLAGS $cc_fail_unknown -Werror=address-of-packed-member"
+ CFLAGS="$CFLAGS $nb_cv_check_cc_flags -Werror=address-of-packed-member"
cat confdefs.h - <<_ACEOF
CVS commit: src/tools/compat
Module Name:src Committed By: lukem Date: Thu Jul 20 15:18:34 UTC 2023 Modified Files: src/tools/compat: aclocal.m4 configure Log Message: tools/compat: regen To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tools/compat/aclocal.m4 cvs rdiff -u -r1.103 -r1.104 src/tools/compat/configure Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/make
Module Name:src
Committed By: lukem
Date: Thu Jul 20 15:16:44 UTC 2023
Modified Files:
src/tools/make: Makefile.regen buildmake.sh.in configure.ac
Log Message:
tools/make: build with -Wno-deprecated-declarations
Use NB_CHECK_CC_FLAG() from ../tools/compat to determine
if the compiler supports -Wno-deprecated-declarations.
Avoids sooking about vfork() on macOS.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tools/make/Makefile.regen
cvs rdiff -u -r1.17 -r1.18 src/tools/make/buildmake.sh.in
cvs rdiff -u -r1.10 -r1.11 src/tools/make/configure.ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/make/Makefile.regen
diff -u src/tools/make/Makefile.regen:1.1 src/tools/make/Makefile.regen:1.2
--- src/tools/make/Makefile.regen:1.1 Sun Oct 14 20:25:35 2007
+++ src/tools/make/Makefile.regen Thu Jul 20 15:16:44 2023
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.regen,v 1.1 2007/10/14 20:25:35 apb Exp $
+# $NetBSD: Makefile.regen,v 1.2 2023/07/20 15:16:44 lukem Exp $
.include "bsd.own.mk"
# Run "${TOOLDIR}/bin/nbmake-${MACHINE} -f Makefile.regen" by hand after
# editing configure.ac. See more detailed instructions in configure.ac.
regen:
- cd ${.CURDIR} && ${TOOLDIR}/bin/${_TOOL_PREFIX}autoconf
+ cd ${.CURDIR} && ${TOOLDIR}/bin/${_TOOL_PREFIX}autoreconf -I../compat/buildaux
Index: src/tools/make/buildmake.sh.in
diff -u src/tools/make/buildmake.sh.in:1.17 src/tools/make/buildmake.sh.in:1.18
--- src/tools/make/buildmake.sh.in:1.17 Thu Jul 20 15:13:27 2023
+++ src/tools/make/buildmake.sh.in Thu Jul 20 15:16:44 2023
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: buildmake.sh.in,v 1.17 2023/07/20 15:13:27 lukem Exp $
+# $NetBSD: buildmake.sh.in,v 1.18 2023/07/20 15:16:44 lukem Exp $
#
# buildmake.sh.in - Autoconf-processed shell script for building make(1).
#
@@ -24,7 +24,7 @@ docmd()
}
for f in $MKSRCDIR/*.c; do
- docmd "compile " "$f" @CC@ @CPPFLAGS@ @DEFS@ @CFLAGS@ \
+ docmd "compile " "$f" @CC@ @CPPFLAGS@ @DEFS@ @CFLAGS@ @NOWARNFLAGS@ \
-D_PATH_DEFSYSPATH=\"${NETBSDSRCDIR}/share/mk\" -c "$f"
done
Index: src/tools/make/configure.ac
diff -u src/tools/make/configure.ac:1.10 src/tools/make/configure.ac:1.11
--- src/tools/make/configure.ac:1.10 Thu Jul 20 15:12:36 2023
+++ src/tools/make/configure.ac Thu Jul 20 15:16:44 2023
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.10 2023/07/20 15:12:36 lukem Exp $
+# $NetBSD: configure.ac,v 1.11 2023/07/20 15:16:44 lukem Exp $
#
# Autoconf definition file for make.
#
@@ -25,6 +25,9 @@
AC_INIT([make], [noversion], [bin-bug-peo...@netbsd.org])
AC_CONFIG_FILES([buildmake.sh])
+m4_pattern_forbid([^AX_])
+m4_pattern_forbid([^NB_])
+
AC_PATH_PROG([BSHELL], [sh])
if test x"$BSHELL" = x; then
AC_MSG_ERROR([sh must be somewhere on \$PATH, or BSHELL must be defined])
@@ -47,12 +50,17 @@ AC_SEARCH_LIBS([regfree], [rx posix])
AC_CHECK_FUNCS([setenv strdup strerror strftime vsnprintf])
+dnl NOWARNFLAGS: compiler flags to suppress unnecessary warnings:
+dnl -Wno-deprecated-declarations
+dnl
+NB_CHECK_CC_FLAG([-Wno-deprecated-declarations], [NOWARNFLAGS])
+
AC_OUTPUT()
dnl Display results
dnl
AC_MSG_NOTICE([== configure results for make ===])
-m4_foreach_w([NB_VAR], [CC CFLAGS CPPFLAGS DEFS LDFLAGS LIBS], [dnl
+m4_foreach_w([NB_VAR], [CC CFLAGS CPPFLAGS DEFS LDFLAGS LIBS NOWARNFLAGS], [dnl
AC_MSG_NOTICE(m4_format([%-32s],NB_VAR)[$NB_VAR])
])
AC_MSG_NOTICE([])
CVS commit: src/tools/make
Module Name:src Committed By: lukem Date: Thu Jul 20 15:16:44 UTC 2023 Modified Files: src/tools/make: Makefile.regen buildmake.sh.in configure.ac Log Message: tools/make: build with -Wno-deprecated-declarations Use NB_CHECK_CC_FLAG() from ../tools/compat to determine if the compiler supports -Wno-deprecated-declarations. Avoids sooking about vfork() on macOS. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tools/make/Makefile.regen cvs rdiff -u -r1.17 -r1.18 src/tools/make/buildmake.sh.in cvs rdiff -u -r1.10 -r1.11 src/tools/make/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/compat
Module Name:src Committed By: lukem Date: Thu Jul 20 15:15:23 UTC 2023 Modified Files: src/tools/compat: configure.ac Added Files: src/tools/compat/buildaux: nb_check_cc_flag.m4 Log Message: tools/compat: provide nb_check_cc_flag.m4 Implement m4 macro NB_CHECK_CC_FLAG(FLAG, [VAR=FLAG_DERIVED]) Determine if the C compiler supports FLAG, and sets output variable VAR to FLAG if FLAG is supported. If VAR is not provided, default to FLAG_DERIVED, which is FLAG converted to upper-case and all special characters replaced with "_", and the result prepended with "CC_". FLAG_DERIVED is appended to the m4 macro NB_CHECK_CC_FLAG_VARS. E.g., if FLAG is "-Wexample=yes", FLAG_DERIVED is "CC_WEXAMPLE_YES". This is implemented in separate buildaux/nb_check_cc_flag.m4, based on configure's NB_CC_FLAG(), but supports VAR override. Adapt configure from internal NB_CC_FLAG() to NB_CHECK_CC_FLAG(). (Note: AX_CHECK_COMPILE_FLAG() from autoconf-archive could be enhanced to support the clang and gcc workarounds I've implemented here.) To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/tools/compat/configure.ac cvs rdiff -u -r0 -r1.1 src/tools/compat/buildaux/nb_check_cc_flag.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/compat/configure.ac diff -u src/tools/compat/configure.ac:1.105 src/tools/compat/configure.ac:1.106 --- src/tools/compat/configure.ac:1.105 Sat Jun 3 09:10:13 2023 +++ src/tools/compat/configure.ac Thu Jul 20 15:15:23 2023 @@ -1,4 +1,4 @@ -# $NetBSD: configure.ac,v 1.105 2023/06/03 09:10:13 lukem Exp $ +# $NetBSD: configure.ac,v 1.106 2023/07/20 15:15:23 lukem Exp $ # # Autoconf definition file for libnbcompat. # @@ -327,50 +327,27 @@ dnl dnl Set per-warning CC_* variables if supported by HOST_CC. dnl -dnl clang needs to fail if given an unknown -WWARN. -cc_fail_unknown= -AX_CHECK_COMPILE_FLAG([-Werror=unknown-warning-option], - [AS_VAR_APPEND([cc_fail_unknown], [-Werror=unknown-warning-option])]) - -dnl NB_CC_FLAG(FLAG) -dnl Determine if HOST_CC supports FLAG, and -dnl sets output variable VAR (derived from FLAG) -dnl to FLAG if it is supported. -dnl -AC_DEFUN([NB_CC_FLAG], [dnl -m4_pushdef([NB_FLAG], [$1]) -dnl gcc ignores unknown -Wno-WARN but will fail unknown equivalent -WWARN. -m4_pushdef([NB_WFLAG], m4_bpatsubst(NB_FLAG, [^-Wno-], [-W])) -m4_pushdef([NB_VAR], [CC]m4_translit(NB_FLAG, [-=a-z], [__A-Z])) -AX_CHECK_COMPILE_FLAG(NB_WFLAG, [AS_VAR_SET(NB_VAR,NB_FLAG)], [], [$cc_fail_unknown]) -AC_SUBST(NB_VAR) -m4_append([NB_CC_FLAG_VARS], NB_VAR, [ ]) -m4_popdef([NB_FLAG]) -m4_popdef([NB_WFLAG]) -m4_popdef([NB_VAR]) -]) dnl NB_CC_FLAG - dnl Disable use of pre-compiled headers on Darwin. -NB_CC_FLAG([-no-cpp-precomp]) +NB_CHECK_CC_FLAG([-no-cpp-precomp]) dnl Detect HOST_CC support for CC_* warnings -NB_CC_FLAG([-Wno-address-of-packed-member]) -NB_CC_FLAG([-Wno-cast-function-type]) -NB_CC_FLAG([-Wno-error=address-of-packed-member]) -NB_CC_FLAG([-Wno-format-overflow]) -NB_CC_FLAG([-Wno-format-truncation]) -NB_CC_FLAG([-Wno-implicit-fallthrough]) -NB_CC_FLAG([-Wno-maybe-uninitialized]) -NB_CC_FLAG([-Wno-return-local-addr]) -NB_CC_FLAG([-Wno-stringop-overflow]) -NB_CC_FLAG([-Wno-stringop-truncation]) +NB_CHECK_CC_FLAG([-Wno-address-of-packed-member]) +NB_CHECK_CC_FLAG([-Wno-cast-function-type]) +NB_CHECK_CC_FLAG([-Wno-error=address-of-packed-member]) +NB_CHECK_CC_FLAG([-Wno-format-overflow]) +NB_CHECK_CC_FLAG([-Wno-format-truncation]) +NB_CHECK_CC_FLAG([-Wno-implicit-fallthrough]) +NB_CHECK_CC_FLAG([-Wno-maybe-uninitialized]) +NB_CHECK_CC_FLAG([-Wno-return-local-addr]) +NB_CHECK_CC_FLAG([-Wno-stringop-overflow]) +NB_CHECK_CC_FLAG([-Wno-stringop-truncation]) AC_OUTPUT() dnl Display results dnl -AC_MSG_NOTICE([= Configuration results =]) -m4_foreach_w([NB_VAR], [CC LIBS ]NB_CC_FLAG_VARS, [dnl +AC_MSG_NOTICE([= configure results for compat ==]) +m4_foreach_w([NB_VAR], [CC LIBS ]NB_CHECK_CC_FLAG_VARS, [dnl AC_MSG_NOTICE(m4_format([%-40s],NB_VAR)[$NB_VAR]) ]) AC_MSG_NOTICE([]) Added files: Index: src/tools/compat/buildaux/nb_check_cc_flag.m4 diff -u /dev/null src/tools/compat/buildaux/nb_check_cc_flag.m4:1.1 --- /dev/null Thu Jul 20 15:15:23 2023 +++ src/tools/compat/buildaux/nb_check_cc_flag.m4 Thu Jul 20 15:15:23 2023 @@ -0,0 +1,55 @@ +# +# Copyright (c) 2023, Luke Mewburn +# +# Copying and distribution of this file, with or without modification, +# are permitted in any medium without royalty provided the copyright +# notice and this notice are preserved. This file is offered as-is, +# without any warranty. +# + +# +# _NB_CHECK_CC_FLAG_PREPARE +# Check for flags to force a compiler (e.g., clang) to fail +# if given an unknown -WWARN, and set $nb_cv_check_cc_flags +# to that flag for
CVS commit: src/tools/compat
Module Name:src Committed By: lukem Date: Thu Jul 20 15:15:23 UTC 2023 Modified Files: src/tools/compat: configure.ac Added Files: src/tools/compat/buildaux: nb_check_cc_flag.m4 Log Message: tools/compat: provide nb_check_cc_flag.m4 Implement m4 macro NB_CHECK_CC_FLAG(FLAG, [VAR=FLAG_DERIVED]) Determine if the C compiler supports FLAG, and sets output variable VAR to FLAG if FLAG is supported. If VAR is not provided, default to FLAG_DERIVED, which is FLAG converted to upper-case and all special characters replaced with "_", and the result prepended with "CC_". FLAG_DERIVED is appended to the m4 macro NB_CHECK_CC_FLAG_VARS. E.g., if FLAG is "-Wexample=yes", FLAG_DERIVED is "CC_WEXAMPLE_YES". This is implemented in separate buildaux/nb_check_cc_flag.m4, based on configure's NB_CC_FLAG(), but supports VAR override. Adapt configure from internal NB_CC_FLAG() to NB_CHECK_CC_FLAG(). (Note: AX_CHECK_COMPILE_FLAG() from autoconf-archive could be enhanced to support the clang and gcc workarounds I've implemented here.) To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/tools/compat/configure.ac cvs rdiff -u -r0 -r1.1 src/tools/compat/buildaux/nb_check_cc_flag.m4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/make
Module Name:src Committed By: lukem Date: Thu Jul 20 15:13:27 UTC 2023 Modified Files: src/tools/make: buildmake.sh.in Log Message: tools/make/buildmake.sh: fix quoting autoconf 2.69 generates @DEFS@ with definitions with quoted embedded spaces, so rework how docmd() is invoked to avoid weird quoting issues. As part of this, remove all the shell variables containing @var@ and just use @var@ directly. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/tools/make/buildmake.sh.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/make
Module Name:src
Committed By: lukem
Date: Thu Jul 20 15:13:27 UTC 2023
Modified Files:
src/tools/make: buildmake.sh.in
Log Message:
tools/make/buildmake.sh: fix quoting
autoconf 2.69 generates @DEFS@ with definitions with
quoted embedded spaces, so rework how docmd() is invoked
to avoid weird quoting issues.
As part of this, remove all the shell variables containing @var@
and just use @var@ directly.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/tools/make/buildmake.sh.in
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/make/buildmake.sh.in
diff -u src/tools/make/buildmake.sh.in:1.16 src/tools/make/buildmake.sh.in:1.17
--- src/tools/make/buildmake.sh.in:1.16 Sun Jul 26 09:17:24 2020
+++ src/tools/make/buildmake.sh.in Thu Jul 20 15:13:27 2023
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: buildmake.sh.in,v 1.16 2020/07/26 09:17:24 rillig Exp $
+# $NetBSD: buildmake.sh.in,v 1.17 2023/07/20 15:13:27 lukem Exp $
#
# buildmake.sh.in - Autoconf-processed shell script for building make(1).
#
@@ -7,30 +7,26 @@
: ${NETBSDSRCDIR:=@srcdir@/../..}
MKSRCDIR=${NETBSDSRCDIR}/usr.bin/make
-_CC="@CC@"
-
-_CFLAGS="@CPPFLAGS@"
-_CFLAGS="${_CFLAGS} -D_PATH_DEFSYSPATH=\"${NETBSDSRCDIR}/share/mk\""
-_CFLAGS="${_CFLAGS} @DEFS@"
-_CFLAGS="${_CFLAGS} @CFLAGS@"
-
-_LDFLAGS="@LDFLAGS@ @LIBS@"
-
-docmd () {
+docmd()
+{
+ local msg=$1
+ local tgt=$2
+ shift 2
case "${MAKEVERBOSE:-2}" in
0)
;;
1)
- echo "$1 ${2##*/}" ;;
+ echo "${msg} ${tgt##*/}" ;;
*)
- echo "$3" ;;
+ echo "$*" ;;
esac
- $3 || exit 1
+ "$@" || exit 1
}
for f in $MKSRCDIR/*.c; do
- docmd "compile " "$f" "${_CC} ${_CFLAGS} -c $f"
+ docmd "compile " "$f" @CC@ @CPPFLAGS@ @DEFS@ @CFLAGS@ \
+ -D_PATH_DEFSYSPATH=\"${NETBSDSRCDIR}/share/mk\" -c "$f"
done
docmd " link " "${_TOOL_PREFIX:-nb}make" \
- "${_CC} -o ${_TOOL_PREFIX:-nb}make *.o ${_LDFLAGS}"
+ @CC@ -o ${_TOOL_PREFIX:-nb}make *.o @LDFLAGS@ @LIBS@
CVS commit: src/tools/make
Module Name:src Committed By: lukem Date: Thu Jul 20 15:12:37 UTC 2023 Modified Files: src/tools/make: configure.ac Log Message: tools/make/configure.ac: style tweaks Consistently use () in zero argument macro calls. Display results at end. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tools/make/configure.ac Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/make
Module Name:src
Committed By: lukem
Date: Thu Jul 20 15:12:37 UTC 2023
Modified Files:
src/tools/make: configure.ac
Log Message:
tools/make/configure.ac: style tweaks
Consistently use () in zero argument macro calls.
Display results at end.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tools/make/configure.ac
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/make/configure.ac
diff -u src/tools/make/configure.ac:1.9 src/tools/make/configure.ac:1.10
--- src/tools/make/configure.ac:1.9 Sun Oct 14 20:26:47 2007
+++ src/tools/make/configure.ac Thu Jul 20 15:12:36 2023
@@ -1,4 +1,4 @@
-# $NetBSD: configure.ac,v 1.9 2007/10/14 20:26:47 apb Exp $
+# $NetBSD: configure.ac,v 1.10 2023/07/20 15:12:36 lukem Exp $
#
# Autoconf definition file for make.
#
@@ -23,28 +23,36 @@
#
AC_INIT([make], [noversion], [bin-bug-peo...@netbsd.org])
-AC_CONFIG_FILES(buildmake.sh)
+AC_CONFIG_FILES([buildmake.sh])
-AC_PATH_PROG(BSHELL, sh)
+AC_PATH_PROG([BSHELL], [sh])
if test x"$BSHELL" = x; then
AC_MSG_ERROR([sh must be somewhere on \$PATH, or BSHELL must be defined])
fi
-AC_DEFINE_UNQUOTED(DEFSHELL_CUSTOM, "${BSHELL}")
+AC_DEFINE_UNQUOTED([DEFSHELL_CUSTOM], "${BSHELL}")
# Make sure we have POSIX regex ability.
-AC_CHECK_HEADER(regex.h,, AC_MSG_ERROR([POSIX regex.h is required]))
+AC_CHECK_HEADER([regex.h],, AC_MSG_ERROR([POSIX regex.h is required]))
# If we don't have , we need to use select(2).
-AC_CHECK_HEADER(poll.h,, AC_DEFINE(USE_SELECT))
+AC_CHECK_HEADER([poll.h],, AC_DEFINE(USE_SELECT))
# regcomp() and regexec() are also names of functions in the old V8
# regexp package. To avoid them, we need to find out who has regfree().
dnl # Cygwin: We *MUST* look at -lregex *before* the "no libs" condition.
dnl # Thus AC_CHECK_LIB(regex...) comes first, and AC_SEARCHLIBS next.
-AC_CHECK_LIB(regex, regfree)
-AC_SEARCH_LIBS(regfree, rx posix)
+AC_CHECK_LIB([regex], [regfree])
+AC_SEARCH_LIBS([regfree], [rx posix])
-AC_CHECK_FUNCS(setenv strdup strerror strftime vsnprintf)
+AC_CHECK_FUNCS([setenv strdup strerror strftime vsnprintf])
-AC_OUTPUT
+AC_OUTPUT()
+
+dnl Display results
+dnl
+AC_MSG_NOTICE([== configure results for make ===])
+m4_foreach_w([NB_VAR], [CC CFLAGS CPPFLAGS DEFS LDFLAGS LIBS], [dnl
+AC_MSG_NOTICE(m4_format([%-32s],NB_VAR)[$NB_VAR])
+])
+AC_MSG_NOTICE([])
CVS commit: src/usr.sbin/bta2dpd/bta2dpd
Module Name:src Committed By: nat Date: Thu Jul 20 13:31:31 UTC 2023 Modified Files: src/usr.sbin/bta2dpd/bta2dpd: bta2dpd.8 Log Message: Fix formatting. XXX pullup-10. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/bta2dpd/bta2dpd
Module Name:src Committed By: nat Date: Thu Jul 20 13:31:31 UTC 2023 Modified Files: src/usr.sbin/bta2dpd/bta2dpd: bta2dpd.8 Log Message: Fix formatting. XXX pullup-10. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8 diff -u src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8:1.9 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8:1.10 --- src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8:1.9 Thu Jul 20 13:28:47 2023 +++ src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8 Thu Jul 20 13:31:31 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: bta2dpd.8,v 1.9 2023/07/20 13:28:47 nat Exp $ +.\" $NetBSD: bta2dpd.8,v 1.10 2023/07/20 13:31:31 nat Exp $ .\" .\" Copyright (c) 2015 - 2016 Nathanial Sloss .\" All rights reserved. @@ -116,7 +116,7 @@ Local device address. May be given as BDADDR or device name. .It Fl I Initiate a Discover command. - Useful when used as an audio sink as some devices need this to pair. +Useful when used as an audio sink as some devices need this to pair. .It Fl K Allows registering as an audio sink receiving an incoming connection. .It Fl M Ar mtu
CVS commit: src/usr.sbin/bta2dpd/bta2dpd
Module Name:src Committed By: nat Date: Thu Jul 20 13:28:48 UTC 2023 Modified Files: src/usr.sbin/bta2dpd/bta2dpd: bta2dpd.8 Log Message: Add BUGS section to manual page. This notes the problems with playback from file on certain devices. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/bta2dpd/bta2dpd
Module Name:src Committed By: nat Date: Thu Jul 20 13:28:48 UTC 2023 Modified Files: src/usr.sbin/bta2dpd/bta2dpd: bta2dpd.8 Log Message: Add BUGS section to manual page. This notes the problems with playback from file on certain devices. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8 diff -u src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8:1.8 src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8:1.9 --- src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8:1.8 Thu Jun 22 01:35:12 2023 +++ src/usr.sbin/bta2dpd/bta2dpd/bta2dpd.8 Thu Jul 20 13:28:47 2023 @@ -1,4 +1,4 @@ -.\" $NetBSD: bta2dpd.8,v 1.8 2023/06/22 01:35:12 nat Exp $ +.\" $NetBSD: bta2dpd.8,v 1.9 2023/07/20 13:28:47 nat Exp $ .\" .\" Copyright (c) 2015 - 2016 Nathanial Sloss .\" All rights reserved. @@ -29,7 +29,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd June 20, 2023 +.Dd July 20, 2023 .Dt BTA2DPD 8 .Os .Sh NAME @@ -289,3 +289,8 @@ and send to speakers. .Xr btconfig 8 .Sh AUTHORS .An Nathanial Sloss +.Sh BUGS +For some devices playback from file results in rapid playback or playback with +stutter. +For best results use with +.Xr pad 4 .
CVS commit: src/usr.sbin/bta2dpd/bta2dpd
Module Name:src
Committed By: nat
Date: Thu Jul 20 12:33:28 UTC 2023
Modified Files:
src/usr.sbin/bta2dpd/bta2dpd: sbc_encode.c
Log Message:
Add thottling when playing from file.
This avoids rapid playback when playing from file with affected devices.
Playback using pad(4) is still preferred ad gives a better result.
Playback from pad(4) is unaffected by this change.
XXX pullup-10.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.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.sbin/bta2dpd/bta2dpd/sbc_encode.c
diff -u src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c:1.11 src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c:1.12
--- src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c:1.11 Sun May 28 07:59:17 2023
+++ src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.c Thu Jul 20 12:33:27 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sbc_encode.c,v 1.11 2023/05/28 07:59:17 mlelstv Exp $ */
+/* $NetBSD: sbc_encode.c,v 1.12 2023/07/20 12:33:27 nat Exp $ */
/*-
* Copyright (c) 2015 - 2016 Nathanial Sloss
@@ -32,6 +32,7 @@
*/
#include
+#include
#include
#include
#include
@@ -841,6 +842,7 @@ stream(int in, int outfd, uint8_t mode,
blocks, uint8_t alloc_method, uint8_t bitpool, size_t mtu, int volume)
{
struct rtpHeader myHeader;
+ struct timeval myTime;
uint8_t *whole, *frameData;
int16_t music[2048];
ssize_t len, mySize[16], offset, next_pkt;
@@ -849,6 +851,7 @@ stream(int in, int outfd, uint8_t mode,
size_t frequency;
static size_t ts = 0;
static uint16_t seqnumber = 0;
+ static time_t prevTime, readTime, sleepTime, timeNow;
int numpkts, tries;
global_mode = mode;
@@ -912,9 +915,11 @@ stream(int in, int outfd, uint8_t mode,
next_pkt = 0;
len = 0;
pkt_len = 80;
+ readTime = 0;
while (totalSize + ((size_t)pkt_len * 2) <= mtu) {
len = readloop(in, music, readsize);
+ readTime += (time_t)readsize;
if (len < (int)readsize)
break;
@@ -934,6 +939,8 @@ stream(int in, int outfd, uint8_t mode,
return -1;
}
+ readTime = readTime * 100 / 2 / global_chan / (time_t)frequency;
+
myHeader.numFrames = (uint8_t)numpkts;
whole = malloc(totalSize);
if (whole == NULL)
@@ -946,6 +953,20 @@ stream(int in, int outfd, uint8_t mode,
free(frameData);
tries = 1;
+
+ /* Wait if necessary to avoid rapid playback. */
+ gettimeofday(, NULL);
+ timeNow = myTime.tv_sec * 100 + myTime.tv_usec;
+ if (prevTime == 0)
+ prevTime = timeNow;
+ else
+ sleepTime += readTime - (timeNow - prevTime);
+ if (sleepTime >= 1000) {
+ usleep(500);
+ sleepTime -= 1000;
+ }
+ prevTime = timeNow;
+
send_again:
len = write(outfd, whole, totalSize);
CVS commit: src/usr.sbin/bta2dpd/bta2dpd
Module Name:src Committed By: nat Date: Thu Jul 20 12:33:28 UTC 2023 Modified Files: src/usr.sbin/bta2dpd/bta2dpd: sbc_encode.c Log Message: Add thottling when playing from file. This avoids rapid playback when playing from file with affected devices. Playback using pad(4) is still preferred ad gives a better result. Playback from pad(4) is unaffected by this change. XXX pullup-10. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/bta2dpd/bta2dpd/sbc_encode.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: Thu Jul 20 11:59:04 UTC 2023 Modified Files: src/sys/dev/usb: xhci.c Log Message: xhci(4): Don't panic on suspend if previous suspend/resume failed. Trying to resume again probably won't make the situation much worse, but panicking can definitely make it worse. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.179 -r1.180 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.179 src/sys/dev/usb/xhci.c:1.180 --- src/sys/dev/usb/xhci.c:1.179 Mon Jun 5 03:44:47 2023 +++ src/sys/dev/usb/xhci.c Thu Jul 20 11:59:04 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: xhci.c,v 1.179 2023/06/05 03:44:47 mlelstv Exp $ */ +/* $NetBSD: xhci.c,v 1.180 2023/07/20 11:59:04 riastradh Exp $ */ /* * Copyright (c) 2013 Jonathan A. Kollasch @@ -34,7 +34,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.179 2023/06/05 03:44:47 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.180 2023/07/20 11:59:04 riastradh Exp $"); #ifdef _KERNEL_OPT #include "opt_usb.h" @@ -700,7 +700,6 @@ xhci_suspend(device_t self, const pmf_qu */ mutex_enter(>sc_lock); KASSERT(sc->sc_suspender == NULL); - KASSERT(!sc->sc_suspendresume_failed); sc->sc_suspender = curlwp; while (sc->sc_command_addr != 0) cv_wait(>sc_cmdbusy_cv, >sc_lock);
CVS commit: src/sys/dev/usb
Module Name:src Committed By: riastradh Date: Thu Jul 20 11:59:04 UTC 2023 Modified Files: src/sys/dev/usb: xhci.c Log Message: xhci(4): Don't panic on suspend if previous suspend/resume failed. Trying to resume again probably won't make the situation much worse, but panicking can definitely make it worse. XXX pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.179 -r1.180 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: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Thu Jul 20 10:13:10 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #239 To generate a diff of this commit: cvs rdiff -u -r1.1.2.83 -r1.1.2.84 src/doc/CHANGES-10.0 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-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.83 src/doc/CHANGES-10.0:1.1.2.84 --- src/doc/CHANGES-10.0:1.1.2.83 Wed Jul 19 14:34:14 2023 +++ src/doc/CHANGES-10.0 Thu Jul 20 10:13:10 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.83 2023/07/19 14:34:14 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.84 2023/07/20 10:13:10 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -3017,3 +3017,83 @@ sys/arch/xen/xen/xen_clock.c 1.10,1.12 boot up, which could cause a hardclock() storm. [bouyer, ticket #238] +lib/libgcc/libgcov/arch/earmv4/gcov-iov.h (apply patch) +lib/libgcc/libgcov/arch/earmv4eb/gcov-iov.h (apply patch) +lib/libstdc++-v3/arch/earmv4/c++config.h (apply patch) +lib/libstdc++-v3/arch/earmv4/gstdint.h (apply patch) +lib/libstdc++-v3/arch/earmv4/symver-config.h (apply patch) +lib/libstdc++-v3/arch/earmv4eb/c++config.h (apply patch) +lib/libstdc++-v3/arch/earmv4eb/gstdint.h (apply patch) +lib/libstdc++-v3/arch/earmv4eb/symver-config.h (apply patch) +usr.bin/gcc/arch/earmv4/bversion.h (apply patch) +usr.bin/gcc/arch/earmv4/configargs.h (apply patch) +usr.bin/gcc/arch/earmv4/defs.mk (apply patch) +usr.bin/gcc/arch/earmv4/plugin-version.h (apply patch) +usr.bin/gcc/arch/earmv4eb/bversion.h (apply patch) +usr.bin/gcc/arch/earmv4eb/configargs.h (apply patch) +usr.bin/gcc/arch/earmv4eb/defs.mk (apply patch) +usr.bin/gcc/arch/earmv4eb/plugin-version.h (apply patch) +lib/libbacktrace/arch/coldfire/backtrace-supported.h (delete) +lib/libbacktrace/arch/coldfire/config.h (delete) +lib/libbacktrace/arch/or1k/backtrace-supported.h (delete) +lib/libbacktrace/arch/or1k/config.h (delete) +lib/libgcc/arch/coldfire/auto-target.h (delete) +lib/libgcc/arch/coldfire/defs.mk (delete) +lib/libgcc/arch/or1k/auto-target.h (delete) +lib/libgcc/arch/or1k/defs.mk(delete) +lib/libgcc/libgcov/arch/coldfire/defs.mk (delete) +lib/libgcc/libgcov/arch/coldfire/gcov-iov.h (delete) +lib/libgcc/libgcov/arch/or1k/defs.mk (delete) +lib/libgcc/libgcov/arch/or1k/gcov-iov.h (delete) +lib/libgomp/arch/coldfire/config.h (delete) +lib/libgomp/arch/coldfire/libgomp.spec (delete) +lib/libgomp/arch/coldfire/libgomp_f.h (delete) +lib/libgomp/arch/coldfire/omp.h lib/libgomp/arch/or1k/config.h (delete) +lib/libgomp/arch/or1k/libgomp.spec (delete) +lib/libgomp/arch/or1k/libgomp_f.h lib/libgomp/arch/or1k/omp.h (delete) +lib/libiberty/arch/coldfire/config.h (delete) +lib/libiberty/arch/or1k/config.h (delete) +lib/libobjc/arch/coldfire/config.h (delete) +lib/libobjc/arch/coldfire/defs.mk (delete) +lib/libobjc/arch/or1k/config.h lib/libobjc/arch/or1k/defs.mk (delete) +lib/libstdc++-v3/arch/coldfire/c++config.h (delete) +lib/libstdc++-v3/arch/coldfire/cxxabi_tweaks.h (delete) +lib/libstdc++-v3/arch/coldfire/defs.mk (delete) +lib/libstdc++-v3/arch/coldfire/gstdint.h (delete) +lib/libstdc++-v3/arch/or1k/c++config.h (delete) +lib/libstdc++-v3/arch/or1k/cxxabi_tweaks.h (delete) +lib/libstdc++-v3/arch/or1k/defs.mk (delete) +lib/libstdc++-v3/arch/or1k/gstdint.h (delete) +usr.bin/gcc/arch/coldfire/all-tree.def (delete) +usr.bin/gcc/arch/coldfire/auto-host.h (delete) +usr.bin/gcc/arch/coldfire/bconfig.h (delete) +usr.bin/gcc/arch/coldfire/bversion.h (delete) +usr.bin/gcc/arch/coldfire/config.h (delete) +usr.bin/gcc/arch/coldfire/configargs.h (delete) +usr.bin/gcc/arch/coldfire/defs.mk (delete) +usr.bin/gcc/arch/coldfire/gthr-default.h (delete) +usr.bin/gcc/arch/coldfire/gtyp-input.list (delete) +usr.bin/gcc/arch/coldfire/insn-modes.h (delete) +usr.bin/gcc/arch/coldfire/multilib.h (delete) +usr.bin/gcc/arch/coldfire/plugin-version.h (delete) +usr.bin/gcc/arch/coldfire/tm.h(delete) +usr.bin/gcc/arch/or1k/all-tree.def (delete) +usr.bin/gcc/arch/or1k/auto-host.h (delete) +usr.bin/gcc/arch/or1k/bconfig.h(delete) +usr.bin/gcc/arch/or1k/bversion.h (delete) +usr.bin/gcc/arch/or1k/config.h(delete) +usr.bin/gcc/arch/or1k/configargs.h (delete) +usr.bin/gcc/arch/or1k/defs.mk(delete) +usr.bin/gcc/arch/or1k/gthr-default.h (delete) +usr.bin/gcc/arch/or1k/gtyp-input.list (delete) +usr.bin/gcc/arch/or1k/multilib.h (delete) +usr.bin/gcc/arch/or1k/plugin-version.h (delete) +usr.bin/gcc/arch/or1k/tm.h(delete) +usr.bin/libcpp/arch/coldfire/config.h (delete) +usr.bin/libcpp/arch/or1k/config.h (delete) +usr.bin/libdecnumber/arch/coldfire/config.h (delete) +usr.bin/libdecnumber/arch/or1k/config.h (delete) + + Finish mknative/regen and remove unused
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Thu Jul 20 10:13:10 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ticket #239 To generate a diff of this commit: cvs rdiff -u -r1.1.2.83 -r1.1.2.84 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/external/gpl3/gcc
Module Name:src Committed By: martin Date: Thu Jul 20 09:30:48 UTC 2023 Modified Files: src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv4 [netbsd-10]: gcov-iov.h src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv4eb [netbsd-10]: gcov-iov.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4 [netbsd-10]: c++config.h gstdint.h symver-config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb [netbsd-10]: c++config.h gstdint.h symver-config.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4 [netbsd-10]: bversion.h configargs.h defs.mk plugin-version.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb [netbsd-10]: bversion.h configargs.h defs.mk plugin-version.h Removed Files: src/external/gpl3/gcc/lib/libbacktrace/arch/coldfire [netbsd-10]: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/or1k [netbsd-10]: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libgcc/arch/coldfire [netbsd-10]: auto-target.h defs.mk src/external/gpl3/gcc/lib/libgcc/arch/or1k [netbsd-10]: auto-target.h defs.mk src/external/gpl3/gcc/lib/libgcc/libgcov/arch/coldfire [netbsd-10]: defs.mk gcov-iov.h src/external/gpl3/gcc/lib/libgcc/libgcov/arch/or1k [netbsd-10]: defs.mk gcov-iov.h src/external/gpl3/gcc/lib/libgomp/arch/coldfire [netbsd-10]: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/or1k [netbsd-10]: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libiberty/arch/coldfire [netbsd-10]: config.h src/external/gpl3/gcc/lib/libiberty/arch/or1k [netbsd-10]: config.h src/external/gpl3/gcc/lib/libobjc/arch/coldfire [netbsd-10]: config.h defs.mk src/external/gpl3/gcc/lib/libobjc/arch/or1k [netbsd-10]: config.h defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire [netbsd-10]: c++config.h cxxabi_tweaks.h defs.mk gstdint.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/or1k [netbsd-10]: c++config.h cxxabi_tweaks.h defs.mk gstdint.h src/external/gpl3/gcc/usr.bin/gcc/arch/coldfire [netbsd-10]: all-tree.def auto-host.h bconfig.h bversion.h config.h configargs.h defs.mk gthr-default.h gtyp-input.list insn-modes.h multilib.h plugin-version.h tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/or1k [netbsd-10]: all-tree.def auto-host.h bconfig.h bversion.h config.h configargs.h defs.mk gthr-default.h gtyp-input.list multilib.h plugin-version.h tm.h src/external/gpl3/gcc/usr.bin/libcpp/arch/coldfire [netbsd-10]: config.h src/external/gpl3/gcc/usr.bin/libcpp/arch/or1k [netbsd-10]: config.h src/external/gpl3/gcc/usr.bin/libdecnumber/arch/coldfire [netbsd-10]: config.h src/external/gpl3/gcc/usr.bin/libdecnumber/arch/or1k [netbsd-10]: config.h Log Message: Apply patch, requested by mrg in ticket #239: lib/libgcc/libgcov/arch/earmv4/gcov-iov.h lib/libgcc/libgcov/arch/earmv4eb/gcov-iov.h lib/libstdc++-v3/arch/earmv4/c++config.h lib/libstdc++-v3/arch/earmv4/gstdint.h lib/libstdc++-v3/arch/earmv4/symver-config.h lib/libstdc++-v3/arch/earmv4eb/c++config.h lib/libstdc++-v3/arch/earmv4eb/gstdint.h lib/libstdc++-v3/arch/earmv4eb/symver-config.h usr.bin/gcc/arch/earmv4/bversion.h usr.bin/gcc/arch/earmv4/configargs.h usr.bin/gcc/arch/earmv4/defs.mk usr.bin/gcc/arch/earmv4/plugin-version.h usr.bin/gcc/arch/earmv4eb/bversion.h usr.bin/gcc/arch/earmv4eb/configargs.h usr.bin/gcc/arch/earmv4eb/defs.mk usr.bin/gcc/arch/earmv4eb/plugin-version.h regen, missed in previous mknative run. Cleanup old (no longer used) configs and remove: lib/libbacktrace/arch/coldfire/backtrace-supported.h lib/libbacktrace/arch/coldfire/config.h lib/libbacktrace/arch/or1k/backtrace-supported.h lib/libbacktrace/arch/or1k/config.h lib/libgcc/arch/coldfire/auto-target.h lib/libgcc/arch/coldfire/defs.mk lib/libgcc/arch/or1k/auto-target.h lib/libgcc/arch/or1k/defs.mk lib/libgcc/libgcov/arch/coldfire/defs.mk lib/libgcc/libgcov/arch/coldfire/gcov-iov.h lib/libgcc/libgcov/arch/or1k/defs.mk lib/libgcc/libgcov/arch/or1k/gcov-iov.h lib/libgomp/arch/coldfire/config.h lib/libgomp/arch/coldfire/libgomp.spec lib/libgomp/arch/coldfire/libgomp_f.h lib/libgomp/arch/coldfire/omp.h lib/libgomp/arch/or1k/config.h lib/libgomp/arch/or1k/libgomp.spec lib/libgomp/arch/or1k/libgomp_f.h lib/libgomp/arch/or1k/omp.h
CVS commit: [netbsd-10] src/external/gpl3/gcc
Module Name:src Committed By: martin Date: Thu Jul 20 09:30:48 UTC 2023 Modified Files: src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv4 [netbsd-10]: gcov-iov.h src/external/gpl3/gcc/lib/libgcc/libgcov/arch/earmv4eb [netbsd-10]: gcov-iov.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4 [netbsd-10]: c++config.h gstdint.h symver-config.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/earmv4eb [netbsd-10]: c++config.h gstdint.h symver-config.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4 [netbsd-10]: bversion.h configargs.h defs.mk plugin-version.h src/external/gpl3/gcc/usr.bin/gcc/arch/earmv4eb [netbsd-10]: bversion.h configargs.h defs.mk plugin-version.h Removed Files: src/external/gpl3/gcc/lib/libbacktrace/arch/coldfire [netbsd-10]: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libbacktrace/arch/or1k [netbsd-10]: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libgcc/arch/coldfire [netbsd-10]: auto-target.h defs.mk src/external/gpl3/gcc/lib/libgcc/arch/or1k [netbsd-10]: auto-target.h defs.mk src/external/gpl3/gcc/lib/libgcc/libgcov/arch/coldfire [netbsd-10]: defs.mk gcov-iov.h src/external/gpl3/gcc/lib/libgcc/libgcov/arch/or1k [netbsd-10]: defs.mk gcov-iov.h src/external/gpl3/gcc/lib/libgomp/arch/coldfire [netbsd-10]: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libgomp/arch/or1k [netbsd-10]: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libiberty/arch/coldfire [netbsd-10]: config.h src/external/gpl3/gcc/lib/libiberty/arch/or1k [netbsd-10]: config.h src/external/gpl3/gcc/lib/libobjc/arch/coldfire [netbsd-10]: config.h defs.mk src/external/gpl3/gcc/lib/libobjc/arch/or1k [netbsd-10]: config.h defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire [netbsd-10]: c++config.h cxxabi_tweaks.h defs.mk gstdint.h src/external/gpl3/gcc/lib/libstdc++-v3/arch/or1k [netbsd-10]: c++config.h cxxabi_tweaks.h defs.mk gstdint.h src/external/gpl3/gcc/usr.bin/gcc/arch/coldfire [netbsd-10]: all-tree.def auto-host.h bconfig.h bversion.h config.h configargs.h defs.mk gthr-default.h gtyp-input.list insn-modes.h multilib.h plugin-version.h tm.h src/external/gpl3/gcc/usr.bin/gcc/arch/or1k [netbsd-10]: all-tree.def auto-host.h bconfig.h bversion.h config.h configargs.h defs.mk gthr-default.h gtyp-input.list multilib.h plugin-version.h tm.h src/external/gpl3/gcc/usr.bin/libcpp/arch/coldfire [netbsd-10]: config.h src/external/gpl3/gcc/usr.bin/libcpp/arch/or1k [netbsd-10]: config.h src/external/gpl3/gcc/usr.bin/libdecnumber/arch/coldfire [netbsd-10]: config.h src/external/gpl3/gcc/usr.bin/libdecnumber/arch/or1k [netbsd-10]: config.h Log Message: Apply patch, requested by mrg in ticket #239: lib/libgcc/libgcov/arch/earmv4/gcov-iov.h lib/libgcc/libgcov/arch/earmv4eb/gcov-iov.h lib/libstdc++-v3/arch/earmv4/c++config.h lib/libstdc++-v3/arch/earmv4/gstdint.h lib/libstdc++-v3/arch/earmv4/symver-config.h lib/libstdc++-v3/arch/earmv4eb/c++config.h lib/libstdc++-v3/arch/earmv4eb/gstdint.h lib/libstdc++-v3/arch/earmv4eb/symver-config.h usr.bin/gcc/arch/earmv4/bversion.h usr.bin/gcc/arch/earmv4/configargs.h usr.bin/gcc/arch/earmv4/defs.mk usr.bin/gcc/arch/earmv4/plugin-version.h usr.bin/gcc/arch/earmv4eb/bversion.h usr.bin/gcc/arch/earmv4eb/configargs.h usr.bin/gcc/arch/earmv4eb/defs.mk usr.bin/gcc/arch/earmv4eb/plugin-version.h regen, missed in previous mknative run. Cleanup old (no longer used) configs and remove: lib/libbacktrace/arch/coldfire/backtrace-supported.h lib/libbacktrace/arch/coldfire/config.h lib/libbacktrace/arch/or1k/backtrace-supported.h lib/libbacktrace/arch/or1k/config.h lib/libgcc/arch/coldfire/auto-target.h lib/libgcc/arch/coldfire/defs.mk lib/libgcc/arch/or1k/auto-target.h lib/libgcc/arch/or1k/defs.mk lib/libgcc/libgcov/arch/coldfire/defs.mk lib/libgcc/libgcov/arch/coldfire/gcov-iov.h lib/libgcc/libgcov/arch/or1k/defs.mk lib/libgcc/libgcov/arch/or1k/gcov-iov.h lib/libgomp/arch/coldfire/config.h lib/libgomp/arch/coldfire/libgomp.spec lib/libgomp/arch/coldfire/libgomp_f.h lib/libgomp/arch/coldfire/omp.h lib/libgomp/arch/or1k/config.h lib/libgomp/arch/or1k/libgomp.spec lib/libgomp/arch/or1k/libgomp_f.h lib/libgomp/arch/or1k/omp.h
