CVS commit: src

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Fri May  5 04:14:02 UTC 2023

Modified Files:
src/bin/chmod: chmod.1 chmod.c
src/usr.bin/chflags: chflags.1 chflags.c

Log Message:
If chown and chgrp can grow -d flags to suppress performing the
operation when it will have no effect (other than changing the
inode's ctime value) then chmod and chflags should also have -d
flags for the same purpose.   Make it so.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/bin/chmod/chmod.1
cvs rdiff -u -r1.38 -r1.39 src/bin/chmod/chmod.c
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/chflags/chflags.1
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/chflags/chflags.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/chmod/chmod.1
diff -u src/bin/chmod/chmod.1:1.28 src/bin/chmod/chmod.1:1.29
--- src/bin/chmod/chmod.1:1.28	Tue Jul  4 06:47:27 2017
+++ src/bin/chmod/chmod.1	Fri May  5 04:14:02 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: chmod.1,v 1.28 2017/07/04 06:47:27 wiz Exp $
+.\"	$NetBSD: chmod.1,v 1.29 2023/05/05 04:14:02 kre Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -44,7 +44,7 @@
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
-.Op Fl fh
+.Op Fl dfh
 .Ar mode
 .Ar
 .Nm
@@ -52,7 +52,7 @@
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
-.Op Fl fh
+.Op Fl dfh
 .Fl Fl reference=rfile
 .Ar
 .Sh DESCRIPTION
@@ -84,12 +84,18 @@ If the
 .Fl R
 option is specified, no symbolic links are followed.
 .It Fl R
-Change the modes of the file hierarchies rooted in the files
+Change the modes of the file hierarchies rooted in the
+.Ar file Ns s
 instead of just the files themselves.
+.It Fl d
+Do not attempt to change the mode of a
+.Ar file
+if its mode is already as requested.
 .It Fl f
 Do not display a diagnostic message or modify the exit status if
 .Nm
-fails to change the mode of a file.
+fails to change the mode of a
+.Ar file .
 .It Fl h
 If
 .Ar file

Index: src/bin/chmod/chmod.c
diff -u src/bin/chmod/chmod.c:1.38 src/bin/chmod/chmod.c:1.39
--- src/bin/chmod/chmod.c:1.38	Mon Oct 22 18:00:46 2012
+++ src/bin/chmod/chmod.c	Fri May  5 04:14:02 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: chmod.c,v 1.38 2012/10/22 18:00:46 christos Exp $ */
+/* $NetBSD: chmod.c,v 1.39 2023/05/05 04:14:02 kre Exp $ */
 
 /*
  * Copyright (c) 1989, 1993, 1994
@@ -40,7 +40,7 @@ __COPYRIGHT(
 #if 0
 static char sccsid[] = "@(#)chmod.c	8.8 (Berkeley) 4/1/94";
 #else
-__RCSID("$NetBSD: chmod.c,v 1.38 2012/10/22 18:00:46 christos Exp $");
+__RCSID("$NetBSD: chmod.c,v 1.39 2023/05/05 04:14:02 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -74,17 +74,17 @@ main(int argc, char *argv[])
 	FTS *ftsp;
 	FTSENT *p;
 	void *set;
-	mode_t mval;
-	int Hflag, Lflag, Rflag, ch, fflag, fts_options, hflag, rval;
+	mode_t mval, nval;
+	int Hflag, Lflag, Rflag, ch, dflag, fflag, fts_options, hflag, rval;
 	char *mode, *reference;
 	int (*change_mode)(const char *, mode_t);
 
 	setprogname(argv[0]);
 	(void)setlocale(LC_ALL, "");
 
-	Hflag = Lflag = Rflag = fflag = hflag = 0;
+	Hflag = Lflag = Rflag = dflag = fflag = hflag = 0;
 	reference = NULL;
-	while ((ch = getopt_long(argc, argv, "HLPRXfghorstuwx",
+	while ((ch = getopt_long(argc, argv, "HLPRXdfghorstuwx",
 	chmod_longopts, NULL)) != -1)
 		switch (ch) {
 		case 1:
@@ -104,6 +104,9 @@ main(int argc, char *argv[])
 		case 'R':
 			Rflag = 1;
 			break;
+		case 'd':
+			dflag = 1;
+			break;
 		case 'f':
 			fflag = 1;
 			break;
@@ -212,9 +215,10 @@ done:	argv += optind;
 		default:
 			break;
 		}
-		if ((*change_mode)(p->fts_accpath,
-		set ? getmode(set, p->fts_statp->st_mode) : mval)
-		&& !fflag) {
+		nval = set ? getmode(set, p->fts_statp->st_mode) : mval;
+		if (dflag && nval == p->fts_statp->st_mode)
+			continue;
+		if ((*change_mode)(p->fts_accpath, nval) && !fflag) {
 			warn("%s", p->fts_path);
 			rval = 1;
 		}
@@ -231,8 +235,8 @@ static void
 usage(void)
 {
 	(void)fprintf(stderr,
-	"Usage: %s [-R [-H | -L | -P]] [-fh] mode file ...\n"
-	"\t%s [-R [-H | -L | -P]] [-fh] --reference=rfile file ...\n",
+	"Usage: %s [-R [-H | -L | -P]] [-dfh] mode file ...\n"
+	"\t%s [-R [-H | -L | -P]] [-dfh] --reference=rfile file ...\n",
 	getprogname(), getprogname());
 	exit(1);
 	/* NOTREACHED */

Index: src/usr.bin/chflags/chflags.1
diff -u src/usr.bin/chflags/chflags.1:1.24 src/usr.bin/chflags/chflags.1:1.25
--- src/usr.bin/chflags/chflags.1:1.24	Tue Dec 17 09:54:08 2013
+++ src/usr.bin/chflags/chflags.1	Fri May  5 04:14:02 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: chflags.1,v 1.24 2013/12/17 09:54:08 apb Exp $
+.\"	$NetBSD: chflags.1,v 1.25 2023/05/05 04:14:02 kre Exp $
 .\"
 .\" Copyright (c) 1989, 1990, 1993, 1994
 .\"	The Regents of the University of California.  All rights reserved.
@@ -44,6 +44,7 @@
 .Fl R
 .Op Fl H | Fl L | Fl P
 .Oc
+.Op Fl d
 .Op Fl h
 .Ar flags
 .Ar
@@ -57,6 +58,11 @@ operand.
 .Pp
 The options 

CVS commit: src

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Fri May  5 04:14:02 UTC 2023

Modified Files:
src/bin/chmod: chmod.1 chmod.c
src/usr.bin/chflags: chflags.1 chflags.c

Log Message:
If chown and chgrp can grow -d flags to suppress performing the
operation when it will have no effect (other than changing the
inode's ctime value) then chmod and chflags should also have -d
flags for the same purpose.   Make it so.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/bin/chmod/chmod.1
cvs rdiff -u -r1.38 -r1.39 src/bin/chmod/chmod.c
cvs rdiff -u -r1.24 -r1.25 src/usr.bin/chflags/chflags.1
cvs rdiff -u -r1.17 -r1.18 src/usr.bin/chflags/chflags.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tests/kernel

[David H. Gutteridge]

Module Name:src
Committed By:   gutteridge
Date:   Fri May  5 01:27:18 UTC 2023

Modified Files:
src/tests/kernel: t_trapsignal.sh

Log Message:
t_trapsignal.sh: fix head() function definitions of test cases


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/kernel/t_trapsignal.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_trapsignal.sh
diff -u src/tests/kernel/t_trapsignal.sh:1.5 src/tests/kernel/t_trapsignal.sh:1.6
--- src/tests/kernel/t_trapsignal.sh:1.5	Sat Jan 26 16:44:30 2019
+++ src/tests/kernel/t_trapsignal.sh	Fri May  5 01:27:18 2023
@@ -1,4 +1,4 @@
-# $NetBSD: t_trapsignal.sh,v 1.5 2019/01/26 16:44:30 martin Exp $
+# $NetBSD: t_trapsignal.sh,v 1.6 2023/05/05 01:27:18 gutteridge Exp $
 #
 # Copyright (c) 2017 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -33,7 +33,7 @@ HELPER=$(atf_get_srcdir)/h_segv
 # SIGSEGV
 
 atf_test_case segv_simple
-segv_simple()
+segv_simple_head()
 {
 	atf_set "descr" "Test unhandled SIGSEGV with the right exit code"
 }
@@ -44,7 +44,7 @@ segv_simple_body()
 }
 
 atf_test_case segv_handle
-segv_handle()
+segv_handle_head()
 {
 	atf_set "descr" "Test handled SIGSEGV traps call the signal handler"
 }
@@ -55,7 +55,7 @@ segv_handle_body()
 }
 
 atf_test_case segv_mask
-segv_mask()
+segv_mask_head()
 {
 	atf_set "descr" "Test that masking SIGSEGV get reset"
 }
@@ -66,7 +66,7 @@ segv_mask_body()
 }
 
 atf_test_case segv_handle_mask
-segv_handle_mask()
+segv_handle_mask_head()
 {
 	atf_set "descr" "Test handled and masked SIGSEGV traps get reset"
 }
@@ -77,7 +77,7 @@ segv_handle_mask_body()
 }
 
 atf_test_case segv_handle_recurse
-segv_handle_recurse()
+segv_handle_recurse_head()
 {
 	atf_set "descr" "Test that receiving SIGSEGV in the handler resets"
 }
@@ -89,7 +89,7 @@ segv_handle_recurse_body()
 }
 
 atf_test_case segv_ignore
-segv_ignore()
+segv_ignore_head()
 {
 	atf_set "descr" "Test ignored SIGSEGV trap with right exit code"
 }
@@ -103,7 +103,7 @@ segv_ignore_body()
 # SIGTRAP
 
 atf_test_case trap_simple
-trap_simple()
+trap_simple_head()
 {
 	atf_set "descr" "Test unhandled SIGTRAP with the right exit code"
 }
@@ -114,7 +114,7 @@ trap_simple_body()
 }
 
 atf_test_case trap_handle
-trap_handle()
+trap_handle_head()
 {
 	atf_set "descr" "Test handled SIGTRAP traps call the signal handler"
 }
@@ -125,7 +125,7 @@ trap_handle_body()
 }
 
 atf_test_case trap_mask
-trap_mask()
+trap_mask_head()
 {
 	atf_set "descr" "Test that masking the trapped SIGTRAP signal get reset"
 }
@@ -136,7 +136,7 @@ trap_mask_body()
 }
 
 atf_test_case trap_handle_mask
-trap_handle_mask()
+trap_handle_mask_head()
 {
 	atf_set "descr" "Test handled and masked SIGTRAP traps get reset"
 }
@@ -147,7 +147,7 @@ trap_handle_mask_body()
 }
 
 atf_test_case trap_handle_recurse
-trap_handle_recurse()
+trap_handle_recurse_head()
 {
 	atf_set "descr" "Test that receiving SIGTRAP in the handler resets"
 }
@@ -159,7 +159,7 @@ trap_handle_recurse_body()
 }
 
 atf_test_case trap_ignore
-trap_ignore()
+trap_ignore_head()
 {
 	atf_set "descr" "Test ignored trap with right exit code"
 }
@@ -185,7 +185,7 @@ fpe_available()
 }
 
 atf_test_case fpe_simple
-fpe_simple()
+fpe_simple_head()
 {
 	atf_set "descr" "Test unhandled SIGFPE with the right exit code"
 }
@@ -197,7 +197,7 @@ fpe_simple_body()
 }
 
 atf_test_case fpe_handle
-fpe_handle()
+fpe_handle_head()
 {
 	atf_set "descr" "Test handled SIGFPE traps call the signal handler"
 }
@@ -209,7 +209,7 @@ fpe_handle_body()
 }
 
 atf_test_case fpe_mask
-fpe_mask()
+fpe_mask_head()
 {
 	atf_set "descr" "Test that masking the trapped SIGFPE signal get reset"
 }
@@ -221,7 +221,7 @@ fpe_mask_body()
 }
 
 atf_test_case fpe_handle_mask
-fpe_handle_mask()
+fpe_handle_mask_head()
 {
 	atf_set "descr" "Test handled and masked SIGFPE traps get reset"
 }
@@ -233,7 +233,7 @@ fpe_handle_mask_body()
 }
 
 atf_test_case fpe_handle_recurse
-fpe_handle_recurse()
+fpe_handle_recurse_head()
 {
 	atf_set "descr" "Test that receiving SIGFPE in the handler resets"
 }
@@ -246,7 +246,7 @@ fpe_handle_recurse_body()
 }
 
 atf_test_case fpe_ignore
-fpe_ignore()
+fpe_ignore_head()
 {
 	atf_set "descr" "Test ignored trap with right exit code"
 }
@@ -261,7 +261,7 @@ fpe_ignore_body()
 # SIGBUS
 
 atf_test_case bus_simple
-bus_simple()
+bus_simple_head()
 {
 	atf_set "descr" "Test unhandled SIGBUS with the right exit code"
 }
@@ -272,7 +272,7 @@ bus_simple_body()
 }
 
 atf_test_case bus_handle
-bus_handle()
+bus_handle_head()
 {
 	atf_set "descr" "Test handled SIGBUS traps call the signal handler"
 }
@@ -283,7 +283,7 @@ bus_handle_body()
 }
 
 atf_test_case bus_mask
-bus_mask()
+bus_mask_head()
 {
 	atf_set "descr" "Test that masking the trapped SIGBUS signal get reset"
 }
@@ -294,7 +294,7 @@ bus_mask_body()
 }
 
 atf_test_case bus_handle_mask
-bus_handle_mask()
+bus_handle_mask_head()
 {
 	atf_set "descr" "Test handled and masked SIGBUS 

CVS commit: src/tests/kernel

[David H. Gutteridge]

Module Name:src
Committed By:   gutteridge
Date:   Fri May  5 01:27:18 UTC 2023

Modified Files:
src/tests/kernel: t_trapsignal.sh

Log Message:
t_trapsignal.sh: fix head() function definitions of test cases


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/kernel/t_trapsignal.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src

[Emmanuel Dreyfus]

Module Name:src
Committed By:   manu
Date:   Fri May  5 00:34:41 UTC 2023

Modified Files:
src/share/man/man4: options.4
src/share/man/man8/man8.x86: boot.8
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/amd64/conf: files.amd64 std.amd64

Log Message:
Add a SELFRELOC kernel option for the sake of documentation clarity.

Instead of telling that x86/boot(8) reloc command needs a kernel able
to self relocate, we can tell it needs a kernel built with the
SELFRELOC option. This keeps the reader from wondering what could
make a kernel able to self relocate.


To generate a diff of this commit:
cvs rdiff -u -r1.523 -r1.524 src/share/man/man4/options.4
cvs rdiff -u -r1.27 -r1.28 src/share/man/man8/man8.x86/boot.8
cvs rdiff -u -r1.219 -r1.220 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/amd64/conf/files.amd64
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amd64/conf/std.amd64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src

[Emmanuel Dreyfus]

Module Name:src
Committed By:   manu
Date:   Fri May  5 00:34:41 UTC 2023

Modified Files:
src/share/man/man4: options.4
src/share/man/man8/man8.x86: boot.8
src/sys/arch/amd64/amd64: locore.S
src/sys/arch/amd64/conf: files.amd64 std.amd64

Log Message:
Add a SELFRELOC kernel option for the sake of documentation clarity.

Instead of telling that x86/boot(8) reloc command needs a kernel able
to self relocate, we can tell it needs a kernel built with the
SELFRELOC option. This keeps the reader from wondering what could
make a kernel able to self relocate.


To generate a diff of this commit:
cvs rdiff -u -r1.523 -r1.524 src/share/man/man4/options.4
cvs rdiff -u -r1.27 -r1.28 src/share/man/man8/man8.x86/boot.8
cvs rdiff -u -r1.219 -r1.220 src/sys/arch/amd64/amd64/locore.S
cvs rdiff -u -r1.120 -r1.121 src/sys/arch/amd64/conf/files.amd64
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amd64/conf/std.amd64

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.523 src/share/man/man4/options.4:1.524
--- src/share/man/man4/options.4:1.523	Sun Aug 28 14:29:05 2022
+++ src/share/man/man4/options.4	Fri May  5 00:34:41 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: options.4,v 1.523 2022/08/28 14:29:05 riastradh Exp $
+.\"	$NetBSD: options.4,v 1.524 2023/05/05 00:34:41 manu Exp $
 .\"
 .\" Copyright (c) 1996
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -1307,6 +1307,14 @@ See
 and
 .Xr vnconfig 8
 for more information.
+.It Cd options SELFRELOC
+Make the kernel able to self relocate at bootstrap, so that it can
+run whatever its load address is. 
+This is intented to be used withe the 
+.Ic reloc
+boostrap command documented in
+.Xr x86/boot 8 ,
+to workaround UEFI bugs, and is only available on amd64.
 .It Cd options SPLDEBUG
 Help the kernel programmer find bugs related to the interrupt priority
 level.

Index: src/share/man/man8/man8.x86/boot.8
diff -u src/share/man/man8/man8.x86/boot.8:1.27 src/share/man/man8/man8.x86/boot.8:1.28
--- src/share/man/man8/man8.x86/boot.8:1.27	Mon Apr 24 13:55:45 2023
+++ src/share/man/man8/man8.x86/boot.8	Fri May  5 00:34:40 2023
@@ -1,4 +1,4 @@
-.\"	$NetBSD: boot.8,v 1.27 2023/04/24 13:55:45 manu Exp $
+.\"	$NetBSD: boot.8,v 1.28 2023/05/05 00:34:40 manu Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -655,8 +655,10 @@ Reboot the system.
 .It Ic reloc Op Va default No \(or Va none No \(or Va address
 [Only UEFI boot] Sets where the kernel is copied by bootstrap
 before it is started. Values other than default require a kernel
-that can relocate itself at the right address, otherwise a crash
-occurs at boot time.
+built with the
+.Cd SELFRELOC
+option, so that can relocate itself at the right address,
+otherwise a crash occurs at boot time.
 .Bl -tag -width default
 .It Va default
 Copy the kernel at ELF header load address, this is the historical

Index: src/sys/arch/amd64/amd64/locore.S
diff -u src/sys/arch/amd64/amd64/locore.S:1.219 src/sys/arch/amd64/amd64/locore.S:1.220
--- src/sys/arch/amd64/amd64/locore.S:1.219	Thu Apr 20 00:42:23 2023
+++ src/sys/arch/amd64/amd64/locore.S	Fri May  5 00:34:41 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: locore.S,v 1.219 2023/04/20 00:42:23 manu Exp $	*/
+/*	$NetBSD: locore.S,v 1.220 2023/05/05 00:34:41 manu Exp $	*/
 
 /*
  * Copyright-o-rama!
@@ -156,6 +156,7 @@
 #include "opt_ddbparam.h"
 #include "opt_modular.h"
 #include "opt_realmem.h"
+#include "opt_selfreloc.h"
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_netbsd32.h"
@@ -456,6 +457,7 @@ ENTRY(start)
 #ifndef XENPV
 	.code32
 
+#ifdef SELFRELOC
 	call	next
 next:	pop	%edi
 	sub $(next - kernel_text), %edi 
@@ -463,6 +465,7 @@ next:	pop	%edi
 	/* If not KERNBASE, reloc ourselves to KERNBASE */
 	cmpl	$(KERNTEXTOFF_LO - KERNBASE_LO), %edi
 	jne	selfreloc_start
+#endif /* SELFRELOC */
 
 	/* Warm boot */
 	movw	$0x1234,0x472
@@ -1766,6 +1769,7 @@ LABEL(nomds_leave)
 	NOMDS_LEAVE
 LABEL(nomds_leave_end)
 
+#ifdef SELFRELOC
 /*
  * selfreloc(loadddr edi)
  * This is adapted from sys/arch/i386/i386/locore.S
@@ -1900,3 +1904,4 @@ gdtr:
 gdtrr:
 	.quad
 END(selfreloc_start)
+#endif /* SELFRELOC */

Index: src/sys/arch/amd64/conf/files.amd64
diff -u src/sys/arch/amd64/conf/files.amd64:1.120 src/sys/arch/amd64/conf/files.amd64:1.121
--- src/sys/arch/amd64/conf/files.amd64:1.120	Wed Oct 21 13:31:51 2020
+++ src/sys/arch/amd64/conf/files.amd64	Fri May  5 00:34:41 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: files.amd64,v 1.120 2020/10/21 13:31:51 christos Exp $
+#	$NetBSD: files.amd64,v 1.121 2023/05/05 00:34:41 manu Exp $
 #
 # new style config file for amd64 architecture
 #
@@ -20,6 +20,9 @@ defparam opt_physmem.h	PHYSMEM_MAX_ADDR 
 # Enable GCC spectre V2 mitigation options
 defflag opt_spectre.h	SPECTRE_V2_GCC_MITIGATION
 
+# Enable kernel self-relocation at 

CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Thu May  4 22:31:17 UTC 2023

Modified Files:
src/usr.bin/make: compat.c

Log Message:
Compat_RunCommand mark bp volatile

gcc 4.8.5 (NetBSD 7.2) gets upset about bp.


To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 src/usr.bin/make/compat.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.246 src/usr.bin/make/compat.c:1.247
--- src/usr.bin/make/compat.c:1.246	Sat Mar 18 22:20:11 2023
+++ src/usr.bin/make/compat.c	Thu May  4 22:31:17 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat.c,v 1.246 2023/03/18 22:20:11 sjg Exp $	*/
+/*	$NetBSD: compat.c,v 1.247 2023/05/04 22:31:17 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -91,7 +91,7 @@
 #include "pathnames.h"
 
 /*	"@(#)compat.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: compat.c,v 1.246 2023/03/18 22:20:11 sjg Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.247 2023/05/04 22:31:17 sjg Exp $");
 
 static GNode *curTarg = NULL;
 static pid_t compatChild;
@@ -221,7 +221,7 @@ bool
 Compat_RunCommand(const char *cmdp, GNode *gn, StringListNode *ln)
 {
 	char *cmdStart;		/* Start of expanded command */
-	char *bp;
+	char *volatile bp;
 	bool silent;		/* Don't print command */
 	bool doIt;		/* Execute even if -n */
 	volatile bool errCheck;	/* Check errors */

CVS commit: src/usr.bin/make

[Simon J. Gerraty]

Module Name:src
Committed By:   sjg
Date:   Thu May  4 22:31:17 UTC 2023

Modified Files:
src/usr.bin/make: compat.c

Log Message:
Compat_RunCommand mark bp volatile

gcc 4.8.5 (NetBSD 7.2) gets upset about bp.


To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 src/usr.bin/make/compat.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

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu May  4 18:57:28 UTC 2023

Modified Files:
src/doc [netbsd-10]: CHANGES-10.0

Log Message:
Ticket #156


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.60 -r1.1.2.61 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.60 src/doc/CHANGES-10.0:1.1.2.61
--- src/doc/CHANGES-10.0:1.1.2.60	Tue May  2 17:54:03 2023
+++ src/doc/CHANGES-10.0	Thu May  4 18:57:28 2023
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-10.0,v 1.1.2.60 2023/05/02 17:54:03 martin Exp $
+# $NetBSD: CHANGES-10.0,v 1.1.2.61 2023/05/04 18:57:28 martin Exp $
 
 A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16
 until the 10.0 release:
@@ -1732,3 +1732,9 @@ sys/arch/evbarm/tsarm/tsarm_machdep.c		1
 	is initialized.
 	[jmcneill, ticket #155]
 
+sys/arch/arm/sunxi/sunxi_thermal.c		1.15,1.16
+
+	sunxithermal(4): fix DTS bindings.
+	[jmcneill, ticket #156]
+
+

CVS commit: [netbsd-10] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu May  4 18:57:28 UTC 2023

Modified Files:
src/doc [netbsd-10]: CHANGES-10.0

Log Message:
Ticket #156


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.60 -r1.1.2.61 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/arm/sunxi

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu May  4 18:56:36 UTC 2023

Modified Files:
src/sys/arch/arm/sunxi [netbsd-10]: sunxi_thermal.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #156):

sys/arch/arm/sunxi/sunxi_thermal.c: revision 1.15
sys/arch/arm/sunxi/sunxi_thermal.c: revision 1.16

apparently the 'ahb' and 'ths' clocks were renamed to 'bus' and 'mod' in the

fdt at some point, so look for those as well
with this my pinebook's sensors work again

Cleanup previous: Try new bindings first, document old with DTCOMPAT, KNF


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.4.1 src/sys/arch/arm/sunxi/sunxi_thermal.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/sunxi/sunxi_thermal.c
diff -u src/sys/arch/arm/sunxi/sunxi_thermal.c:1.14 src/sys/arch/arm/sunxi/sunxi_thermal.c:1.14.4.1
--- src/sys/arch/arm/sunxi/sunxi_thermal.c:1.14	Sun Nov  7 17:11:58 2021
+++ src/sys/arch/arm/sunxi/sunxi_thermal.c	Thu May  4 18:56:36 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_thermal.c,v 1.14 2021/11/07 17:11:58 jmcneill Exp $ */
+/* $NetBSD: sunxi_thermal.c,v 1.14.4.1 2023/05/04 18:56:36 martin Exp $ */
 
 /*-
  * Copyright (c) 2016-2017 Jared McNeill 
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.14 2021/11/07 17:11:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_thermal.c,v 1.14.4.1 2023/05/04 18:56:36 martin Exp $");
 
 #include 
 #include 
@@ -520,14 +520,22 @@ sunxi_thermal_init_clocks(struct sunxi_t
 	struct clk *clk;
 	int error;
 
-	clk = fdtbus_clock_get(sc->phandle, "ahb");
+	clk = fdtbus_clock_get(sc->phandle, "bus");
+	if (clk == NULL) {
+		/* DTCOMPAT */
+		clk = fdtbus_clock_get(sc->phandle, "ahb");
+	}
 	if (clk) {
 		error = clk_enable(clk);
 		if (error != 0)
 			return error;
 	}
 
-	clk = fdtbus_clock_get(sc->phandle, "ths");
+	clk = fdtbus_clock_get(sc->phandle, "mod");
+	if (clk == NULL) {
+		/* DTCOMPAT */
+		clk = fdtbus_clock_get(sc->phandle, "ths");
+	}
 	if (clk) {
 		error = clk_set_rate(clk, sc->conf->clk_rate);
 		if (error != 0)

CVS commit: [netbsd-10] src/sys/arch/arm/sunxi

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu May  4 18:56:36 UTC 2023

Modified Files:
src/sys/arch/arm/sunxi [netbsd-10]: sunxi_thermal.c

Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #156):

sys/arch/arm/sunxi/sunxi_thermal.c: revision 1.15
sys/arch/arm/sunxi/sunxi_thermal.c: revision 1.16

apparently the 'ahb' and 'ths' clocks were renamed to 'bus' and 'mod' in the

fdt at some point, so look for those as well
with this my pinebook's sensors work again

Cleanup previous: Try new bindings first, document old with DTCOMPAT, KNF


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.4.1 src/sys/arch/arm/sunxi/sunxi_thermal.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sbin/chown

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May  4 18:34:55 UTC 2023

Modified Files:
src/sbin/chown: chown.c

Log Message:
KNF: no space after ( and before ), constants on the RHS (like everywhere else
in this file).


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sbin/chown/chown.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/chown/chown.c
diff -u src/sbin/chown/chown.c:1.11 src/sbin/chown/chown.c:1.12
--- src/sbin/chown/chown.c:1.11	Thu May  4 14:04:55 2023
+++ src/sbin/chown/chown.c	Thu May  4 14:34:55 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: chown.c,v 1.11 2023/05/04 18:04:55 martin Exp $	*/
+/*	$NetBSD: chown.c,v 1.12 2023/05/04 18:34:55 christos Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993, 1994, 2003
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
 #if 0
 static char sccsid[] = "@(#)chown.c	8.8 (Berkeley) 4/4/94";
 #else
-__RCSID("$NetBSD: chown.c,v 1.11 2023/05/04 18:04:55 martin Exp $");
+__RCSID("$NetBSD: chown.c,v 1.12 2023/05/04 18:34:55 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -242,9 +242,9 @@ main(int argc, char **argv)
 		 * attempt to update.
 		 */
 		if (dflag &&
-		( (uid_t)-1 == uid || p->fts_statp->st_uid == uid ) &&
-		( (gid_t)-1 == gid || p->fts_statp->st_gid == gid ) &&
-		( p->fts_statp->st_mode & 07000 ) == 0)
+		(uid == (uid_t)-1 || p->fts_statp->st_uid == uid) &&
+		(gid == (gid_t)-1 || p->fts_statp->st_gid == gid) &&
+		(p->fts_statp->st_mode & 07000) == 0)
 			continue;
 
 		if ((*change_owner)(p->fts_accpath, uid, gid) && !fflag) {

CVS commit: src/sbin/chown

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Thu May  4 18:34:55 UTC 2023

Modified Files:
src/sbin/chown: chown.c

Log Message:
KNF: no space after ( and before ), constants on the RHS (like everywhere else
in this file).


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sbin/chown/chown.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sbin/chown

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu May  4 18:04:55 UTC 2023

Modified Files:
src/sbin/chown: chown.c

Log Message:
Cast -1 to expected type and fix a edititing mishap to make this build.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sbin/chown/chown.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/chown/chown.c
diff -u src/sbin/chown/chown.c:1.10 src/sbin/chown/chown.c:1.11
--- src/sbin/chown/chown.c:1.10	Thu May  4 17:07:56 2023
+++ src/sbin/chown/chown.c	Thu May  4 18:04:55 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: chown.c,v 1.10 2023/05/04 17:07:56 pgoyette Exp $	*/
+/*	$NetBSD: chown.c,v 1.11 2023/05/04 18:04:55 martin Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993, 1994, 2003
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
 #if 0
 static char sccsid[] = "@(#)chown.c	8.8 (Berkeley) 4/4/94";
 #else
-__RCSID("$NetBSD: chown.c,v 1.10 2023/05/04 17:07:56 pgoyette Exp $");
+__RCSID("$NetBSD: chown.c,v 1.11 2023/05/04 18:04:55 martin Exp $");
 #endif
 #endif /* not lint */
 
@@ -242,9 +242,9 @@ main(int argc, char **argv)
 		 * attempt to update.
 		 */
 		if (dflag &&
-		( -1 == uid || p->fts_statp->st_uid == uid ) &&
-		( -1 == gid || p->fts_statp->st_gid == gid ) &&
-		( p->fts_statp->st_mode & 07000 ) == 0))
+		( (uid_t)-1 == uid || p->fts_statp->st_uid == uid ) &&
+		( (gid_t)-1 == gid || p->fts_statp->st_gid == gid ) &&
+		( p->fts_statp->st_mode & 07000 ) == 0)
 			continue;
 
 		if ((*change_owner)(p->fts_accpath, uid, gid) && !fflag) {

CVS commit: src/sbin/chown

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Thu May  4 18:04:55 UTC 2023

Modified Files:
src/sbin/chown: chown.c

Log Message:
Cast -1 to expected type and fix a edititing mishap to make this build.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sbin/chown/chown.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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 17:09:45 UTC 2023

Modified Files:
src/sys/arch/arm/imx: imx23_usb.c imxusb.c imxusbvar.h
src/sys/arch/arm/nxp: imx6_usb.c

Log Message:
The i.mx6sx has 2 OTG and one host-only USB controller, while the 6q has
only one OTG.
Add a "uintptr_t data" argument to all sc_*_md_hook callbacks, which
gets the sc_md_hook_data value when called.
In imx6_usb.c use this to pass the number of OTG controllers to the callbacks.
imx6_usb_init() can then properly call init_otg() or init_h1() for unit 1.

In imx6_usb_attach(), test if there is a vbus-supply property in the fdt,
and enable the regulator if present.

Now the USB port of the UDOO Neo works.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/imx23_usb.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/imx/imxusb.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/imxusbvar.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nxp/imx6_usb.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

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 17:09:45 UTC 2023

Modified Files:
src/sys/arch/arm/imx: imx23_usb.c imxusb.c imxusbvar.h
src/sys/arch/arm/nxp: imx6_usb.c

Log Message:
The i.mx6sx has 2 OTG and one host-only USB controller, while the 6q has
only one OTG.
Add a "uintptr_t data" argument to all sc_*_md_hook callbacks, which
gets the sc_md_hook_data value when called.
In imx6_usb.c use this to pass the number of OTG controllers to the callbacks.
imx6_usb_init() can then properly call init_otg() or init_h1() for unit 1.

In imx6_usb_attach(), test if there is a vbus-supply property in the fdt,
and enable the regulator if present.

Now the USB port of the UDOO Neo works.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/imx23_usb.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/imx/imxusb.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/imx/imxusbvar.h
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nxp/imx6_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/arch/arm/imx/imx23_usb.c
diff -u src/sys/arch/arm/imx/imx23_usb.c:1.5 src/sys/arch/arm/imx/imx23_usb.c:1.6
--- src/sys/arch/arm/imx/imx23_usb.c:1.5	Sat Aug  7 16:18:44 2021
+++ src/sys/arch/arm/imx/imx23_usb.c	Thu May  4 17:09:44 2023
@@ -1,4 +1,4 @@
-/* $Id: imx23_usb.c,v 1.5 2021/08/07 16:18:44 thorpej Exp $ */
+/* $Id: imx23_usb.c,v 1.6 2023/05/04 17:09:44 bouyer Exp $ */
 
 /*
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -152,7 +152,7 @@ imxusbc_search(device_t parent, cfdata_t
 }
 
 static
-void imx23_usb_init(struct imxehci_softc *sc)
+void imx23_usb_init(struct imxehci_softc *sc, uintptr_t data)
 {
 
 	sc->sc_iftype = IMXUSBC_IF_UTMI;

Index: src/sys/arch/arm/imx/imxusb.c
diff -u src/sys/arch/arm/imx/imxusb.c:1.18 src/sys/arch/arm/imx/imxusb.c:1.19
--- src/sys/arch/arm/imx/imxusb.c:1.18	Sat Aug  7 16:18:44 2021
+++ src/sys/arch/arm/imx/imxusb.c	Thu May  4 17:09:44 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: imxusb.c,v 1.18 2021/08/07 16:18:44 thorpej Exp $	*/
+/*	$NetBSD: imxusb.c,v 1.19 2023/05/04 17:09:44 bouyer Exp $	*/
 /*
  * Copyright (c) 2009, 2010  Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi and Hiroyuki Bessho for Genetec Corporation.
@@ -25,7 +25,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: imxusb.c,v 1.18 2021/08/07 16:18:44 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxusb.c,v 1.19 2023/05/04 17:09:44 bouyer Exp $");
 
 #include "locators.h"
 #include "opt_imx.h"
@@ -158,7 +158,7 @@ imxehci_attach(device_t parent, device_t
 
 	/* Platform dependent setup */
 	if (usbc->sc_init_md_hook)
-		usbc->sc_init_md_hook(sc);
+		usbc->sc_init_md_hook(sc, usbc->sc_md_hook_data);
 
 	imxehci_reset(sc);
 	imxehci_select_interface(sc, sc->sc_iftype);
@@ -178,7 +178,7 @@ imxehci_attach(device_t parent, device_t
 	}
 
 	if (usbc->sc_setup_md_hook)
-		usbc->sc_setup_md_hook(sc, IMXUSB_HOST);
+		usbc->sc_setup_md_hook(sc, IMXUSB_HOST, usbc->sc_md_hook_data);
 
 	if (sc->sc_iftype == IMXUSBC_IF_ULPI) {
 #if 0
@@ -202,7 +202,8 @@ imxehci_attach(device_t parent, device_t
 	EOWRITE4(hsc, EHCI_USBINTR, 0);
 
 	if (usbc->sc_intr_establish_md_hook)
-		sc->sc_ih = usbc->sc_intr_establish_md_hook(sc);
+		sc->sc_ih = usbc->sc_intr_establish_md_hook(sc,
+		usbc->sc_md_hook_data);
 	else if (aa->aa_irq > 0)
 		sc->sc_ih = intr_establish(aa->aa_irq, IPL_USB, IST_LEVEL, ehci_intr, hsc);
 	KASSERT(sc->sc_ih != NULL);

Index: src/sys/arch/arm/imx/imxusbvar.h
diff -u src/sys/arch/arm/imx/imxusbvar.h:1.6 src/sys/arch/arm/imx/imxusbvar.h:1.7
--- src/sys/arch/arm/imx/imxusbvar.h:1.6	Wed Jul 24 11:20:55 2019
+++ src/sys/arch/arm/imx/imxusbvar.h	Thu May  4 17:09:44 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: imxusbvar.h,v 1.6 2019/07/24 11:20:55 hkenken Exp $	*/
+/*	$NetBSD: imxusbvar.h,v 1.7 2023/05/04 17:09:44 bouyer Exp $	*/
 /*
  * Copyright (c) 2019  Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
@@ -48,9 +48,11 @@ struct imxusbc_softc {
 	bus_addr_t sc_ehci_offset;
 	bus_size_t sc_ehci_size;
 
-	void (* sc_init_md_hook)(struct imxehci_softc *);
-	void *(* sc_intr_establish_md_hook)(struct imxehci_softc *);
-	void (* sc_setup_md_hook)(struct imxehci_softc *, enum imx_usb_role);
+	void (* sc_init_md_hook)(struct imxehci_softc *, uintptr_t);
+	void *(* sc_intr_establish_md_hook)(struct imxehci_softc *, uintptr_t);
+	void (* sc_setup_md_hook)(struct imxehci_softc *, enum imx_usb_role,
+  uintptr_t);
+	uintptr_t sc_md_hook_data;
 };
 
 struct imxusbc_attach_args {

Index: src/sys/arch/arm/nxp/imx6_usb.c
diff -u src/sys/arch/arm/nxp/imx6_usb.c:1.7 src/sys/arch/arm/nxp/imx6_usb.c:1.8
--- src/sys/arch/arm/nxp/imx6_usb.c:1.7	Thu May  4 13:29:33 2023
+++ src/sys/arch/arm/nxp/imx6_usb.c	Thu May  4 17:09:45 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_usb.c,v 1.7 2023/05/04 13:29:33 bouyer Exp $	*/

CVS commit: src/sbin/chown

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu May  4 17:07:57 UTC 2023

Modified Files:
src/sbin/chown: chgrp.1 chown.8 chown.c

Log Message:
Add a -d flag to avoid changing a file's owner/group to the current
value.  This avoids some unnecessary operations on the file.

As discussed on tech-userlevel@


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/chown/chgrp.1
cvs rdiff -u -r1.12 -r1.13 src/sbin/chown/chown.8
cvs rdiff -u -r1.9 -r1.10 src/sbin/chown/chown.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/chown/chgrp.1
diff -u src/sbin/chown/chgrp.1:1.8 src/sbin/chown/chgrp.1:1.9
--- src/sbin/chown/chgrp.1:1.8	Tue Jul  4 06:52:20 2017
+++ src/sbin/chown/chgrp.1	Thu May  4 17:07:56 2023
@@ -29,9 +29,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\" from: @(#)chgrp.1	8.3 (Berkeley) 3/31/94
-.\"	$NetBSD: chgrp.1,v 1.8 2017/07/04 06:52:20 wiz Exp $
+.\"	$NetBSD: chgrp.1,v 1.9 2023/05/04 17:07:56 pgoyette Exp $
 .\"
-.Dd October 22, 2012
+.Dd May 1, 2023
 .Dt CHGRP 1
 .Os
 .Sh NAME
@@ -86,6 +86,10 @@ option is specified, no symbolic links a
 .It Fl R
 Change the group ID for the file hierarchies rooted
 in the files instead of just the files themselves.
+.It Fl d
+Do not attempt to update a file's group, nor update the file's
+set-user-id or set-group-id bits if they are already set to the
+desired values.
 .It Fl f
 The force option ignores errors, except for usage errors and doesn't
 query about strange modes (unless the user does not have proper permissions).
@@ -164,6 +168,8 @@ utility is expected to be POSIX 1003.2 c
 .Pp
 The
 .Fl v
-option and the use of ``#'' to force a numeric group ID
+and
+.Fl d
+options and the use of ``#'' to force a numeric group ID
 are extensions to
 .St -p1003.2 .

Index: src/sbin/chown/chown.8
diff -u src/sbin/chown/chown.8:1.12 src/sbin/chown/chown.8:1.13
--- src/sbin/chown/chown.8:1.12	Tue Jul  4 06:53:12 2017
+++ src/sbin/chown/chown.8	Thu May  4 17:07:56 2023
@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\" from: @(#)chown.8	8.3 (Berkeley) 3/31/94
-.\"	$NetBSD: chown.8,v 1.12 2017/07/04 06:53:12 wiz Exp $
+.\"	$NetBSD: chown.8,v 1.13 2023/05/04 17:07:56 pgoyette Exp $
 .\"
-.Dd September 11, 2016
+.Dd May 1, 2023
 .Dt CHOWN 8
 .Os
 .Sh NAME
@@ -84,6 +84,9 @@ option is specified, no symbolic links a
 .It Fl R
 Change the user ID and/or the group ID for the file hierarchies rooted
 in the files instead of just the files themselves.
+.It Fl d
+Do not attempt to update a file's owner or group or its set-user-id
+and set-group-id bits if they are all already set to the desired values.
 .It Fl f
 Do not report any failure to change file owner or group, nor modify
 the exit status to reflect such failures.
@@ -174,7 +177,9 @@ command is expected to be POSIX 1003.2 c
 .Pp
 The
 .Fl v
-option and the use of ``#'' to force a numeric lookup
+and
+.Fl d
+options and the use of ``#'' to force a numeric lookup
 are extensions to
 .St -p1003.2 .
 .Sh HISTORY

Index: src/sbin/chown/chown.c
diff -u src/sbin/chown/chown.c:1.9 src/sbin/chown/chown.c:1.10
--- src/sbin/chown/chown.c:1.9	Fri Apr 28 09:56:45 2023
+++ src/sbin/chown/chown.c	Thu May  4 17:07:56 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: chown.c,v 1.9 2023/04/28 09:56:45 pgoyette Exp $	*/
+/*	$NetBSD: chown.c,v 1.10 2023/05/04 17:07:56 pgoyette Exp $	*/
 
 /*
  * Copyright (c) 1988, 1993, 1994, 2003
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
 #if 0
 static char sccsid[] = "@(#)chown.c	8.8 (Berkeley) 4/4/94";
 #else
-__RCSID("$NetBSD: chown.c,v 1.9 2023/04/28 09:56:45 pgoyette Exp $");
+__RCSID("$NetBSD: chown.c,v 1.10 2023/05/04 17:07:56 pgoyette Exp $");
 #endif
 #endif /* not lint */
 
@@ -82,7 +82,7 @@ main(int argc, char **argv)
 {
 	FTS *ftsp;
 	FTSENT *p;
-	int Hflag, Lflag, Rflag, ch, fflag, fts_options, hflag, rval, vflag;
+	int Hflag, Lflag, Rflag, ch, fflag, fts_options, hflag, rval, vflag, dflag;
 	char *cp, *reference;
 	int (*change_owner)(const char *, uid_t, gid_t);
 
@@ -94,13 +94,16 @@ main(int argc, char **argv)
 	ischown = (myname[2] == 'o');
 	reference = NULL;
 
-	Hflag = Lflag = Rflag = fflag = hflag = vflag = 0;
-	while ((ch = getopt_long(argc, argv, "HLPRfhv",
+	Hflag = Lflag = Rflag = fflag = hflag = vflag = dflag = 0;
+	while ((ch = getopt_long(argc, argv, "HLPRdfhv",
 	chown_longopts, NULL)) != -1)
 		switch (ch) {
 		case 1:
 			reference = optarg;
 			break;
+		case 'd':
+			dflag = 1;
+			break;
 		case 'H':
 			Hflag = 1;
 			Lflag = 0;
@@ -232,6 +235,18 @@ main(int argc, char **argv)
 			break;
 		}
 
+		/*
+		 * If dflag was set, and the owner and group are already
+		 * set to the right values and the set-user-id and
+		 * set-group-id bits are both already clear, skip any
+		 * attempt to update.
+		 */
+		if (dflag &&
+		( -1 == uid || p->fts_statp->st_uid == uid ) &&
+		( -1 == gid || p->fts_statp->st_gid == gid ) &&
+		( 

CVS commit: src/sbin/chown

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Thu May  4 17:07:57 UTC 2023

Modified Files:
src/sbin/chown: chgrp.1 chown.8 chown.c

Log Message:
Add a -d flag to avoid changing a file's owner/group to the current
value.  This avoids some unnecessary operations on the file.

As discussed on tech-userlevel@


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sbin/chown/chgrp.1
cvs rdiff -u -r1.12 -r1.13 src/sbin/chown/chown.8
cvs rdiff -u -r1.9 -r1.10 src/sbin/chown/chown.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/sets/lists/dtb

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 13:41:46 UTC 2023

Modified Files:
src/distrib/sets/lists/dtb: ad.earmv7hf

Log Message:
Add imx6sx dtb files


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/dtb/ad.earmv7hf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/dtb/ad.earmv7hf
diff -u src/distrib/sets/lists/dtb/ad.earmv7hf:1.9 src/distrib/sets/lists/dtb/ad.earmv7hf:1.10
--- src/distrib/sets/lists/dtb/ad.earmv7hf:1.9	Sat Sep 10 15:54:11 2022
+++ src/distrib/sets/lists/dtb/ad.earmv7hf	Thu May  4 13:41:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: ad.earmv7hf,v 1.9 2022/09/10 15:54:11 rillig Exp $
+# $NetBSD: ad.earmv7hf,v 1.10 2023/05/04 13:41:46 bouyer Exp $
 #
 # DO NOT EDIT THIS FILE MANUALLY
 # Generated by "make update-sets" in sys/dtb
@@ -273,6 +273,16 @@
 ./boot/dtb/imx6qp-wandboard-revd1.dtbdtb-base-boot  dtb
 ./boot/dtb/imx6qp-zii-rdu2.dtb   dtb-base-boot  dtb
 ./boot/dtb/imx6s-dhcom-drc02.dtb dtb-base-boot  dtb
+./boot/dtb/imx6sx-nitrogen6sx.dtbdtb-base-boot  dtb
+./boot/dtb/imx6sx-sabreauto.dtb  dtb-base-boot  dtb
+./boot/dtb/imx6sx-sdb-mqs.dtbdtb-base-boot  dtb
+./boot/dtb/imx6sx-sdb-reva.dtb   dtb-base-boot  dtb
+./boot/dtb/imx6sx-sdb-sai.dtbdtb-base-boot  dtb
+./boot/dtb/imx6sx-sdb.dtbdtb-base-boot  dtb
+./boot/dtb/imx6sx-softing-vining-2000.dtbdtb-base-boot  dtb
+./boot/dtb/imx6sx-udoo-neo-basic.dtb dtb-base-boot  dtb
+./boot/dtb/imx6sx-udoo-neo-extended.dtb  dtb-base-boot  dtb
+./boot/dtb/imx6sx-udoo-neo-full.dtb  dtb-base-boot  dtb
 ./boot/dtb/imx7d-cl-som-imx7.dtb dtb-base-boot  dtb
 ./boot/dtb/imx7d-colibri-aster.dtb   dtb-base-boot  dtb
 ./boot/dtb/imx7d-colibri-emmc-aster.dtb  dtb-base-boot  dtb

CVS commit: src/distrib/sets/lists/dtb

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 13:41:46 UTC 2023

Modified Files:
src/distrib/sets/lists/dtb: ad.earmv7hf

Log Message:
Add imx6sx dtb files


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/dtb/ad.earmv7hf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/evbarm/conf

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 13:39:51 UTC 2023

Modified Files:
src/sys/arch/evbarm/conf: GENERIC

Log Message:
experimental IMX6SX support:
- add options SOC_IMX6SX
- add imx6sxccm device

tested on a UDOO Neo Full board.
known to work:
- uart (console)
- sdmmc0
- ethernet (enet0)

known to not work:
- USB (device not detected).

needs a modified device tree at this time (add arm,cortex-a9-twd-timer entry
copied from the imx6qdl dtsi); for unkown reason the imx6sx.dtsi file lacks
an entry for the a9ptmr although it is present in the soc (and, from what I
understood, in all cortex A9 SoCs).


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/evbarm/conf/GENERIC

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/evbarm/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.118 src/sys/arch/evbarm/conf/GENERIC:1.119
--- src/sys/arch/evbarm/conf/GENERIC:1.118	Sat Feb 25 08:19:35 2023
+++ src/sys/arch/evbarm/conf/GENERIC	Thu May  4 13:39:51 2023
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC,v 1.118 2023/02/25 08:19:35 skrll Exp $
+#	$NetBSD: GENERIC,v 1.119 2023/05/04 13:39:51 bouyer Exp $
 #
 #	GENERIC ARM (aarch32) kernel
 #
@@ -16,6 +16,7 @@ options 	SOC_EXYNOS5422
 options 	SOC_IMX6DL
 options 	SOC_IMX6Q
 options 	SOC_IMX6QDL
+options 	SOC_IMX6SX
 options 	SOC_IMX7D
 options 	SOC_MESON8B
 options 	SOC_OMAP3
@@ -136,7 +137,8 @@ cycvclkmgr* 	at fdt? pass 1		# Cyclone V
 cycvrstmgr* 	at fdt? pass 0		# Cyclone V reset manager
 exy5410clk* 	at fdt? pass 3		# Exynos5410 clock controller
 exy5422clk* 	at fdt? pass 3		# Exynos5422 clock controller
-imx6ccm* 	at fdt? pass 1		# i.MX6 CCM
+imx6ccm* 	at fdt? pass 1		# i.MX6Q* CCM
+imx6sxccm* 	at fdt? pass 1		# i.MX6SX CCM
 imx7dccm* 	at fdt? pass 2		# i.MX7D CCM
 meson8bclkc* 	at fdt? pass 2		# Amlogic Meson8b clock controller
 mesonresets* 	at fdt? pass 2		# Amlogic Meson misc. clock resets

CVS commit: src/sys/arch/evbarm/conf

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 13:39:51 UTC 2023

Modified Files:
src/sys/arch/evbarm/conf: GENERIC

Log Message:
experimental IMX6SX support:
- add options SOC_IMX6SX
- add imx6sxccm device

tested on a UDOO Neo Full board.
known to work:
- uart (console)
- sdmmc0
- ethernet (enet0)

known to not work:
- USB (device not detected).

needs a modified device tree at this time (add arm,cortex-a9-twd-timer entry
copied from the imx6qdl dtsi); for unkown reason the imx6sx.dtsi file lacks
an entry for the a9ptmr although it is present in the soc (and, from what I
understood, in all cortex A9 SoCs).


To generate a diff of this commit:
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/evbarm/conf/GENERIC

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dtb/arm

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 13:31:37 UTC 2023

Modified Files:
src/sys/dtb/arm: Makefile

Log Message:
Also build dtb files for CONFIG_SOC_IMX6SX


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dtb/arm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dtb/arm/Makefile
diff -u src/sys/dtb/arm/Makefile:1.5 src/sys/dtb/arm/Makefile:1.6
--- src/sys/dtb/arm/Makefile:1.5	Fri Nov 12 21:55:17 2021
+++ src/sys/dtb/arm/Makefile	Thu May  4 13:31:36 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2021/11/12 21:55:17 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.6 2023/05/04 13:31:36 bouyer Exp $
 
 DTSARCH=	arm
 DTSGNUARCH=	arm
@@ -12,6 +12,7 @@ DTSMAKEVARS=	CONFIG_SOC_AM33XX=y		\
 		CONFIG_ARCH_BCM2835=y		\
 		CONFIG_ARCH_EXYNOS5=y		\
 		CONFIG_SOC_IMX6Q=y		\
+		CONFIG_SOC_IMX6SX=y		\
 		CONFIG_SOC_IMX7D=y		\
 		CONFIG_MACH_MESON8=y		\
 		CONFIG_ARCH_OMAP3=y		\

CVS commit: src/sys/dtb/arm

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 13:31:37 UTC 2023

Modified Files:
src/sys/dtb/arm: Makefile

Log Message:
Also build dtb files for CONFIG_SOC_IMX6SX


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dtb/arm/Makefile

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/nxp

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 13:29:33 UTC 2023

Modified Files:
src/sys/arch/arm/nxp: imx6_gpc.c imx6_iomux.c imx6_pcie.c imx6_spi.c
imx6_usb.c imx6_usbphy.c imx_sdhc.c

Log Message:
Add i.mx6sx compatible entries to drivers that should work as is.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nxp/imx6_gpc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nxp/imx6_iomux.c \
src/sys/arch/arm/nxp/imx6_usbphy.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nxp/imx6_pcie.c \
src/sys/arch/arm/nxp/imx6_usb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nxp/imx6_spi.c \
src/sys/arch/arm/nxp/imx_sdhc.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/nxp/imx6_gpc.c
diff -u src/sys/arch/arm/nxp/imx6_gpc.c:1.3 src/sys/arch/arm/nxp/imx6_gpc.c:1.4
--- src/sys/arch/arm/nxp/imx6_gpc.c:1.3	Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/nxp/imx6_gpc.c	Thu May  4 13:29:33 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_gpc.c,v 1.3 2021/01/27 03:10:20 thorpej Exp $	*/
+/*	$NetBSD: imx6_gpc.c,v 1.4 2023/05/04 13:29:33 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: imx6_gpc.c,v 1.3 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_gpc.c,v 1.4 2023/05/04 13:29:33 bouyer Exp $");
 
 #include "opt_fdt.h"
 
@@ -66,6 +66,7 @@ CFATTACH_DECL_NEW(imxgpc, sizeof(struct 
 
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "fsl,imx6q-gpc" },
+	{ .compat = "fsl,imx6sx-gpc" },
 	DEVICE_COMPAT_EOL
 };
 

Index: src/sys/arch/arm/nxp/imx6_iomux.c
diff -u src/sys/arch/arm/nxp/imx6_iomux.c:1.2 src/sys/arch/arm/nxp/imx6_iomux.c:1.3
--- src/sys/arch/arm/nxp/imx6_iomux.c:1.2	Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/nxp/imx6_iomux.c	Thu May  4 13:29:33 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_iomux.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $	*/
+/*	$NetBSD: imx6_iomux.c,v 1.3 2023/05/04 13:29:33 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: imx6_iomux.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_iomux.c,v 1.3 2023/05/04 13:29:33 bouyer Exp $");
 
 #include "opt_fdt.h"
 
@@ -131,6 +131,7 @@ CFATTACH_DECL_NEW(imxiomux, sizeof(struc
 
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "fsl,imx6q-iomuxc" },
+	{ .compat = "fsl,imx6sx-iomuxc" },
 	{ .compat = "fsl,imx7d-iomuxc" },
 	{ .compat = "fsl,imx8mq-iomuxc" },
 	DEVICE_COMPAT_EOL
Index: src/sys/arch/arm/nxp/imx6_usbphy.c
diff -u src/sys/arch/arm/nxp/imx6_usbphy.c:1.2 src/sys/arch/arm/nxp/imx6_usbphy.c:1.3
--- src/sys/arch/arm/nxp/imx6_usbphy.c:1.2	Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/nxp/imx6_usbphy.c	Thu May  4 13:29:33 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_usbphy.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $	*/
+/*	$NetBSD: imx6_usbphy.c,v 1.3 2023/05/04 13:29:33 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: imx6_usbphy.c,v 1.2 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(1, "$NetBSD: imx6_usbphy.c,v 1.3 2023/05/04 13:29:33 bouyer Exp $");
 
 #include "opt_fdt.h"
 
@@ -63,6 +63,7 @@ CFATTACH_DECL_NEW(imxusbphy, sizeof(stru
 
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "fsl,imx6q-usbphy" },
+	{ .compat = "fsl,imx6sx-usbphy" },
 	DEVICE_COMPAT_EOL
 };
 

Index: src/sys/arch/arm/nxp/imx6_pcie.c
diff -u src/sys/arch/arm/nxp/imx6_pcie.c:1.6 src/sys/arch/arm/nxp/imx6_pcie.c:1.7
--- src/sys/arch/arm/nxp/imx6_pcie.c:1.6	Wed Jan 27 03:10:20 2021
+++ src/sys/arch/arm/nxp/imx6_pcie.c	Thu May  4 13:29:33 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_pcie.c,v 1.6 2021/01/27 03:10:20 thorpej Exp $	*/
+/*	$NetBSD: imx6_pcie.c,v 1.7 2023/05/04 13:29:33 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.6 2021/01/27 03:10:20 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_pcie.c,v 1.7 2023/05/04 13:29:33 bouyer Exp $");
 
 #include "opt_pci.h"
 #include "opt_fdt.h"
@@ -92,6 +92,7 @@ CFATTACH_DECL_NEW(imxpcie_fdt, sizeof(st
 static const struct device_compatible_entry compat_data[] = {
 	{ .compat = "fsl,imx6q-pcie",	.value = false },
 	{ .compat = "fsl,imx6qp-pcie",	.value = true },
+	{ .compat = "fsl,imx6sx-pcie",	.value = true },
 	DEVICE_COMPAT_EOL
 };
 
Index: src/sys/arch/arm/nxp/imx6_usb.c
diff -u src/sys/arch/arm/nxp/imx6_usb.c:1.6 src/sys/arch/arm/nxp/imx6_usb.c:1.7
--- src/sys/arch/arm/nxp/imx6_usb.c:1.6	Sat Aug  7 16:18:45 2021
+++ src/sys/arch/arm/nxp/imx6_usb.c	Thu May  4 13:29:33 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_usb.c,v 1.6 

CVS commit: src/sys/arch/arm/nxp

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 13:29:33 UTC 2023

Modified Files:
src/sys/arch/arm/nxp: imx6_gpc.c imx6_iomux.c imx6_pcie.c imx6_spi.c
imx6_usb.c imx6_usbphy.c imx_sdhc.c

Log Message:
Add i.mx6sx compatible entries to drivers that should work as is.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nxp/imx6_gpc.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nxp/imx6_iomux.c \
src/sys/arch/arm/nxp/imx6_usbphy.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nxp/imx6_pcie.c \
src/sys/arch/arm/nxp/imx6_usb.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nxp/imx6_spi.c \
src/sys/arch/arm/nxp/imx_sdhc.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/nxp

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 13:28:05 UTC 2023

Modified Files:
src/sys/arch/arm/nxp: imx6_platform.c imx6_reg.h

Log Message:
i.mx6sx platform support:
- the i.mx6sx has a third AIPS, so KERNEL_IO_IOREG map has to be larger
- the uart clock is at 24Mhz instead of 80.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nxp/imx6_platform.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nxp/imx6_reg.h

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/nxp

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 13:28:05 UTC 2023

Modified Files:
src/sys/arch/arm/nxp: imx6_platform.c imx6_reg.h

Log Message:
i.mx6sx platform support:
- the i.mx6sx has a third AIPS, so KERNEL_IO_IOREG map has to be larger
- the uart clock is at 24Mhz instead of 80.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nxp/imx6_platform.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nxp/imx6_reg.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/arm/nxp/imx6_platform.c
diff -u src/sys/arch/arm/nxp/imx6_platform.c:1.7 src/sys/arch/arm/nxp/imx6_platform.c:1.8
--- src/sys/arch/arm/nxp/imx6_platform.c:1.7	Fri Apr  7 08:55:30 2023
+++ src/sys/arch/arm/nxp/imx6_platform.c	Thu May  4 13:28:04 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_platform.c,v 1.7 2023/04/07 08:55:30 skrll Exp $	*/
+/*	$NetBSD: imx6_platform.c,v 1.8 2023/05/04 13:28:04 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2019 Genetec Corporation.  All rights reserved.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: imx6_platform.c,v 1.7 2023/04/07 08:55:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_platform.c,v 1.8 2023/05/04 13:28:04 bouyer Exp $");
 
 #include "arml2cc.h"
 #include "opt_console.h"
@@ -67,6 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: imx6_platfor
 #include 
 
 #define	IMX_REF_FREQ	8000
+#define	IMX6SX_REF_FREQ	2400
 
 #ifdef VERBOSE_INIT_ARM
 #define VPRINTF(...)	printf(__VA_ARGS__)
@@ -89,6 +90,18 @@ imx_platform_devmap(void)
 	return devmap;
 }
 
+static const struct pmap_devmap *
+imx6sx_platform_devmap(void)
+{
+	static const struct pmap_devmap devmap[] = {
+		DEVMAP_ENTRY(KERNEL_IO_IOREG_VBASE, IMX6_IOREG_PBASE, IMX6SX_IOREG_SIZE),
+		DEVMAP_ENTRY(KERNEL_IO_ARMCORE_VBASE, IMX6_ARMCORE_PBASE, IMX6_ARMCORE_SIZE),
+		DEVMAP_ENTRY_END
+	};
+
+	return devmap;
+}
+
 static void
 imx_platform_init_attach_args(struct fdt_attach_args *faa)
 {
@@ -140,6 +153,13 @@ imx_platform_uart_freq(void)
 	return IMX_REF_FREQ;
 }
 
+static u_int
+imx6sx_platform_uart_freq(void)
+{
+	return IMX6SX_REF_FREQ;
+}
+
+
 static void
 imx_platform_bootstrap(void)
 {
@@ -234,6 +254,18 @@ static const struct fdt_platform imx6_pl
 	.fp_mpstart = imx_platform_mpstart,
 };
 
+static const struct fdt_platform imx6sx_platform = {
+	.fp_devmap = imx6sx_platform_devmap,
+	.fp_bootstrap = imx_platform_bootstrap,
+	.fp_init_attach_args = imx_platform_init_attach_args,
+	.fp_device_register = imx_platform_device_register,
+	.fp_reset = imx6_platform_reset,
+	.fp_delay = a9ptmr_delay,
+	.fp_uart_freq = imx6sx_platform_uart_freq,
+	.fp_mpstart = imx_platform_mpstart,
+};
+
 FDT_PLATFORM(imx6dl, "fsl,imx6dl", _platform);
+FDT_PLATFORM(imx6sx, "fsl,imx6sx", _platform);
 FDT_PLATFORM(imx6q, "fsl,imx6q", _platform);
 FDT_PLATFORM(imx6qp, "fsl,imx6qp", _platform);

Index: src/sys/arch/arm/nxp/imx6_reg.h
diff -u src/sys/arch/arm/nxp/imx6_reg.h:1.1 src/sys/arch/arm/nxp/imx6_reg.h:1.2
--- src/sys/arch/arm/nxp/imx6_reg.h:1.1	Wed Dec 23 14:42:38 2020
+++ src/sys/arch/arm/nxp/imx6_reg.h	Thu May  4 13:28:04 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_reg.h,v 1.1 2020/12/23 14:42:38 skrll Exp $	*/
+/*	$NetBSD: imx6_reg.h,v 1.2 2023/05/04 13:28:04 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -34,6 +34,7 @@
 
 #define	IMX6_IOREG_PBASE	IMX6_AIPS1_BASE
 #define	IMX6_IOREG_SIZE		(IMX6_AIPS1_SIZE + IMX6_AIPS2_SIZE)
+#define	IMX6SX_IOREG_SIZE	(IMX6_AIPS1_SIZE + IMX6_AIPS2_SIZE + IMX6_AIPS3_SIZE)
 
 #define	IMX6_ARMCORE_PBASE	IMX6_MPCORE_BASE
 #define	IMX6_ARMCORE_SIZE	IMX6_MPCORE_SIZE
@@ -62,6 +63,9 @@
 #define	IMX6_SATA_BASE		0x0220
 #define	IMX6_SATA_SIZE		0x4000
 
+#define	IMX6_AIPS3_BASE		0x0220
+#define	IMX6_AIPS3_SIZE		0x0010
+
 #define	IMX6_AIPS2_BASE		0x0210
 #define	IMX6_AIPS2_SIZE		0x0010
 

CVS commit: src/sys/arch/arm/nxp

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 13:25:07 UTC 2023

Modified Files:
src/sys/arch/arm/nxp: files.imx imx6_ccm.c imx6_ccmreg.h imx6_ccmvar.h
imx6_clk.c
Added Files:
src/sys/arch/arm/nxp: imx6sx_clk.c

Log Message:
i.mx6sx CPU support in the CCM module: the clock tree si different from
the i.mx6q
- move i.mx6q-specific functions and data to imx6_clk.c
- add i.mx6sx specific imx6sx_clk.c
- add a imx6sxccm device


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nxp/files.imx \
src/sys/arch/arm/nxp/imx6_ccmvar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nxp/imx6_ccm.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nxp/imx6_ccmreg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nxp/imx6_clk.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/nxp/imx6sx_clk.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/nxp/files.imx
diff -u src/sys/arch/arm/nxp/files.imx:1.2 src/sys/arch/arm/nxp/files.imx:1.3
--- src/sys/arch/arm/nxp/files.imx:1.2	Wed Jul 20 10:01:10 2022
+++ src/sys/arch/arm/nxp/files.imx	Thu May  4 13:25:07 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: files.imx,v 1.2 2022/07/20 10:01:10 riastradh Exp $
+#	$NetBSD: files.imx,v 1.3 2023/05/04 13:25:07 bouyer Exp $
 #
 # Configuration info for the Freescale i.MX6
 #
@@ -10,6 +10,7 @@ defflag	opt_soc.hSOC_IMX
 defflag	opt_soc.hSOC_IMX6DL: SOC_IMX
 defflag	opt_soc.hSOC_IMX6Q: SOC_IMX
 defflag	opt_soc.hSOC_IMX6QDL: SOC_IMX
+defflag	opt_soc.hSOC_IMX6SX: SOC_IMX
 defflag	opt_soc.hSOC_IMX7D: SOC_IMX
 
 defflag opt_imx.hIMX6
@@ -17,9 +18,14 @@ defflag opt_imx.hIMX6
 # Clock
 device	imx6ccm : clk
 attach	imx6ccm at fdt
-file	arch/arm/nxp/imx6_ccm.c			imx6ccm
 file	arch/arm/nxp/imx6_clk.c			imx6ccm
 
+device	imx6sxccm : clk
+attach	imx6sxccm at fdt
+file	arch/arm/nxp/imx6sx_clk.c		imx6sxccm
+
+file	arch/arm/nxp/imx6_ccm.c			imx6ccm | imx6sxccm
+
 # Common FDT clock framework
 define	imx_ccm: clk
 file	arch/arm/nxp/imx_ccm.c			imx_ccm
Index: src/sys/arch/arm/nxp/imx6_ccmvar.h
diff -u src/sys/arch/arm/nxp/imx6_ccmvar.h:1.2 src/sys/arch/arm/nxp/imx6_ccmvar.h:1.3
--- src/sys/arch/arm/nxp/imx6_ccmvar.h:1.2	Fri Apr 14 17:45:59 2023
+++ src/sys/arch/arm/nxp/imx6_ccmvar.h	Thu May  4 13:25:07 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_ccmvar.h,v 1.2 2023/04/14 17:45:59 bouyer Exp $	*/
+/*	$NetBSD: imx6_ccmvar.h,v 1.3 2023/05/04 13:25:07 bouyer Exp $	*/
 /*
  * Copyright (c) 2012,2019  Genetec Corporation.  All rights reserved.
  * Written by Hashimoto Kenichi for Genetec Corporation.
@@ -42,11 +42,19 @@ struct imx6ccm_softc {
 	int sc_imx6_clksize;
 };
 
-void imx6ccm_attach_common(device_t, struct imx6_clk *, int);
+struct imxccm_init_parent;
+
+void imx6ccm_attach_common(device_t, struct imx6_clk *, int,
+struct imxccm_init_parent *);
 
 struct clk *imx6_get_clock(struct imx6ccm_softc *, const char *);
 struct imx6_clk *imx6_clk_find(struct imx6ccm_softc *sc, const char *);
 
+struct imxccm_init_parent {
+	const char *clock;
+	const char *parent;
+};
+
 
 enum imx6_clk_type {
 	IMX6_CLK_FIXED,

Index: src/sys/arch/arm/nxp/imx6_ccm.c
diff -u src/sys/arch/arm/nxp/imx6_ccm.c:1.3 src/sys/arch/arm/nxp/imx6_ccm.c:1.4
--- src/sys/arch/arm/nxp/imx6_ccm.c:1.3	Fri Apr 14 17:45:59 2023
+++ src/sys/arch/arm/nxp/imx6_ccm.c	Thu May  4 13:25:07 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: imx6_ccm.c,v 1.3 2023/04/14 17:45:59 bouyer Exp $	*/
+/*	$NetBSD: imx6_ccm.c,v 1.4 2023/05/04 13:25:07 bouyer Exp $	*/
 
 /*
  * Copyright (c) 2010-2012, 2014  Genetec Corporation.  All rights reserved.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: imx6_ccm.c,v 1.3 2023/04/14 17:45:59 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx6_ccm.c,v 1.4 2023/05/04 13:25:07 bouyer Exp $");
 
 #include "opt_imx.h"
 #include "opt_cputypes.h"
@@ -52,7 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: imx6_ccm.c,v
 
 #include 
 
-static void imxccm_init_clocks(struct imx6ccm_softc *);
+static void imxccm_init_clocks(struct imx6ccm_softc *,
+			   struct imxccm_init_parent *);
 static struct clk *imxccm_clk_get(void *, const char *);
 static void imxccm_clk_put(void *, struct clk *);
 static u_int imxccm_clk_get_rate(void *, struct clk *);
@@ -74,7 +75,8 @@ static const struct clk_funcs imxccm_clk
 };
 
 void
-imx6ccm_attach_common(device_t self, struct imx6_clk *imx6_clks, int size)
+imx6ccm_attach_common(device_t self, struct imx6_clk *imx6_clks, int size, 
+struct imxccm_init_parent *imxccm_init_parents)
 {
 	struct imx6ccm_softc * const sc = device_private(self);
 
@@ -90,12 +92,13 @@ imx6ccm_attach_common(device_t self, str
 		clk_attach(_clks[n].base);
 	}
 
-	imxccm_init_clocks(sc);
+	imxccm_init_clocks(sc, imxccm_init_parents);
 
 	for (int n = 0; n < size; n++) {
 		struct clk *clk = _clks[n].base;
 		struct clk *clk_parent = clk_get_parent(clk);
 		const char *parent_str = clk_parent ? clk_parent->name : 

CVS commit: src/sys/arch/arm/nxp

[Manuel Bouyer]

Module Name:src
Committed By:   bouyer
Date:   Thu May  4 13:25:07 UTC 2023

Modified Files:
src/sys/arch/arm/nxp: files.imx imx6_ccm.c imx6_ccmreg.h imx6_ccmvar.h
imx6_clk.c
Added Files:
src/sys/arch/arm/nxp: imx6sx_clk.c

Log Message:
i.mx6sx CPU support in the CCM module: the clock tree si different from
the i.mx6q
- move i.mx6q-specific functions and data to imx6_clk.c
- add i.mx6sx specific imx6sx_clk.c
- add a imx6sxccm device


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nxp/files.imx \
src/sys/arch/arm/nxp/imx6_ccmvar.h
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nxp/imx6_ccm.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nxp/imx6_ccmreg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nxp/imx6_clk.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/nxp/imx6sx_clk.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Thu May  4 11:30:25 UTC 2023

Modified Files:
src/lib/libcurses/PSD.doc: twinkle1.c
src/share/man/man0: title.cdrom title.urm

Log Message:
Fix spelling of Kurt Shoens surname.
PR misc/57389


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libcurses/PSD.doc/twinkle1.c
cvs rdiff -u -r1.7 -r1.8 src/share/man/man0/title.cdrom
cvs rdiff -u -r1.9 -r1.10 src/share/man/man0/title.urm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/lib/libcurses/PSD.doc/twinkle1.c
diff -u src/lib/libcurses/PSD.doc/twinkle1.c:1.6 src/lib/libcurses/PSD.doc/twinkle1.c:1.7
--- src/lib/libcurses/PSD.doc/twinkle1.c:1.6	Mon May 23 04:04:49 2005
+++ src/lib/libcurses/PSD.doc/twinkle1.c	Thu May  4 11:30:25 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: twinkle1.c,v 1.6 2005/05/23 04:04:49 christos Exp $	*/
+/*	$NetBSD: twinkle1.c,v 1.7 2023/05/04 11:30:25 uwe Exp $	*/
 
 /*
  * 
@@ -36,7 +36,7 @@
 
 /*
  * the idea for this program was a product of the imagination of
- * Kurt Schoens.  Not responsible for minds lost or stolen.
+ * Kurt Shoens.  Not responsible for minds lost or stolen.
  */
 
 #define	NCOLS	80

Index: src/share/man/man0/title.cdrom
diff -u src/share/man/man0/title.cdrom:1.7 src/share/man/man0/title.cdrom:1.8
--- src/share/man/man0/title.cdrom:1.7	Thu Dec 16 17:42:28 2010
+++ src/share/man/man0/title.cdrom	Thu May  4 11:30:25 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: title.cdrom,v 1.7 2010/12/16 17:42:28 wiz Exp $
+.\" $NetBSD: title.cdrom,v 1.8 2023/05/04 11:30:25 uwe Exp $
 .\"
 .\" Copyright (c) 1994 Regents of the University of California.
 .\" All rights reserved.
@@ -410,7 +410,7 @@ adventure(6)	Will Crowther	ls(1)	Elan Am
 apply(1)	Rob Pike	ls(1)	Michael Fischbein
 apply(1)	Jan-Simon Pendry	lsearch(3)	Roger L. Snyder
 ar(1)	Hugh A. Smith	m4(1)	Ozan Yigit
-arithmetic(6)	Eamonn McManus	mail(1)	Kurt Schoens
+arithmetic(6)	Eamonn McManus	mail(1)	Kurt Shoens
 arp(8)	Sun Microsystems Inc.	make(1)	Adam de Boor
 at(1)	Steve Wall	me(7)	Eric Allman
 atc(6)	Ed James	mergesort(3)	Peter McIlroy
@@ -474,7 +474,7 @@ file(1)	Ian Darwin	swab(3)	Jeffrey Mogul
 find(1)	Cimarron Taylor	sysconf(3)	Sean Eric Fagan
 finger(1)	Tony Nardo	sysline(1)	J.K. Foderaro
 fish(6)	Muffy Barkocy	syslog(3)	Eric Allman
-fmt(1)	Kurt Schoens	systat(1)	Bill Reeves
+fmt(1)	Kurt Shoens	systat(1)	Bill Reeves
 fnmatch(3)	Guido van Rossum	systat(1)	Robert Elz
 fold(1)	Kevin Ruddy	tail(1)	Edward Sze-Tyan Wang
 fortune(6)	Ken Arnold	talk(1)	Clem Cole

Index: src/share/man/man0/title.urm
diff -u src/share/man/man0/title.urm:1.9 src/share/man/man0/title.urm:1.10
--- src/share/man/man0/title.urm:1.9	Thu Dec 16 17:42:28 2010
+++ src/share/man/man0/title.urm	Thu May  4 11:30:25 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: title.urm,v 1.9 2010/12/16 17:42:28 wiz Exp $
+.\" $NetBSD: title.urm,v 1.10 2023/05/04 11:30:25 uwe Exp $
 .\"
 .\" Copyright (c) 1980, 1993, 1994 Regents of the University of California.
 .\" All rights reserved.
@@ -436,7 +436,7 @@ adventure(6)	Will Crowther	ls(1)	Elan Am
 apply(1)	Rob Pike	ls(1)	Michael Fischbein
 apply(1)	Jan-Simon Pendry	lsearch(3)	Roger L. Snyder
 ar(1)	Hugh A. Smith	m4(1)	Ozan Yigit
-arithmetic(6)	Eamonn McManus	mail(1)	Kurt Schoens
+arithmetic(6)	Eamonn McManus	mail(1)	Kurt Shoens
 arp(8)	Sun Microsystems Inc.	make(1)	Adam de Boor
 at(1)	Steve Wall	me(7)	Eric Allman
 atc(6)	Ed James	mergesort(3)	Peter McIlroy
@@ -500,7 +500,7 @@ file(1)	Ian Darwin	swab(3)	Jeffrey Mogul
 find(1)	Cimarron Taylor	sysconf(3)	Sean Eric Fagan
 finger(1)	Tony Nardo	sysline(1)	J.K. Foderaro
 fish(6)	Muffy Barkocy	syslog(3)	Eric Allman
-fmt(1)	Kurt Schoens	systat(1)	Bill Reeves
+fmt(1)	Kurt Shoens	systat(1)	Bill Reeves
 fnmatch(3)	Guido van Rossum	systat(1)	Robert Elz
 fold(1)	Kevin Ruddy	tail(1)	Edward Sze-Tyan Wang
 fortune(6)	Ken Arnold	talk(1)	Clem Cole

CVS commit: src

[Valeriy E. Ushakov]

Module Name:src
Committed By:   uwe
Date:   Thu May  4 11:30:25 UTC 2023

Modified Files:
src/lib/libcurses/PSD.doc: twinkle1.c
src/share/man/man0: title.cdrom title.urm

Log Message:
Fix spelling of Kurt Shoens surname.
PR misc/57389


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/lib/libcurses/PSD.doc/twinkle1.c
cvs rdiff -u -r1.7 -r1.8 src/share/man/man0/title.cdrom
cvs rdiff -u -r1.9 -r1.10 src/share/man/man0/title.urm

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/man/man4/man4.amiga

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Thu May  4 09:20:01 UTC 2023

Modified Files:
src/share/man/man4/man4.amiga: zz9k.4

Log Message:
zz9k.4: clean up manual page

New sentence, new line; spelling, duplicate words.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.amiga/zz9k.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/man/man4/man4.amiga/zz9k.4
diff -u src/share/man/man4/man4.amiga/zz9k.4:1.1 src/share/man/man4/man4.amiga/zz9k.4:1.2
--- src/share/man/man4/man4.amiga/zz9k.4:1.1	Wed May  3 13:49:30 2023
+++ src/share/man/man4/man4.amiga/zz9k.4	Thu May  4 09:20:00 2023
@@ -1,4 +1,4 @@
-.\" $NetBSD: zz9k.4,v 1.1 2023/05/03 13:49:30 phx Exp $
+.\" $NetBSD: zz9k.4,v 1.2 2023/05/04 09:20:00 rillig Exp $
 .\"
 .\" Copyright (c) 2016 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -37,28 +37,36 @@
 .Cd "zz9k*	at zbus?"
 .Cd "zzfb*	at zz9k?"
 .Cd "options	ZZFB_CONSOLE"
-.Cd "zz*	at zz9k?"
+.Cd "zz*		at zz9k?"
 .Cd "zzax*	at zz9k?"
 .Cd "zzusb*	at zz9k?"
 .Sh DESCRIPTION
 The
 .Nm
 driver provides support for the MNT ZZ9000 graphics card and ethernet interface.
-Each driver can be individually enabled or disabled. However all ZZ9000 drivers
-depend on the zz9k* as the root to work.
+Each driver can be individually enabled or disabled.
+However, all ZZ9000 drivers depend on the
+zz9k*
+as the root to work.
 .Pp
-The zzfb*
+The
+zzfb*
 .Xr wscons 4
-driver implements blitter accelerated support for the boot console. Support
-for an unaccelerated X11 framebuffer is also available via the
+driver implements blitter-accelerated support for the boot console.
+Support for an unaccelerated X11 framebuffer is also available via the
 .Xr wsfb 4
 driver.
 .Pp
-The zz* driver implements the ZZ9000 ethernet interface.
+The
+zz*
+driver implements the ZZ9000 ethernet interface.
 .Pp
-There is also provision for for adding ZZ9000AX audio card support as zzax* and
-the USB port support as zzusb* at a later time. None of these are functional
-yet.
+There is also provision for adding ZZ9000AX audio card support as
+zzax*
+and the USB port support as
+zzusb*
+at a later time.
+None of these are functional yet.
 .Sh SEE ALSO
 .Xr wscons 4 ,
 .Xr wsdisplay 4
@@ -80,20 +88,37 @@ For the ZZ9000 to assume the boot consol
 option in the kernel config file.
 .Pp
 Currently, the video mode is hard-coded to 1280x720 at 8 bpp for the console
-emulation and 16 bpp for the framebuffer used by X11. Resolutions and color
-depths can be individually changed in the zz9k_fb.c source code. Please follow
-the source code comments.
-.Pp
-zz* ethernet driver is considered experimental. As the MAC address is not
-stored permanently in the card, it will use it's default address. This should
-not impose any problem unless two ZZ9000 will be used in the same LAN. Please
-configure the desired link address for the zz0 interface in rc.conf or in the
-/etc/ifconfig.zz0 file, to avoid a MAC address collision.
+emulation and 16 bpp for the framebuffer used by X11.
+Resolutions and color depths can be individually changed in the
+.Pa zz9k_fb.c
+source code.
+Please follow the source code comments.
+.Pp
+The
+zz*
+ethernet driver is considered experimental.
+As the MAC address is not stored permanently in the card,
+it will use its default address.
+This should not impose any problem unless two ZZ9000 will be used
+in the same LAN.
+Please configure the desired link address for the
+zz0
+interface in
+.Pa rc.conf
+or in the
+.Pa /etc/ifconfig.zz0
+file, to avoid a MAC address collision.
 .Pp
-zzax* audio card driver is not functional yet. Only a basic skeleton source code
-is available for a possible later implementation.
+The
+zzax*
+audio card driver is not functional yet.
+Only a basic skeleton source code is available for a possible later
+implementation.
 .Pp
-zzusb* USB driver is not functional yet. Only a basic skeleton source code is
-available for a possible later implementation.
+The
+zzusb*
+USB driver is not functional yet.
+Only a basic skeleton source code is available for a possible later
+implementation.
 .Sh BUGS
 None known.

CVS commit: src/share/man/man4/man4.amiga

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Thu May  4 09:20:01 UTC 2023

Modified Files:
src/share/man/man4/man4.amiga: zz9k.4

Log Message:
zz9k.4: clean up manual page

New sentence, new line; spelling, duplicate words.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/share/man/man4/man4.amiga/zz9k.4

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.