CVS commit: src/tests/kernel
Module Name:src
Committed By: gutteridge
Date: Mon Apr 3 21:35:59 UTC 2023
Modified Files:
src/tests/kernel: t_magic_symlinks.sh
Log Message:
t_magic_symlinks.sh: fix line continuation in realpath head()
This wasn't noticed before because the name of the head() itself was
wrong, and was being ignored.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/kernel/t_magic_symlinks.sh
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_magic_symlinks.sh
diff -u src/tests/kernel/t_magic_symlinks.sh:1.3 src/tests/kernel/t_magic_symlinks.sh:1.4
--- src/tests/kernel/t_magic_symlinks.sh:1.3 Mon Apr 3 20:08:38 2023
+++ src/tests/kernel/t_magic_symlinks.sh Mon Apr 3 21:35:59 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_magic_symlinks.sh,v 1.3 2023/04/03 20:08:38 gutteridge Exp $
+# $NetBSD: t_magic_symlinks.sh,v 1.4 2023/04/03 21:35:59 gutteridge Exp $
#
# Copyright (c) 2020 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -221,7 +221,7 @@ gid_cleanup() {
atf_test_case realpath cleanup
realpath_head() {
atf_set "require.user" "root"
- atf_set "descr" "Check that realpath(1) agrees with the "
+ atf_set "descr" "Check that realpath(1) agrees with the " \
"kernel on magic symlink(7)'s (PR lib/55361)"
}
CVS commit: src/tests/kernel
Module Name:src Committed By: gutteridge Date: Mon Apr 3 21:35:59 UTC 2023 Modified Files: src/tests/kernel: t_magic_symlinks.sh Log Message: t_magic_symlinks.sh: fix line continuation in realpath head() This wasn't noticed before because the name of the head() itself was wrong, and was being ignored. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/kernel/t_magic_symlinks.sh 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: gutteridge Date: Mon Apr 3 20:08:38 UTC 2023 Modified Files: src/tests/kernel: t_magic_symlinks.sh Log Message: t_magic_symlinks.sh: fix naming of head() of realpath test case Addresses part of PR kern/57319 from Jim Spath. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/kernel/t_magic_symlinks.sh 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: gutteridge
Date: Mon Apr 3 20:08:38 UTC 2023
Modified Files:
src/tests/kernel: t_magic_symlinks.sh
Log Message:
t_magic_symlinks.sh: fix naming of head() of realpath test case
Addresses part of PR kern/57319 from Jim Spath.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/kernel/t_magic_symlinks.sh
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_magic_symlinks.sh
diff -u src/tests/kernel/t_magic_symlinks.sh:1.2 src/tests/kernel/t_magic_symlinks.sh:1.3
--- src/tests/kernel/t_magic_symlinks.sh:1.2 Thu Dec 9 06:38:23 2021
+++ src/tests/kernel/t_magic_symlinks.sh Mon Apr 3 20:08:38 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_magic_symlinks.sh,v 1.2 2021/12/09 06:38:23 rillig Exp $
+# $NetBSD: t_magic_symlinks.sh,v 1.3 2023/04/03 20:08:38 gutteridge Exp $
#
# Copyright (c) 2020 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -219,7 +219,7 @@ gid_cleanup() {
# realpath(1)
#
atf_test_case realpath cleanup
-nointerpreter_head() {
+realpath_head() {
atf_set "require.user" "root"
atf_set "descr" "Check that realpath(1) agrees with the "
"kernel on magic symlink(7)'s (PR lib/55361)"
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Mon Apr 3 18:36:09 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ammend ticket #128 for additional pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.52 -r1.1.2.53 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.52 src/doc/CHANGES-10.0:1.1.2.53 --- src/doc/CHANGES-10.0:1.1.2.52 Sun Apr 2 10:53:06 2023 +++ src/doc/CHANGES-10.0 Mon Apr 3 18:36:09 2023 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.52 2023/04/02 10:53:06 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.53 2023/04/03 18:36:09 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -1524,8 +1524,11 @@ sys/dev/fss.c 1.114 [hannken, ticket #126] sys/dev/pci/if_vioif.c1.83-1.102,1.105-1.107 +sys/arch/mips/include/bus_space_defs.h 1.5 +sys/arch/mips/include/types.h 1.78 vioif(4): various bug fixes and code cleanup. + Add missing PRIuBUSSIZE to mips. [yamaguchi, ticket #128] sys/kern/vfs_xattr.c1.39
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Mon Apr 3 18:36:09 UTC 2023 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Ammend ticket #128 for additional pullups To generate a diff of this commit: cvs rdiff -u -r1.1.2.52 -r1.1.2.53 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/sys/arch/mips/include
Module Name:src Committed By: martin Date: Mon Apr 3 18:30:41 UTC 2023 Modified Files: src/sys/arch/mips/include [netbsd-10]: bus_space_defs.h types.h Log Message: Additionally pull up following revision(s) for ticket #128 to unbreak the build: sys/arch/mips/include/types.h: revision 1.78 sys/arch/mips/include/bus_space_defs.h: revision 1.5 Add missing PRIuBUSSIZE to mips. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.20.1 src/sys/arch/mips/include/bus_space_defs.h cvs rdiff -u -r1.77 -r1.77.4.1 src/sys/arch/mips/include/types.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/mips/include
Module Name:src Committed By: martin Date: Mon Apr 3 18:30:41 UTC 2023 Modified Files: src/sys/arch/mips/include [netbsd-10]: bus_space_defs.h types.h Log Message: Additionally pull up following revision(s) for ticket #128 to unbreak the build: sys/arch/mips/include/types.h: revision 1.78 sys/arch/mips/include/bus_space_defs.h: revision 1.5 Add missing PRIuBUSSIZE to mips. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.20.1 src/sys/arch/mips/include/bus_space_defs.h cvs rdiff -u -r1.77 -r1.77.4.1 src/sys/arch/mips/include/types.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/arch/mips/include/bus_space_defs.h diff -u src/sys/arch/mips/include/bus_space_defs.h:1.4 src/sys/arch/mips/include/bus_space_defs.h:1.4.20.1 --- src/sys/arch/mips/include/bus_space_defs.h:1.4 Sun Jul 26 08:08:41 2020 +++ src/sys/arch/mips/include/bus_space_defs.h Mon Apr 3 18:30:41 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: bus_space_defs.h,v 1.4 2020/07/26 08:08:41 simonb Exp $ */ +/* $NetBSD: bus_space_defs.h,v 1.4.20.1 2023/04/03 18:30:41 martin Exp $ */ /*- * Copyright (c) 1997, 1998, 2000, 2001 The NetBSD Foundation, Inc. @@ -112,11 +112,13 @@ typedef int64_t bus_addr_t; typedef uint64_t bus_size_t; #define PRIxBUSADDR PRIx64 #define PRIxBUSSIZE PRIx64 +#define PRIuBUSSIZE PRIu64 #else typedef paddr_t bus_addr_t; typedef psize_t bus_size_t; #define PRIxBUSADDR PRIxPADDR #define PRIxBUSSIZE PRIxPSIZE +#define PRIuBUSSIZE PRIuPSIZE #endif /* Index: src/sys/arch/mips/include/types.h diff -u src/sys/arch/mips/include/types.h:1.77 src/sys/arch/mips/include/types.h:1.77.4.1 --- src/sys/arch/mips/include/types.h:1.77 Thu Jul 7 10:06:02 2022 +++ src/sys/arch/mips/include/types.h Mon Apr 3 18:30:41 2023 @@ -1,4 +1,4 @@ -/* $NetBSD: types.h,v 1.77 2022/07/07 10:06:02 martin Exp $ */ +/* $NetBSD: types.h,v 1.77.4.1 2023/04/03 18:30:41 martin Exp $ */ /*- * Copyright (c) 1992, 1993 @@ -74,12 +74,14 @@ typedef __uint64_t psize_t; #define PRIxPADDR PRIx64 #define PRIxPSIZE PRIx64 #define PRIdPSIZE PRId64 +#define PRIuPSIZE PRIu64 #else typedef __uint32_t paddr_t; typedef __uint32_t psize_t; #define PRIxPADDR PRIx32 #define PRIxPSIZE PRIx32 #define PRIdPSIZE PRId32 +#define PRIuPSIZE PRIu32 #endif #ifdef _LP64 typedef __uint64_t vaddr_t;
CVS commit: src/sys
Module Name:src
Committed By: gutteridge
Date: Mon Apr 3 18:03:24 UTC 2023
Modified Files:
src/sys/dev/flash: flash_io.c
src/sys/fs/udf: udf_subr.c
src/sys/kern: subr_disk_mbr.c
Log Message:
Fix typos: s/trough/through/
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/flash/flash_io.c
cvs rdiff -u -r1.172 -r1.173 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.57 -r1.58 src/sys/kern/subr_disk_mbr.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/flash/flash_io.c
diff -u src/sys/dev/flash/flash_io.c:1.5 src/sys/dev/flash/flash_io.c:1.6
--- src/sys/dev/flash/flash_io.c:1.5 Tue Feb 25 18:30:09 2014
+++ src/sys/dev/flash/flash_io.c Mon Apr 3 18:03:23 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: flash_io.c,v 1.5 2014/02/25 18:30:09 pooka Exp $ */
+/* $NetBSD: flash_io.c,v 1.6 2023/04/03 18:03:23 gutteridge Exp $ */
/*-
* Copyright (c) 2011 Department of Software Engineering,
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: flash_io.c,v 1.5 2014/02/25 18:30:09 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: flash_io.c,v 1.6 2023/04/03 18:03:23 gutteridge Exp $");
#include
#include
@@ -83,7 +83,7 @@ flash_io_getblock(struct flash_io *fio,
last = (bp->b_rawblkno * DEV_BSIZE + bp->b_resid - 1)
/ fio->fio_if->erasesize;
- /* spans trough multiple blocks, needs special handling */
+ /* spans through multiple blocks, needs special handling */
if (last != block) {
printf("0x%jx -> 0x%jx\n",
bp->b_rawblkno * DEV_BSIZE,
Index: src/sys/fs/udf/udf_subr.c
diff -u src/sys/fs/udf/udf_subr.c:1.172 src/sys/fs/udf/udf_subr.c:1.173
--- src/sys/fs/udf/udf_subr.c:1.172 Mon Oct 31 21:22:06 2022
+++ src/sys/fs/udf/udf_subr.c Mon Apr 3 18:03:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_subr.c,v 1.172 2022/10/31 21:22:06 andvar Exp $ */
+/* $NetBSD: udf_subr.c,v 1.173 2023/04/03 18:03:24 gutteridge Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -29,7 +29,7 @@
#include
#ifndef lint
-__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.172 2022/10/31 21:22:06 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udf_subr.c,v 1.173 2023/04/03 18:03:24 gutteridge Exp $");
#endif /* not lint */
@@ -5530,7 +5530,7 @@ udf_loadvnode(struct mount *mp, struct v
udf_node->needs_indirect = needs_indirect;
/*
- * Go trough all allocations extents of this descriptor and when
+ * Go through all allocations extents of this descriptor and when
* encountering a redirect read in the allocation extension. These are
* daisy-chained.
*/
Index: src/sys/kern/subr_disk_mbr.c
diff -u src/sys/kern/subr_disk_mbr.c:1.57 src/sys/kern/subr_disk_mbr.c:1.58
--- src/sys/kern/subr_disk_mbr.c:1.57 Mon May 17 08:50:36 2021
+++ src/sys/kern/subr_disk_mbr.c Mon Apr 3 18:03:24 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_disk_mbr.c,v 1.57 2021/05/17 08:50:36 mrg Exp $ */
+/* $NetBSD: subr_disk_mbr.c,v 1.58 2023/04/03 18:03:24 gutteridge Exp $ */
/*
* Copyright (c) 1982, 1986, 1988 Regents of the University of California.
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.57 2021/05/17 08:50:36 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_disk_mbr.c,v 1.58 2023/04/03 18:03:24 gutteridge Exp $");
#ifdef _KERNEL_OPT
#include "opt_mbr.h"
@@ -330,7 +330,7 @@ scan_iso_vrs(mbr_args_t *a)
if (error)
return SCAN_CONTINUE;
- /* go trough all (data) tracks */
+ /* go through all (data) tracks */
sessionnr = -1;
for (tracknr = di.first_track;
tracknr <= di.first_track_last_session; tracknr++)
CVS commit: src/sys
Module Name:src Committed By: gutteridge Date: Mon Apr 3 18:03:24 UTC 2023 Modified Files: src/sys/dev/flash: flash_io.c src/sys/fs/udf: udf_subr.c src/sys/kern: subr_disk_mbr.c Log Message: Fix typos: s/trough/through/ To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/dev/flash/flash_io.c cvs rdiff -u -r1.172 -r1.173 src/sys/fs/udf/udf_subr.c cvs rdiff -u -r1.57 -r1.58 src/sys/kern/subr_disk_mbr.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/usermode/usermode
Module Name:src
Committed By: gutteridge
Date: Mon Apr 3 17:58:41 UTC 2023
Modified Files:
src/sys/arch/usermode/usermode: syscall.c
Log Message:
usermode/syscall.c: s/fall trough/FALLTHROUGH/ (KNF)
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/usermode/usermode/syscall.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/usermode/usermode/syscall.c
diff -u src/sys/arch/usermode/usermode/syscall.c:1.25 src/sys/arch/usermode/usermode/syscall.c:1.26
--- src/sys/arch/usermode/usermode/syscall.c:1.25 Sat Apr 6 11:54:21 2019
+++ src/sys/arch/usermode/usermode/syscall.c Mon Apr 3 17:58:41 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.25 2019/04/06 11:54:21 kamil Exp $ */
+/* $NetBSD: syscall.c,v 1.26 2023/04/03 17:58:41 gutteridge Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.25 2019/04/06 11:54:21 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.26 2023/04/03 17:58:41 gutteridge Exp $");
#include
#include
@@ -137,10 +137,10 @@ syscall(void)
//out:
switch (error) {
default:
- /* fall trough */
+ /* FALLTHROUGH */
case 0:
md_syscall_set_returnargs(l, ucp, error, rval);
- /* fall trough */
+ /* FALLTHROUGH */
case EJUSTRETURN:
break;
case ERESTART:
CVS commit: src/sys/arch/usermode/usermode
Module Name:src Committed By: gutteridge Date: Mon Apr 3 17:58:41 UTC 2023 Modified Files: src/sys/arch/usermode/usermode: syscall.c Log Message: usermode/syscall.c: s/fall trough/FALLTHROUGH/ (KNF) To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/arch/usermode/usermode/syscall.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/atomic
Module Name:src
Committed By: riastradh
Date: Mon Apr 3 16:45:46 UTC 2023
Modified Files:
src/common/lib/libc/atomic: atomic_is_lock_free.c
Log Message:
libc atomic: Make previous work a little less accidentally.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/atomic/atomic_is_lock_free.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/atomic/atomic_is_lock_free.c
diff -u src/common/lib/libc/atomic/atomic_is_lock_free.c:1.2 src/common/lib/libc/atomic/atomic_is_lock_free.c:1.3
--- src/common/lib/libc/atomic/atomic_is_lock_free.c:1.2 Mon Apr 3 08:00:28 2023
+++ src/common/lib/libc/atomic/atomic_is_lock_free.c Mon Apr 3 16:45:46 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_is_lock_free.c,v 1.2 2023/04/03 08:00:28 riastradh Exp $ */
+/* $NetBSD: atomic_is_lock_free.c,v 1.3 2023/04/03 16:45:46 riastradh Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: atomic_is_lock_free.c,v 1.2 2023/04/03 08:00:28 riastradh Exp $");
+__RCSID("$NetBSD: atomic_is_lock_free.c,v 1.3 2023/04/03 16:45:46 riastradh Exp $");
#include
@@ -38,9 +38,9 @@ __RCSID("$NetBSD: atomic_is_lock_free.c,
* C name be different but using an asm rename to define the right
* symbol.
*/
+bool __atomic_is_lock_free_hack(size_t, const volatile void *)
+__RENAME(__atomic_is_lock_free);
#define __atomic_is_lock_free __atomic_is_lock_free_hack
-bool __atomic_is_lock_free(size_t, const volatile void *)
-__RENAME("__atomic_is_lock_free");
bool
__atomic_is_lock_free(size_t n, const volatile void *p __unused)
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: riastradh Date: Mon Apr 3 16:45:46 UTC 2023 Modified Files: src/common/lib/libc/atomic: atomic_is_lock_free.c Log Message: libc atomic: Make previous work a little less accidentally. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/atomic/atomic_is_lock_free.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/atf/dist/tools
Module Name:src Committed By: gutteridge Date: Mon Apr 3 16:26:50 UTC 2023 Modified Files: src/external/bsd/atf/dist/tools: atf-run_test.sh Log Message: atf-run_test.sh: fix spelling of "through" Reported by Jim Spath in PR misc/57318. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/tools/atf-run_test.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/atf/dist/tools/atf-run_test.sh diff -u src/external/bsd/atf/dist/tools/atf-run_test.sh:1.1.1.1 src/external/bsd/atf/dist/tools/atf-run_test.sh:1.2 --- src/external/bsd/atf/dist/tools/atf-run_test.sh:1.1.1.1 Sat Feb 8 19:11:34 2014 +++ src/external/bsd/atf/dist/tools/atf-run_test.sh Mon Apr 3 16:26:50 2023 @@ -219,11 +219,11 @@ vflag_body() atf_check -s eq:1 -o ignore -e ignore -x \ "ATF_CONFDIR=$(pwd)/etc atf-run helper" -echo "Checking that defining 'testvar' trough '-v' works." +echo "Checking that defining 'testvar' through '-v' works." atf_check -s eq:0 -o match:'testvar: a value' -e ignore -x \ "ATF_CONFDIR=$(pwd)/etc atf-run -v testvar='a value' helper" -echo "Checking that defining 'testvar' trough the configuration" \ +echo "Checking that defining 'testvar' through the configuration" \ "file works." mkdir etc cat >etc/common.conf <>Atffile atf_check -s eq:0 -o match:'testvar: a value' -e ignore -x \ "ATF_CONFDIR=$(pwd)/etc atf-run helper" -echo "Checking that defining 'testvar' trough the configuration" \ +echo "Checking that defining 'testvar' through the configuration" \ "file overrides the one in the Atffile." mkdir etc cat >etc/common.conf <
CVS commit: src/external/bsd/atf/dist/tools
Module Name:src Committed By: gutteridge Date: Mon Apr 3 16:26:50 UTC 2023 Modified Files: src/external/bsd/atf/dist/tools: atf-run_test.sh Log Message: atf-run_test.sh: fix spelling of "through" Reported by Jim Spath in PR misc/57318. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/atf/dist/tools/atf-run_test.sh 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: mlelstv Date: Mon Apr 3 16:00:17 UTC 2023 Modified Files: src/sys/dev/usb: uaudio.c Log Message: Remove unconditional UAUDIO_DEBUG again. To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/sys/dev/usb/uaudio.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: mlelstv
Date: Mon Apr 3 16:00:17 UTC 2023
Modified Files:
src/sys/dev/usb: uaudio.c
Log Message:
Remove unconditional UAUDIO_DEBUG again.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/dev/usb/uaudio.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/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.176 src/sys/dev/usb/uaudio.c:1.177
--- src/sys/dev/usb/uaudio.c:1.176 Mon Apr 3 14:19:09 2023
+++ src/sys/dev/usb/uaudio.c Mon Apr 3 16:00:17 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.176 2023/04/03 14:19:09 mlelstv Exp $ */
+/* $NetBSD: uaudio.c,v 1.177 2023/04/03 16:00:17 mlelstv Exp $ */
/*
* Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.176 2023/04/03 14:19:09 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.177 2023/04/03 16:00:17 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -74,7 +74,6 @@ __KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1
#include
/* #define UAUDIO_DEBUG */
-#define UAUDIO_DEBUG
#define UAUDIO_MULTIPLE_ENDPOINTS
#ifdef UAUDIO_DEBUG
#define DPRINTF(x,y...) do { \
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mlelstv
Date: Mon Apr 3 14:19:09 UTC 2023
Modified Files:
src/sys/dev/usb: uaudio.c
Log Message:
Fix UAUDIO_DEBUG build.
To generate a diff of this commit:
cvs rdiff -u -r1.175 -r1.176 src/sys/dev/usb/uaudio.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/uaudio.c
diff -u src/sys/dev/usb/uaudio.c:1.175 src/sys/dev/usb/uaudio.c:1.176
--- src/sys/dev/usb/uaudio.c:1.175 Sun Apr 2 14:42:55 2023
+++ src/sys/dev/usb/uaudio.c Mon Apr 3 14:19:09 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: uaudio.c,v 1.175 2023/04/02 14:42:55 mlelstv Exp $ */
+/* $NetBSD: uaudio.c,v 1.176 2023/04/03 14:19:09 mlelstv Exp $ */
/*
* Copyright (c) 1999, 2012 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.175 2023/04/02 14:42:55 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1.176 2023/04/03 14:19:09 mlelstv Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -74,6 +74,7 @@ __KERNEL_RCSID(0, "$NetBSD: uaudio.c,v 1
#include
/* #define UAUDIO_DEBUG */
+#define UAUDIO_DEBUG
#define UAUDIO_MULTIPLE_ENDPOINTS
#ifdef UAUDIO_DEBUG
#define DPRINTF(x,y...) do { \
@@ -1493,9 +1494,8 @@ uaudio_add_clksrc(struct uaudio_softc *s
struct mixerctl mix;
d = iot[id].d.cu;
- DPRINTFN(2,"bUnitId=%d bNrInPins=%d\n",
- d->bUnitId, d->bNrInPins);
- mix.wIndex = MAKE(d->bClockId, sc->sc_ac_iface);
+ DPRINTFN(2,"bClockId=%d bmAttributes=%d bmControls=%d iClockSource=%d\n",
+ d->bClockId, d->bmAttributes, d->bmControls, d->iClockSource);
uaudio_determine_class([id], );
mix.nchan = 1;
mix.wValue[0] = MAKE(V2_CUR_CLKFREQ, 0);
@@ -1517,8 +1517,8 @@ uaudio_add_clksel(struct uaudio_softc *s
d = iot[id].d.lu;
sel = ((const uByte *)>baCSourceId[d->bNrInPins])[2]; /* iClockSelector */
- DPRINTFN(2,"bUnitId=%d bNrInPins=%d\n",
- d->bUnitId, d->bNrInPins);
+ DPRINTFN(2,"bClockId=%d bNrInPins=%d iClockSelector=%d\n",
+ d->bClockId, d->bNrInPins, sel);
mix.wIndex = MAKE(d->bClockId, sc->sc_ac_iface);
uaudio_determine_class([id], );
mix.nchan = 1;
@@ -1796,9 +1796,9 @@ uaudio_process_as(struct uaudio_softc *s
if (asid != NULL)
goto ignore;
asid = (const union usb_audio_streaming_interface_descriptor *) desc;
-DPRINTF("asid: bTerminalLink=%d wFormatTag=%d bmFormats bLength=%d\n",
+DPRINTF("asid: bTerminalLink=%d wFormatTag=%d bmFormats=0x%x bLength=%d\n",
asid->v1.bTerminalLink, UGETW(asid->v1.wFormatTag),
- UGETWD(asid->v1.bmFormats), asid->v1.bLength);
+ UGETDW(asid->v2.bmFormats), asid->v1.bLength);
break;
case FORMAT_TYPE:
if (asf1d != NULL)
@@ -2049,19 +2049,23 @@ leave:
return USBD_NORMAL_COMPLETION;
}
#ifdef UAUDIO_DEBUG
-/* XXXV2 */
- aprint_debug_dev(sc->sc_dev, "%s: %dch, %d/%dbit, %s,",
- dir == UE_DIR_IN ? "recording" : "playback",
- chan, prec, asf1d->v1.bSubFrameSize * 8, format_str);
- if (asf1d->bSamFreqType == UA_SAMP_CONTINUOUS) {
- aprint_debug(" %d-%dHz\n", UA_SAMP_LO(>v1),
- UA_SAMP_HI(>v1));
- } else {
- int r;
- aprint_debug(" %d", UA_GETSAMP(>v1, 0));
- for (r = 1; r < asf1d->bSamFreqType; r++)
- aprint_debug(",%d", UA_GETSAMP(>v1, r));
- aprint_debug("Hz\n");
+ switch (sc->sc_version) {
+ case UAUDIO_VERSION1:
+ aprint_debug_dev(sc->sc_dev, "%s: %dch, %d/%dbit, %s,",
+ dir == UE_DIR_IN ? "recording" : "playback",
+ chan, prec, asf1d->v1.bSubFrameSize * 8, format_str);
+ if (asf1d->v1.bSamFreqType == UA_SAMP_CONTINUOUS) {
+ aprint_debug(" %d-%dHz\n", UA_SAMP_LO(>v1),
+ UA_SAMP_HI(>v1));
+ } else {
+ int r;
+ aprint_debug(" %d", UA_GETSAMP(>v1, 0));
+ for (r = 1; r < asf1d->v1.bSamFreqType; r++)
+aprint_debug(",%d", UA_GETSAMP(>v1, r));
+ aprint_debug("Hz\n");
+ }
+ break;
+ /* XXX V2 */
}
#endif
ai.alt = id->bAlternateSetting;
@@ -2417,12 +2421,12 @@ uaudio_identify_ac(struct uaudio_softc *
printf("\n");
break;
case UDESCSUB_AC_CLKSRC:
- printf("AC_CLKSRC src=%d\n", iot[i].d.cu->bCSourceId);
+ printf("AC_CLKSRC src=%d\n", iot[i].d.cu->iClockSource);
break;
case UDESCSUB_AC_CLKSEL:
printf("AC_CLKSEL src=");
for (j = 0; j < iot[i].d.su->bNrInPins; j++)
-printf("%d ", iot[i].d.su->baCSourceId[j]);
+printf("%d ", iot[i].d.su->baSourceId[j]);
printf("\n");
break;
case UDESCSUB_AC_CLKMULT:
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mlelstv Date: Mon Apr 3 14:19:09 UTC 2023 Modified Files: src/sys/dev/usb: uaudio.c Log Message: Fix UAUDIO_DEBUG build. To generate a diff of this commit: cvs rdiff -u -r1.175 -r1.176 src/sys/dev/usb/uaudio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/common/lib/libc/atomic
Module Name:src
Committed By: riastradh
Date: Mon Apr 3 08:00:28 UTC 2023
Modified Files:
src/common/lib/libc/atomic: atomic_is_lock_free.c
Log Message:
libc __atomic_is_lock_free: Fix clang build with symbol hacks.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/atomic/atomic_is_lock_free.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/atomic/atomic_is_lock_free.c
diff -u src/common/lib/libc/atomic/atomic_is_lock_free.c:1.1 src/common/lib/libc/atomic/atomic_is_lock_free.c:1.2
--- src/common/lib/libc/atomic/atomic_is_lock_free.c:1.1 Thu Mar 30 15:03:36 2023
+++ src/common/lib/libc/atomic/atomic_is_lock_free.c Mon Apr 3 08:00:28 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: atomic_is_lock_free.c,v 1.1 2023/03/30 15:03:36 riastradh Exp $ */
+/* $NetBSD: atomic_is_lock_free.c,v 1.2 2023/04/03 08:00:28 riastradh Exp $ */
/*-
* Copyright (c) 2023 The NetBSD Foundation, Inc.
@@ -27,12 +27,21 @@
*/
#include
-__RCSID("$NetBSD: atomic_is_lock_free.c,v 1.1 2023/03/30 15:03:36 riastradh Exp $");
+__RCSID("$NetBSD: atomic_is_lock_free.c,v 1.2 2023/04/03 08:00:28 riastradh Exp $");
#include
#include
+/*
+ * XXX Work around clang's built-in __atomic_is_lock_free by having the
+ * C name be different but using an asm rename to define the right
+ * symbol.
+ */
+#define __atomic_is_lock_free __atomic_is_lock_free_hack
+bool __atomic_is_lock_free(size_t, const volatile void *)
+__RENAME("__atomic_is_lock_free");
+
bool
__atomic_is_lock_free(size_t n, const volatile void *p __unused)
{
CVS commit: src/common/lib/libc/atomic
Module Name:src Committed By: riastradh Date: Mon Apr 3 08:00:28 UTC 2023 Modified Files: src/common/lib/libc/atomic: atomic_is_lock_free.c Log Message: libc __atomic_is_lock_free: Fix clang build with symbol hacks. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/atomic/atomic_is_lock_free.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/arm/arm32
Module Name:src
Committed By: skrll
Date: Mon Apr 3 06:42:57 UTC 2023
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
Use PRI{u,x}{BUSSIZE,VADDR,PADDR} etc
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/arm/arm32/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.142 src/sys/arch/arm/arm32/bus_dma.c:1.143
--- src/sys/arch/arm/arm32/bus_dma.c:1.142 Mon Apr 3 06:39:10 2023
+++ src/sys/arch/arm/arm32/bus_dma.c Mon Apr 3 06:42:57 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.142 2023/04/03 06:39:10 skrll Exp $ */
+/* $NetBSD: bus_dma.c,v 1.143 2023/04/03 06:42:57 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2020 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include "opt_cputypes.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.142 2023/04/03 06:39:10 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.143 2023/04/03 06:42:57 skrll Exp $");
#include
@@ -184,7 +184,7 @@ _bus_dma_busaddr_to_paddr(bus_dma_tag_t
&& curaddr < dr->dr_busbase + dr->dr_len)
return curaddr - dr->dr_busbase + dr->dr_sysbase;
}
- panic("%s: curaddr %#lx not in range", __func__, curaddr);
+ panic("%s: curaddr %#" PRIxBUSADDR "not in range", __func__, curaddr);
}
/*
@@ -538,7 +538,7 @@ _bus_dmamap_load(bus_dma_tag_t t, bus_dm
map->dm_nsegs = 0;
map->_dm_buftype = _BUS_DMA_BUFTYPE_INVALID;
KASSERTMSG(map->dm_maxsegsz <= map->_dm_maxmaxsegsz,
- "dm_maxsegsz %lu _dm_maxmaxsegsz %lu",
+ "dm_maxsegsz %" PRIuBUSSIZE " _dm_maxmaxsegsz %" PRIuBUSSIZE,
map->dm_maxsegsz, map->_dm_maxmaxsegsz);
if (buflen > map->_dm_size)
@@ -612,7 +612,7 @@ _bus_dmamap_load_mbuf(bus_dma_tag_t t, b
map->dm_nsegs = 0;
map->_dm_buftype = _BUS_DMA_BUFTYPE_INVALID;
KASSERTMSG(map->dm_maxsegsz <= map->_dm_maxmaxsegsz,
- "dm_maxsegsz %lu _dm_maxmaxsegsz %lu",
+ "dm_maxsegsz %" PRIuBUSSIZE " _dm_maxmaxsegsz %" PRIuBUSSIZE,
map->dm_maxsegsz, map->_dm_maxmaxsegsz);
KASSERT(m0->m_flags & M_PKTHDR);
@@ -739,7 +739,7 @@ _bus_dmamap_load_uio(bus_dma_tag_t t, bu
map->dm_mapsize = 0;
map->dm_nsegs = 0;
KASSERTMSG(map->dm_maxsegsz <= map->_dm_maxmaxsegsz,
- "dm_maxsegsz %lu _dm_maxmaxsegsz %lu",
+ "dm_maxsegsz %" PRIuBUSSIZE " _dm_maxmaxsegsz %" PRIuBUSSIZE,
map->dm_maxsegsz, map->_dm_maxmaxsegsz);
resid = uio->uio_resid;
@@ -868,7 +868,7 @@ _bus_dmamap_sync_segment(vaddr_t va, pad
#endif
KASSERTMSG((va & PAGE_MASK) == (pa & PAGE_MASK),
- "va %#lx pa %#lx", va, pa);
+ "va %#" PRIxVADDR " pa %#" PRIxPADDR, va, pa);
#if 0
printf("sync_segment: va=%#lx pa=%#lx len=%#lx ops=%#x ro=%d\n",
va, pa, len, ops, readonly_p);
@@ -1107,10 +1107,10 @@ _bus_dmamap_sync(bus_dma_tag_t t, bus_dm
panic("%s: mix PRE and POST", __func__);
KASSERTMSG(offset < map->dm_mapsize,
- "offset %lu mapsize %lu",
+ "offset %" PRIxBUSADDR " mapsize %" PRIuBUSSIZE,
offset, map->dm_mapsize);
KASSERTMSG(len > 0 && offset + len <= map->dm_mapsize,
- "len %lu offset %lu mapsize %lu",
+ "len %" PRIuBUSSIZE " offset %" PRIxBUSADDR " mapsize %" PRIuBUSSIZE,
len, offset, map->dm_mapsize);
/*
@@ -1694,7 +1694,7 @@ _bus_dmamem_alloc_range(bus_dma_tag_t t,
int curseg, error;
KASSERTMSG(boundary == 0 || (boundary & (boundary - 1)) == 0,
- "invalid boundary %#lx", boundary);
+ "invalid boundary %#" PRIxBUSSIZE, boundary);
#ifdef DEBUG_DMA
printf("alloc_range: t=%p size=%#lx align=%#lx boundary=%#lx segs=%p nsegs=%#x rsegs=%p flags=%#x lo=%#lx hi=%#lx\n",
@@ -1743,8 +1743,10 @@ _bus_dmamem_alloc_range(bus_dma_tag_t t,
for (; m != NULL; m = TAILQ_NEXT(m, pageq.queue)) {
curaddr = VM_PAGE_TO_PHYS(m);
KASSERTMSG(low <= curaddr && curaddr < high,
- "uvm_pglistalloc returned non-sensicaladdress %#lx "
- "(low=%#lx, high=%#lx\n", curaddr, low, high);
+ "uvm_pglistalloc returned non-sensical "
+ "address %#" PRIxPADDR "(low=%#" PRIxPADDR
+ ", high=%#" PRIxPADDR "\n",
+ curaddr, low, high);
#ifdef DEBUG_DMA
printf("alloc: page %#lx\n", curaddr);
#endif /* DEBUG_DMA */
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: skrll
Date: Mon Apr 3 06:42:57 UTC 2023
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
Use PRI{u,x}{BUSSIZE,VADDR,PADDR} etc
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/arm/arm32/bus_dma.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/arm/arm32
Module Name:src
Committed By: skrll
Date: Mon Apr 3 06:39:10 UTC 2023
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
More KNF
To generate a diff of this commit:
cvs rdiff -u -r1.141 -r1.142 src/sys/arch/arm/arm32/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.141 src/sys/arch/arm/arm32/bus_dma.c:1.142
--- src/sys/arch/arm/arm32/bus_dma.c:1.141 Mon Apr 3 06:35:13 2023
+++ src/sys/arch/arm/arm32/bus_dma.c Mon Apr 3 06:39:10 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.141 2023/04/03 06:35:13 skrll Exp $ */
+/* $NetBSD: bus_dma.c,v 1.142 2023/04/03 06:39:10 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2020 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include "opt_cputypes.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.141 2023/04/03 06:35:13 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.142 2023/04/03 06:39:10 skrll Exp $");
#include
@@ -875,7 +875,7 @@ _bus_dmamap_sync_segment(vaddr_t va, pad
#endif
switch (ops) {
- case BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE:
+ case BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE:
if (!readonly_p) {
STAT_INCR(sync_prereadwrite);
cpu_dcache_wbinv_range(va, len);
@@ -932,7 +932,7 @@ _bus_dmamap_sync_segment(vaddr_t va, pad
* Since these can't be dirty, we can just invalidate them and don't
* have to worry about having to write back their contents.
*/
- case BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE:
+ case BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE:
STAT_INCR(sync_postreadwrite);
cpu_dcache_inv_range(va, len);
cpu_sdcache_inv_range(va, pa, len);
@@ -1102,8 +1102,8 @@ _bus_dmamap_sync(bus_dma_tag_t t, bus_dm
/*
* Mixing of PRE and POST operations is not allowed.
*/
- if ((ops & (BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE)) != 0 &&
- (ops & (BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE)) != 0)
+ if ((ops & (BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE)) != 0 &&
+ (ops & (BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE)) != 0)
panic("%s: mix PRE and POST", __func__);
KASSERTMSG(offset < map->dm_mapsize,
@@ -1121,7 +1121,7 @@ _bus_dmamap_sync(bus_dma_tag_t t, bus_dm
* here in case a write-back is required by the back-end.
*
* PREWRITE -- Write-back the D-cache. Note that if
- * we are doing a PREREAD|PREWRITE, we can collapse
+ * we are doing a PREREAD | PREWRITE, we can collapse
* the whole thing into a single Wb-Inv.
*
* POSTREAD -- Re-invalidate the D-cache in case speculative
@@ -1136,9 +1136,9 @@ _bus_dmamap_sync(bus_dma_tag_t t, bus_dm
const bool bouncing = false;
#endif
- const int pre_ops = ops & (BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
+ const int pre_ops = ops & (BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE);
#if defined(CPU_CORTEX) || defined(CPU_ARMV8)
- const int post_ops = ops & (BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE);
+ const int post_ops = ops & (BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
#else
const int post_ops = 0;
#endif
@@ -1199,7 +1199,7 @@ _bus_dmamap_sync(bus_dma_tag_t t, bus_dm
/* Skip cache frobbing if mapping was COHERENT */
if ((map->_dm_flags & _BUS_DMAMAP_COHERENT)) {
switch (ops) {
- case BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE:
+ case BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE:
STAT_INCR(sync_coherent_prereadwrite);
break;
@@ -1211,7 +1211,7 @@ _bus_dmamap_sync(bus_dma_tag_t t, bus_dm
STAT_INCR(sync_coherent_prewrite);
break;
- case BUS_DMASYNC_POSTREAD|BUS_DMASYNC_POSTWRITE:
+ case BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE:
STAT_INCR(sync_coherent_postreadwrite);
break;
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Mon Apr 3 06:39:10 UTC 2023 Modified Files: src/sys/arch/arm/arm32: bus_dma.c Log Message: More KNF To generate a diff of this commit: cvs rdiff -u -r1.141 -r1.142 src/sys/arch/arm/arm32/bus_dma.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/arm/arm32
Module Name:src Committed By: skrll Date: Mon Apr 3 06:35:14 UTC 2023 Modified Files: src/sys/arch/arm/arm32: bus_dma.c Log Message: Some KNF To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.141 src/sys/arch/arm/arm32/bus_dma.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/arm/arm32
Module Name:src
Committed By: skrll
Date: Mon Apr 3 06:35:14 UTC 2023
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
Some KNF
To generate a diff of this commit:
cvs rdiff -u -r1.140 -r1.141 src/sys/arch/arm/arm32/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.140 src/sys/arch/arm/arm32/bus_dma.c:1.141
--- src/sys/arch/arm/arm32/bus_dma.c:1.140 Mon Apr 3 06:33:55 2023
+++ src/sys/arch/arm/arm32/bus_dma.c Mon Apr 3 06:35:13 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.140 2023/04/03 06:33:55 skrll Exp $ */
+/* $NetBSD: bus_dma.c,v 1.141 2023/04/03 06:35:13 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2020 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include "opt_cputypes.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.140 2023/04/03 06:33:55 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.141 2023/04/03 06:35:13 skrll Exp $");
#include
@@ -384,7 +384,7 @@ _bus_dmamap_create(bus_dma_tag_t t, bus_
map->_dm_segcnt = nsegments;
map->_dm_maxmaxsegsz = maxsegsz;
map->_dm_boundary = boundary;
- map->_dm_flags = flags & ~(BUS_DMA_WAITOK|BUS_DMA_NOWAIT);
+ map->_dm_flags = flags & ~(BUS_DMA_WAITOK | BUS_DMA_NOWAIT);
map->_dm_origbuf = NULL;
map->_dm_buftype = _BUS_DMA_BUFTYPE_INVALID;
map->_dm_vmspace = vmspace_kernel();
@@ -640,8 +640,8 @@ _bus_dmamap_load_mbuf(bus_dma_tag_t t, b
error = EFAULT;
break;
}
- switch (m->m_flags & (M_EXT|M_EXT_CLUSTER|M_EXT_PAGES)) {
- case M_EXT|M_EXT_CLUSTER:
+ switch (m->m_flags & (M_EXT | M_EXT_CLUSTER | M_EXT_PAGES)) {
+ case M_EXT | M_EXT_CLUSTER:
/* XXX KDASSERT */
KASSERT(m->m_ext.ext_paddr != M_PADDR_INVALID);
paddr = m->m_ext.ext_paddr +
@@ -651,7 +651,7 @@ _bus_dmamap_load_mbuf(bus_dma_tag_t t, b
false);
break;
- case M_EXT|M_EXT_PAGES:
+ case M_EXT | M_EXT_PAGES:
KASSERT(m->m_ext.ext_buf <= m->m_data);
KASSERT(m->m_data <=
m->m_ext.ext_buf + m->m_ext.ext_size);
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: skrll
Date: Mon Apr 3 06:33:55 UTC 2023
Modified Files:
src/sys/arch/arm/arm32: bus_dma.c
Log Message:
spaces -> TAB
To generate a diff of this commit:
cvs rdiff -u -r1.139 -r1.140 src/sys/arch/arm/arm32/bus_dma.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm32/bus_dma.c
diff -u src/sys/arch/arm/arm32/bus_dma.c:1.139 src/sys/arch/arm/arm32/bus_dma.c:1.140
--- src/sys/arch/arm/arm32/bus_dma.c:1.139 Sat Feb 25 08:05:46 2023
+++ src/sys/arch/arm/arm32/bus_dma.c Mon Apr 3 06:33:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.139 2023/02/25 08:05:46 skrll Exp $ */
+/* $NetBSD: bus_dma.c,v 1.140 2023/04/03 06:33:55 skrll Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998, 2020 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include "opt_cputypes.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.139 2023/02/25 08:05:46 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bus_dma.c,v 1.140 2023/04/03 06:33:55 skrll Exp $");
#include
@@ -259,7 +259,7 @@ _bus_dmamap_load_paddr(bus_dma_tag_t t,
((segs[nseg - 1]._ds_flags ^ _ds_flags) & _BUS_DMAMAP_COHERENT) == 0 &&
(map->_dm_boundary == 0 ||
(segs[nseg - 1].ds_addr & bmask) == (curaddr & bmask))) {
- /* coalesce */
+ /* coalesce */
segs[nseg - 1].ds_len += sgsize;
} else if (nseg >= map->_dm_segcnt) {
return EFBIG;
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: skrll Date: Mon Apr 3 06:33:55 UTC 2023 Modified Files: src/sys/arch/arm/arm32: bus_dma.c Log Message: spaces -> TAB To generate a diff of this commit: cvs rdiff -u -r1.139 -r1.140 src/sys/arch/arm/arm32/bus_dma.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
