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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Sep 28 05:54:24 UTC 2022

Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/evbarm/fdt/fdt_machdep.c

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

Modified files:

Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.92 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.93
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.92	Wed Sep 28 05:49:15 2022
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c	Wed Sep 28 05:54:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.92 2022/09/28 05:49:15 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.93 2022/09/28 05:54:24 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.92 2022/09/28 05:49:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.93 2022/09/28 05:54:24 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_bootconfig.h"
@@ -43,31 +43,34 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep.
 #include "wsdisplay.h"
 
 #include 
-#include 
-#include 
+#include 
+
 #include 
+#include 
+#include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
+#include 
 #include 
+#include 
+#include 
+#include 
 #include 
-#include 
-#include 
 #include 
-#include 
-#include 
 #include 
-#include 
-#include 
-#include 
-#include 
-#include 
 
 #include 
 #include 
@@ -75,8 +78,6 @@ __KERNEL_RCSID(0, "$NetBSD: fdt_machdep.
 #include 
 #include 
 
-#include 
-
 #include 
 #include 
 #include 

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Sep 28 05:54:24 UTC 2022

Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/evbarm/fdt/fdt_machdep.c

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

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Sep 28 05:49:15 UTC 2022

Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c

Log Message:
Typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/evbarm/fdt/fdt_machdep.c

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

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Sep 28 05:49:15 UTC 2022

Modified Files:
src/sys/arch/evbarm/fdt: fdt_machdep.c

Log Message:
Typo in comment


To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/sys/arch/evbarm/fdt/fdt_machdep.c

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

Modified files:

Index: src/sys/arch/evbarm/fdt/fdt_machdep.c
diff -u src/sys/arch/evbarm/fdt/fdt_machdep.c:1.91 src/sys/arch/evbarm/fdt/fdt_machdep.c:1.92
--- src/sys/arch/evbarm/fdt/fdt_machdep.c:1.91	Sat Apr  2 11:16:07 2022
+++ src/sys/arch/evbarm/fdt/fdt_machdep.c	Wed Sep 28 05:49:15 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fdt_machdep.c,v 1.91 2022/04/02 11:16:07 skrll Exp $ */
+/* $NetBSD: fdt_machdep.c,v 1.92 2022/09/28 05:49:15 skrll Exp $ */
 
 /*-
  * Copyright (c) 2015-2017 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.91 2022/04/02 11:16:07 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdt_machdep.c,v 1.92 2022/09/28 05:49:15 skrll Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_bootconfig.h"
@@ -548,7 +548,7 @@ initarm(void *arg)
 
 #if BYTE_ORDER == BIG_ENDIAN
 	/*
-	 * Most boards are configured to little-endian mode in initial, and
+	 * Most boards are configured to little-endian mode initially, and
 	 * switched to big-endian mode after kernel is loaded. In this case,
 	 * framebuffer seems byte-swapped to CPU. Override FDT to let
 	 * drivers know.

CVS commit: src/sys/arch/riscv

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Sep 28 05:02:03 UTC 2022

Modified Files:
src/sys/arch/riscv/conf: Makefile.riscv
src/sys/arch/riscv/riscv: locore.S

Log Message:
Fix RV32 so it gets to the same point as RV64


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/riscv/conf/Makefile.riscv
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/riscv/riscv/locore.S

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

Modified files:

Index: src/sys/arch/riscv/conf/Makefile.riscv
diff -u src/sys/arch/riscv/conf/Makefile.riscv:1.7 src/sys/arch/riscv/conf/Makefile.riscv:1.8
--- src/sys/arch/riscv/conf/Makefile.riscv:1.7	Sat May  1 07:13:21 2021
+++ src/sys/arch/riscv/conf/Makefile.riscv	Wed Sep 28 05:02:02 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.riscv,v 1.7 2021/05/01 07:13:21 skrll Exp $
+#	$NetBSD: Makefile.riscv,v 1.8 2022/09/28 05:02:02 skrll Exp $
 
 # Makefile for NetBSD
 #
@@ -71,7 +71,7 @@ locore.o: ${RISCV}/riscv/locore.S assym.
 .if ${MACHINE_ARCH} == "riscv64" && ${LP64:Uyes} == "yes"
 TEXTADDR?=		0xFFC0
 .else
-TEXTADDR?=		0xC0001000
+TEXTADDR?=		0x8020
 .endif
 KERNLDSCRIPT?=		${RISCV}/conf/kern.ldscript
 EXTRA_LINKFLAGS=	${LDOPTS} --relax

Index: src/sys/arch/riscv/riscv/locore.S
diff -u src/sys/arch/riscv/riscv/locore.S:1.26 src/sys/arch/riscv/riscv/locore.S:1.27
--- src/sys/arch/riscv/riscv/locore.S:1.26	Tue Sep 27 08:18:21 2022
+++ src/sys/arch/riscv/riscv/locore.S	Wed Sep 28 05:02:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.26 2022/09/27 08:18:21 skrll Exp $ */
+/* $NetBSD: locore.S,v 1.27 2022/09/28 05:02:02 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014, 2022 The NetBSD Foundation, Inc.
@@ -222,11 +222,16 @@ ENTRY_NP(start)
 
 	VPRINTX(s3)
 #endif
-#endif
 
 	VPRINTS(": ")
 	VPRINTXNL(t0)
 	VPRINTS("\n\r")
+#endif // _LP64
+
+#if ((VM_MIN_KERNEL_ADDRESS >> SEGSHIFT) & (NPDEPG - 1)) * SZREG
+	li	t1,  ((VM_MIN_KERNEL_ADDRESS >> SEGSHIFT) & (NPDEPG - 1)) * SZREG
+	add	s2, s2, t1
+#endif
 
 #if PGSHIFT < PTE_PPN_SHIFT
 #error Code assumes PGSHIFT is greater than PTE_PPN_SHIFT
@@ -240,7 +245,8 @@ ENTRY_NP(start)
 	// Fill in the PDEs for kernel.
 	//
 	PTR_LA	s0, start
-	srli	s0, s0, (PGSHIFT - PTE_PPN_SHIFT)
+	srli	s0, s0, SEGSHIFT	// round down to NBSEG, and shift in
+	slli	s0, s0, (SEGSHIFT - PGSHIFT + PTE_PPN_SHIFT)	// ... to PPN
 	or	s0, s0, s7
 .Lfill:
 	VPRINTS("kern ")

CVS commit: src/sys/arch/riscv

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Wed Sep 28 05:02:03 UTC 2022

Modified Files:
src/sys/arch/riscv/conf: Makefile.riscv
src/sys/arch/riscv/riscv: locore.S

Log Message:
Fix RV32 so it gets to the same point as RV64


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/riscv/conf/Makefile.riscv
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/riscv/riscv/locore.S

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

CVS commit: xsrc/external/mit/libXtst/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Sep 28 02:37:07 UTC 2022

Modified Files:
xsrc/external/mit/libXtst/dist/src: XRecord.c

Log Message:
re-port christos' fix for memory leak.  also, fix build.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libXtst/dist/src/XRecord.c

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

CVS commit: xsrc/external/mit/libXtst/dist/src

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Wed Sep 28 02:37:07 UTC 2022

Modified Files:
xsrc/external/mit/libXtst/dist/src: XRecord.c

Log Message:
re-port christos' fix for memory leak.  also, fix build.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 xsrc/external/mit/libXtst/dist/src/XRecord.c

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

Modified files:

Index: xsrc/external/mit/libXtst/dist/src/XRecord.c
diff -u xsrc/external/mit/libXtst/dist/src/XRecord.c:1.7 xsrc/external/mit/libXtst/dist/src/XRecord.c:1.8
--- xsrc/external/mit/libXtst/dist/src/XRecord.c:1.7	Tue Sep 27 18:23:26 2022
+++ xsrc/external/mit/libXtst/dist/src/XRecord.c	Wed Sep 28 02:37:06 2022
@@ -725,13 +725,14 @@ parse_reply_call_callback(
 XRecordInterceptProc callback,
 XPointer		 closure)
 {
+XRecordInterceptData *data;
 unsigned int current_index;
 int datum_bytes = 0;
 
 /* call the callback for each protocol element in the reply */
 current_index = 0;
 do {
-	XRecordInterceptData *data = alloc_inter_data(info);
+	data = alloc_inter_data(info);
 	if (!data)
 	return Error;
 

CVS commit: src/lib/libc/stdlib

[David H. Gutteridge]

Module Name:src
Committed By:   gutteridge
Date:   Wed Sep 28 00:35:47 UTC 2022

Modified Files:
src/lib/libc/stdlib: posix_openpt.3

Log Message:
posix_openpt.3: reflect flag changes from r. 1.44 of tty_ptm.c

Some flags are now accepted, others are still ignored. (E.g., other
BSDs would return EINVAL if O_RDWR wasn't passed, and we now accept
O_NONBLOCK but not O_CLOEXEC.)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/stdlib/posix_openpt.3

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

Modified files:

Index: src/lib/libc/stdlib/posix_openpt.3
diff -u src/lib/libc/stdlib/posix_openpt.3:1.7 src/lib/libc/stdlib/posix_openpt.3:1.8
--- src/lib/libc/stdlib/posix_openpt.3:1.7	Tue Sep  6 22:54:41 2022
+++ src/lib/libc/stdlib/posix_openpt.3	Wed Sep 28 00:35:47 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: posix_openpt.3,v 1.7 2022/09/06 22:54:41 gutteridge Exp $
+.\" $NetBSD: posix_openpt.3,v 1.8 2022/09/28 00:35:47 gutteridge Exp $
 .\"
 .\" Copyright (c) 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd September 6, 2022
+.Dd September 28, 2022
 .Dt POSIX_OPENPT 3
 .Os
 .Sh NAME
@@ -51,9 +51,9 @@ The
 argument has the same meaning as in the
 .Xr open 2
 call.
-However, the value of
+However, flags supplied in
 .Fa oflag
-is ignored; it exists for compatibility reasons only.
+may be ignored if they are unsupported.
 .Sh RETURN VALUES
 If successful,
 .Fn posix_openpt
@@ -67,7 +67,7 @@ Note that unlike implementations on some
 .Fn posix_openpt
 does not return
 .Er EINVAL
-if the value of
+if a flag supplied in
 .Fa oflag
 would be deemed invalid, instead it is simply ignored.
 This means it is not possible to dynamically test which

CVS commit: src/lib/libc/stdlib

[David H. Gutteridge]

Module Name:src
Committed By:   gutteridge
Date:   Wed Sep 28 00:35:47 UTC 2022

Modified Files:
src/lib/libc/stdlib: posix_openpt.3

Log Message:
posix_openpt.3: reflect flag changes from r. 1.44 of tty_ptm.c

Some flags are now accepted, others are still ignored. (E.g., other
BSDs would return EINVAL if O_RDWR wasn't passed, and we now accept
O_NONBLOCK but not O_CLOEXEC.)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/lib/libc/stdlib/posix_openpt.3

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

CVS commit: src/usr.bin/make/unit-tests

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Tue Sep 27 19:18:45 UTC 2022

Modified Files:
src/usr.bin/make/unit-tests: var-scope-local-legacy.exp
var-scope-local-legacy.mk varmod-order-numeric.mk

Log Message:
tests/make: add tests for legacy local variables and sorting


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/usr.bin/make/unit-tests/var-scope-local-legacy.exp \
src/usr.bin/make/unit-tests/var-scope-local-legacy.mk
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/varmod-order-numeric.mk

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/unit-tests/var-scope-local-legacy.exp
diff -u src/usr.bin/make/unit-tests/var-scope-local-legacy.exp:1.1 src/usr.bin/make/unit-tests/var-scope-local-legacy.exp:1.2
--- src/usr.bin/make/unit-tests/var-scope-local-legacy.exp:1.1	Sun Jan 23 16:25:54 2022
+++ src/usr.bin/make/unit-tests/var-scope-local-legacy.exp	Tue Sep 27 19:18:45 2022
@@ -1 +1,6 @@
+: LEN4=undef_
+: XY=undef_
+: AF=undef_
+: %D=undef_ %F=undef_
+: @D=._ @F=all_
 exit status 0
Index: src/usr.bin/make/unit-tests/var-scope-local-legacy.mk
diff -u src/usr.bin/make/unit-tests/var-scope-local-legacy.mk:1.1 src/usr.bin/make/unit-tests/var-scope-local-legacy.mk:1.2
--- src/usr.bin/make/unit-tests/var-scope-local-legacy.mk:1.1	Sun Jan 23 16:25:54 2022
+++ src/usr.bin/make/unit-tests/var-scope-local-legacy.mk	Tue Sep 27 19:18:45 2022
@@ -1,8 +1,17 @@
-# $NetBSD: var-scope-local-legacy.mk,v 1.1 2022/01/23 16:25:54 rillig Exp $
+# $NetBSD: var-scope-local-legacy.mk,v 1.2 2022/09/27 19:18:45 rillig Exp $
 #
 # Tests for legacy target-local variables, such as ${

CVS commit: src/usr.bin/make/unit-tests

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Tue Sep 27 19:18:45 UTC 2022

Modified Files:
src/usr.bin/make/unit-tests: var-scope-local-legacy.exp
var-scope-local-legacy.mk varmod-order-numeric.mk

Log Message:
tests/make: add tests for legacy local variables and sorting


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/usr.bin/make/unit-tests/var-scope-local-legacy.exp \
src/usr.bin/make/unit-tests/var-scope-local-legacy.mk
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/varmod-order-numeric.mk

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

CVS commit: xsrc/local/programs/bdfload

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Tue Sep 27 18:29:08 UTC 2022

Modified Files:
xsrc/local/programs/bdfload: bdfload.c

Log Message:
- cast to unsigned char for ctype macros
- some warn/err improvements


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 xsrc/local/programs/bdfload/bdfload.c

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

Modified files:

Index: xsrc/local/programs/bdfload/bdfload.c
diff -u xsrc/local/programs/bdfload/bdfload.c:1.15 xsrc/local/programs/bdfload/bdfload.c:1.16
--- xsrc/local/programs/bdfload/bdfload.c:1.15	Tue Sep 27 06:57:23 2022
+++ xsrc/local/programs/bdfload/bdfload.c	Tue Sep 27 14:29:08 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: bdfload.c,v 1.15 2022/09/27 10:57:23 macallan Exp $	*/
+/*	$NetBSD: bdfload.c,v 1.16 2022/09/27 18:29:08 christos Exp $	*/
 
 /*
  * Copyright (c) 2018 Michael Lorenz
@@ -171,11 +171,11 @@ write_header(const char *filename, struc
 	snprintf(name, sizeof(name), "%s_%dx%d", f->name, 
 	f->fontwidth, f->fontheight);
 	for (i = 0; i < strlen(name); i++) {
-		if (isblank((int)name[i]))
-			name[i]='_';
+		if (isblank((unsigned char)name[i]))
+			name[i] = '_';
 	}
 	if ((output = fopen(filename, "w")) == NULL) {
-		fprintf(stderr, "Can't open output file %s\n", filename);
+		warn("Can't open output file `%s'", filename);
 		return -1;
 	}
 	if (commentptr > 0) {
@@ -234,7 +234,7 @@ interpret(FILE *foo)
 {
 	char line[128], *arg, name[64] = "foo", *buffer;
 	int buflen = -1;
-	int len, in_char = 0, current = -1, stride = 0, charsize = 0;
+	int in_char = 0, current = -1, stride = 0, charsize = 0;
 	int width, height, x, y, num;
 	int first = 255, last = 0;
 	int left, top, lines;
@@ -243,28 +243,26 @@ interpret(FILE *foo)
 	int status;
 
 	while (fgets(line, sizeof(line), foo) != NULL) {
-		int i = 0;
+		size_t i = 0, len;
 		/* separate keyword from parameters */
 		len = strlen(line);
-		while (!isspace(line[i]) && (i < len)) i++;
+		while (!isspace((unsigned char)line[i]) && i < len) i++;
 		line[i] = 0;
 		arg = [i + 1];
 		i = 0;
 		len = strlen(arg);
 		/* get rid of garbage */
-		while ((!iscntrl(arg[i])) && (arg[i] != 0)) {
+		while ((!iscntrl((unsigned char)arg[i])) && (arg[i] != 0)) {
 			i++;
 		}
 		arg[i] = 0;
 		if (strcmp(line, "FAMILY_NAME") == 0) {
 			/* cut off quotation marks */
-			strncpy(name, arg + 1, 64);
-			name[strlen(name) - 1] = 0;
+			strlcpy(name, arg + 1, 64);
 			if (verbose) printf("name: %s\n", name);
 		} else if (strcmp(line, "COMMENT") == 0) {
 			commentptr += snprintf([commentptr],
-	  2048 - commentptr,
-	  "%s\n", arg);
+			sizeof(commentbuf) - commentptr, "%s\n", arg);
 		} else if (strcmp(line, "SPACING") == 0) {
 			char spc[16];
 			int res;
@@ -272,9 +270,11 @@ interpret(FILE *foo)
 			if (res > 0) {
 if (verbose) printf("spacing %s\n", spc);
 if ((spc[1] == 'P') && (force == 0)) {
-	fprintf(stderr, "This is a proportional font, results are probably not suitable for console use.\n");
-	fprintf(stderr, "Use -f to override if you want to try it anyway.\n");
-	exit(1);
+	warnx("This is a proportional font, "
+	   "results are probably not suitable "
+	   "for console use.");
+	errx(EXIT_FAILURE, "Use -f to override "
+	"if you want to try it anyway.");
 }
 			}
 		} else if (strcmp(line, "FONTBOUNDINGBOX") == 0) {
@@ -284,7 +284,7 @@ interpret(FILE *foo)
 			stride = (width + 7) >> 3;
 			if (verbose) printf("box %d x %d\n", width, height);
 			if (stride > 2) {
-err(EXIT_FAILURE,
+errx(EXIT_FAILURE,
 "no fonts wider than 16 work for now\n");
 			}
 			charsize = height * stride;
@@ -323,7 +323,8 @@ interpret(FILE *foo)
 if (top < bt) bt = top;
 if ((left + cwi) > br) br = left + cwi;
 if ((top + che) > bb) bb = top + che;
-if(dump && verbose) printf("top %d left %d\n", top, left);
+if (dump && verbose)
+	printf("top %d left %d\n", top, left);
 			}
 		} else if (strcmp(line, "BITMAP") == 0) {
 			int i, j, k, l;
@@ -388,9 +389,9 @@ interpret(FILE *foo)
 		close(fdev);
 	}
 	else {
-		if (header == 0) {
+		if (header == 0)
 			write_wsf(ofile, , buffer, buflen);
-		} else
+		else
 			write_header(ofile, , buffer, buflen);
 	}
 }
@@ -398,7 +399,8 @@ interpret(FILE *foo)
 __dead void
 usage()
 {
-	fprintf(stderr, "usage: bdfload [-vdhf] [-e encoding] [-N name] [-o ofile.wsf] font.bdf\n");
+	fprintf(stderr, "Usage: %s [-vdhf] [-e encoding] [-N name] "
+	"[-o ofile.wsf] font.bdf\n", getprogname());
 	exit(EXIT_FAILURE);
 }
 

CVS commit: xsrc/local/programs/bdfload

[Christos Zoulas]

Module Name:xsrc
Committed By:   christos
Date:   Tue Sep 27 18:29:08 UTC 2022

Modified Files:
xsrc/local/programs/bdfload: bdfload.c

Log Message:
- cast to unsigned char for ctype macros
- some warn/err improvements


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 xsrc/local/programs/bdfload/bdfload.c

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

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Sep 27 18:23:26 UTC 2022

Modified Files:
xsrc/external/mit/libXtst/dist/man: XTestQueryExtension.man
xsrc/external/mit/libXtst/dist/src: XRecord.c XTest.c
xsrc/external/mit/libXxf86vm/dist/src: XF86VMode.c
Removed Files:
xsrc/external/mit/libXtst/dist: README
xsrc/external/mit/libXxf86vm/dist: README

Log Message:
merge libXtst-1.2.4 and libXxf86vm-1.1.5


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libXtst/dist/README
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXtst/dist/src/XRecord.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXtst/dist/src/XTest.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXxf86vm/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c

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

CVS commit: xsrc/external/mit

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Sep 27 18:23:26 UTC 2022

Modified Files:
xsrc/external/mit/libXtst/dist/man: XTestQueryExtension.man
xsrc/external/mit/libXtst/dist/src: XRecord.c XTest.c
xsrc/external/mit/libXxf86vm/dist/src: XF86VMode.c
Removed Files:
xsrc/external/mit/libXtst/dist: README
xsrc/external/mit/libXxf86vm/dist: README

Log Message:
merge libXtst-1.2.4 and libXxf86vm-1.1.5


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.3 -r0 xsrc/external/mit/libXtst/dist/README
cvs rdiff -u -r1.6 -r1.7 \
xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man
cvs rdiff -u -r1.6 -r1.7 xsrc/external/mit/libXtst/dist/src/XRecord.c
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/libXtst/dist/src/XTest.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/libXxf86vm/dist/README
cvs rdiff -u -r1.4 -r1.5 xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c

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

Modified files:

Index: xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man
diff -u xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man:1.6 xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man:1.7
--- xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man:1.6	Tue Oct  4 22:01:49 2016
+++ xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man	Tue Sep 27 18:23:26 2022
@@ -1,7 +1,7 @@
 '\" t
 .\" Title: XTest
 .\"Author: Kieron Drake
-.\" Generator: DocBook XSL Stylesheets v1.78.1 
+.\" Generator: DocBook XSL Stylesheets vsnapshot_9276 
 .\"  Date: 6 June 2007
 .\"Manual: XTST FUNCTIONS
 .\"Source: __xorgversion__

Index: xsrc/external/mit/libXtst/dist/src/XRecord.c
diff -u xsrc/external/mit/libXtst/dist/src/XRecord.c:1.6 xsrc/external/mit/libXtst/dist/src/XRecord.c:1.7
--- xsrc/external/mit/libXtst/dist/src/XRecord.c:1.6	Fri Oct  7 16:05:13 2016
+++ xsrc/external/mit/libXtst/dist/src/XRecord.c	Tue Sep 27 18:23:26 2022
@@ -166,7 +166,7 @@ static XPointer alloc_mem_cache(void)
 struct mem_cache_str *cache;
 
 /* note that an error will go unnoticed */
-cache = (struct mem_cache_str *) Xmalloc(sizeof(struct mem_cache_str));
+cache = Xmalloc(sizeof(struct mem_cache_str));
 if (cache) {
 	cache->display_closed = False;
 	cache->inter_data = NULL;
@@ -317,7 +317,7 @@ XRecordCreateContext(Display *dpy, int d
 XRecordRange *
 XRecordAllocRange(void)
 {
-return (XRecordRange*)Xcalloc(1, sizeof(XRecordRange));
+return Xcalloc(1, sizeof(XRecordRange));
 }
 
 Status
@@ -409,7 +409,7 @@ XRecordGetContext(Display *dpy, XRecordC
 XExtDisplayInfo 	*info = find_display (dpy);
 register 		xRecordGetContextReq   	*req;
 xRecordGetContextReply 	rep;
-unsigned int	count, i, rn;
+unsigned int	count;
 xRecordRange   	xrange;
 xRecordClientInfo   xclient_inf;
 XRecordState	*ret;
@@ -427,7 +427,7 @@ XRecordGetContext(Display *dpy, XRecordC
 }
 count = rep.nClients;
 
-ret = (XRecordState*)Xmalloc(sizeof(XRecordState));
+ret = Xmalloc(sizeof(XRecordState));
 if (!ret) {
 	_XEatDataWords (dpy, rep.length);
 	UnlockDisplay(dpy);
@@ -459,7 +459,7 @@ XRecordGetContext(Display *dpy, XRecordC
 	   SyncHandle();
 	   return 0;
 }
-for(i = 0; i < count; i++)
+for (unsigned int i = 0; i < count; i++)
 {
 	client_inf[i] = &(client_inf_str[i]);
 _XRead(dpy, (char *)_inf, (long)sizeof(xRecordClientInfo));
@@ -487,7 +487,7 @@ XRecordGetContext(Display *dpy, XRecordC
 		SyncHandle();
 		return 0;
 		}
-		for (rn=0; rnnclients; i++) {
+for (unsigned long i = 0; i < state->nclients; i++) {
 	if (state->client_info[i]->ranges) {
 	if (state->client_info[i]->ranges[0])
 		Xfree(state->client_info[i]->ranges[0]);
@@ -560,10 +558,10 @@ static struct reply_buffer *alloc_reply_
 /*
  * nothing available; malloc a new struct
  */
-rbp = (struct reply_buffer *)Xmalloc(sizeof(struct reply_buffer));
+rbp = Xmalloc(sizeof(struct reply_buffer));
 if (!rbp)
 	return NULL;
-rbp->buf = (unsigned char *)Xmalloc(nbytes);
+rbp->buf = Xmalloc(nbytes);
 if (!rbp->buf) {
 	Xfree(rbp);
 	return NULL;
@@ -587,7 +585,7 @@ static XRecordInterceptData *alloc_inter
 	return >data;
 }
 /* allocate a new one */
-iq = (struct intercept_queue *)Xmalloc(sizeof(struct intercept_queue));
+iq = Xmalloc(sizeof(struct intercept_queue));
 if (!iq)
 	return NULL;
 iq->cache = cache;
@@ -727,14 +725,13 @@ parse_reply_call_callback(
 XRecordInterceptProc callback,
 XPointer		 closure)
 {
-int current_index;
+unsigned int current_index;
 int datum_bytes = 0;
-XRecordInterceptData *data;
 
 /* call the callback for each protocol element in the reply */
 current_index = 0;
 do {
-	data = alloc_inter_data(info);
+	XRecordInterceptData 

CVS import: xsrc/external/mit/libXxf86vm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Sep 27 18:22:38 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXxf86vm/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv11922

Log Message:
initial import of libXxf86vm-1.1.5

Status:

Vendor Tag: xorg
Release Tags:   libXxf86vm-1-1-5

U xsrc/external/mit/libXxf86vm/dist/depcomp
U xsrc/external/mit/libXxf86vm/dist/missing
U xsrc/external/mit/libXxf86vm/dist/config.guess
U xsrc/external/mit/libXxf86vm/dist/config.sub
U xsrc/external/mit/libXxf86vm/dist/COPYING
U xsrc/external/mit/libXxf86vm/dist/ChangeLog
U xsrc/external/mit/libXxf86vm/dist/compile
U xsrc/external/mit/libXxf86vm/dist/configure
N xsrc/external/mit/libXxf86vm/dist/README.md
U xsrc/external/mit/libXxf86vm/dist/Makefile.am
U xsrc/external/mit/libXxf86vm/dist/configure.ac
U xsrc/external/mit/libXxf86vm/dist/Makefile.in
U xsrc/external/mit/libXxf86vm/dist/ltmain.sh
U xsrc/external/mit/libXxf86vm/dist/INSTALL
U xsrc/external/mit/libXxf86vm/dist/aclocal.m4
U xsrc/external/mit/libXxf86vm/dist/install-sh
U xsrc/external/mit/libXxf86vm/dist/xxf86vm.pc.in
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetClientVersion.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetModeLine.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetDotClocks.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetPermissions.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetViewPort.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeValidateModeLine.man
U xsrc/external/mit/libXxf86vm/dist/man/Makefile.in
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSwitchMode.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VM.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeQueryVersion.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeAddModeLine.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetGammaRamp.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetViewPort.man
U xsrc/external/mit/libXxf86vm/dist/man/Makefile.am
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetAllModeLines.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetGamma.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeModModeLine.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSwitchToMode.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeDeleteModeLine.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetGammaRampSize.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeLockModeSwitch.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeQueryExtension.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetGammaRamp.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetGamma.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetMonitor.man
U xsrc/external/mit/libXxf86vm/dist/include/X11/extensions/xf86vmode.h
U xsrc/external/mit/libXxf86vm/dist/src/Makefile.am
C xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c
U xsrc/external/mit/libXxf86vm/dist/src/Makefile.in
U xsrc/external/mit/libXxf86vm/dist/src/config.h.in

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXxf86vm/dist

CVS import: xsrc/external/mit/libXtst/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Sep 27 18:22:34 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXtst/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv11536

Log Message:
initial import of libXtst-1.2.4

Status:

Vendor Tag: xorg
Release Tags:   libXtst-1-2-4

U xsrc/external/mit/libXtst/dist/ChangeLog
U xsrc/external/mit/libXtst/dist/install-sh
U xsrc/external/mit/libXtst/dist/configure
U xsrc/external/mit/libXtst/dist/Makefile.am
U xsrc/external/mit/libXtst/dist/aclocal.m4
N xsrc/external/mit/libXtst/dist/README.md
U xsrc/external/mit/libXtst/dist/INSTALL
U xsrc/external/mit/libXtst/dist/config.guess
U xsrc/external/mit/libXtst/dist/docbook.am
U xsrc/external/mit/libXtst/dist/xtst.pc.in
U xsrc/external/mit/libXtst/dist/Makefile.in
U xsrc/external/mit/libXtst/dist/ltmain.sh
U xsrc/external/mit/libXtst/dist/COPYING
U xsrc/external/mit/libXtst/dist/config.sub
U xsrc/external/mit/libXtst/dist/configure.ac
U xsrc/external/mit/libXtst/dist/compile
U xsrc/external/mit/libXtst/dist/config.h.in
U xsrc/external/mit/libXtst/dist/missing
U xsrc/external/mit/libXtst/dist/depcomp
C xsrc/external/mit/libXtst/dist/src/XRecord.c
C xsrc/external/mit/libXtst/dist/src/XTest.c
U xsrc/external/mit/libXtst/dist/src/Makefile.am
U xsrc/external/mit/libXtst/dist/src/Makefile.in
U xsrc/external/mit/libXtst/dist/specs/Makefile.am
U xsrc/external/mit/libXtst/dist/specs/Makefile.in
U xsrc/external/mit/libXtst/dist/specs/recordlib.xml
U xsrc/external/mit/libXtst/dist/specs/xtestlib.xml
U xsrc/external/mit/libXtst/dist/include/X11/extensions/XTest.h
U xsrc/external/mit/libXtst/dist/include/X11/extensions/record.h
C xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man
U xsrc/external/mit/libXtst/dist/man/x.stamp
U xsrc/external/mit/libXtst/dist/man/XTestCompareCurrentCursorWithWindow.man
U xsrc/external/mit/libXtst/dist/man/XTestDiscard.man
U xsrc/external/mit/libXtst/dist/man/XTestFakeMotionEvent.man
U xsrc/external/mit/libXtst/dist/man/XTestCompareCursorWithWindow.man
U xsrc/external/mit/libXtst/dist/man/XTestGrabControl.man
U xsrc/external/mit/libXtst/dist/man/XTestSetVisualIDOfVisual.man
U xsrc/external/mit/libXtst/dist/man/Makefile.in
U xsrc/external/mit/libXtst/dist/man/XTestFakeKeyEvent.man
U xsrc/external/mit/libXtst/dist/man/Makefile.am
U xsrc/external/mit/libXtst/dist/man/XTestSetGContextOfGC.man
U xsrc/external/mit/libXtst/dist/man/XTestFakeButtonEvent.man
U xsrc/external/mit/libXtst/dist/man/XTest.xml
U xsrc/external/mit/libXtst/dist/man/XTestFakeRelativeMotionEvent.man

3 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXtst/dist

CVS import: xsrc/external/mit/libXxf86vm/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Sep 27 18:22:38 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXxf86vm/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv11922

Log Message:
initial import of libXxf86vm-1.1.5

Status:

Vendor Tag: xorg
Release Tags:   libXxf86vm-1-1-5

U xsrc/external/mit/libXxf86vm/dist/depcomp
U xsrc/external/mit/libXxf86vm/dist/missing
U xsrc/external/mit/libXxf86vm/dist/config.guess
U xsrc/external/mit/libXxf86vm/dist/config.sub
U xsrc/external/mit/libXxf86vm/dist/COPYING
U xsrc/external/mit/libXxf86vm/dist/ChangeLog
U xsrc/external/mit/libXxf86vm/dist/compile
U xsrc/external/mit/libXxf86vm/dist/configure
N xsrc/external/mit/libXxf86vm/dist/README.md
U xsrc/external/mit/libXxf86vm/dist/Makefile.am
U xsrc/external/mit/libXxf86vm/dist/configure.ac
U xsrc/external/mit/libXxf86vm/dist/Makefile.in
U xsrc/external/mit/libXxf86vm/dist/ltmain.sh
U xsrc/external/mit/libXxf86vm/dist/INSTALL
U xsrc/external/mit/libXxf86vm/dist/aclocal.m4
U xsrc/external/mit/libXxf86vm/dist/install-sh
U xsrc/external/mit/libXxf86vm/dist/xxf86vm.pc.in
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetClientVersion.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetModeLine.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetDotClocks.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetPermissions.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetViewPort.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeValidateModeLine.man
U xsrc/external/mit/libXxf86vm/dist/man/Makefile.in
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSwitchMode.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VM.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeQueryVersion.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeAddModeLine.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetGammaRamp.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetViewPort.man
U xsrc/external/mit/libXxf86vm/dist/man/Makefile.am
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetAllModeLines.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSetGamma.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeModModeLine.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeSwitchToMode.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeDeleteModeLine.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetGammaRampSize.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeLockModeSwitch.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeQueryExtension.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetGammaRamp.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetGamma.man
U xsrc/external/mit/libXxf86vm/dist/man/XF86VidModeGetMonitor.man
U xsrc/external/mit/libXxf86vm/dist/include/X11/extensions/xf86vmode.h
U xsrc/external/mit/libXxf86vm/dist/src/Makefile.am
C xsrc/external/mit/libXxf86vm/dist/src/XF86VMode.c
U xsrc/external/mit/libXxf86vm/dist/src/Makefile.in
U xsrc/external/mit/libXxf86vm/dist/src/config.h.in

1 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXxf86vm/dist

CVS import: xsrc/external/mit/libXtst/dist

[matthew green]

Module Name:xsrc
Committed By:   mrg
Date:   Tue Sep 27 18:22:34 UTC 2022

Update of /cvsroot/xsrc/external/mit/libXtst/dist
In directory ivanova.netbsd.org:/tmp/cvs-serv11536

Log Message:
initial import of libXtst-1.2.4

Status:

Vendor Tag: xorg
Release Tags:   libXtst-1-2-4

U xsrc/external/mit/libXtst/dist/ChangeLog
U xsrc/external/mit/libXtst/dist/install-sh
U xsrc/external/mit/libXtst/dist/configure
U xsrc/external/mit/libXtst/dist/Makefile.am
U xsrc/external/mit/libXtst/dist/aclocal.m4
N xsrc/external/mit/libXtst/dist/README.md
U xsrc/external/mit/libXtst/dist/INSTALL
U xsrc/external/mit/libXtst/dist/config.guess
U xsrc/external/mit/libXtst/dist/docbook.am
U xsrc/external/mit/libXtst/dist/xtst.pc.in
U xsrc/external/mit/libXtst/dist/Makefile.in
U xsrc/external/mit/libXtst/dist/ltmain.sh
U xsrc/external/mit/libXtst/dist/COPYING
U xsrc/external/mit/libXtst/dist/config.sub
U xsrc/external/mit/libXtst/dist/configure.ac
U xsrc/external/mit/libXtst/dist/compile
U xsrc/external/mit/libXtst/dist/config.h.in
U xsrc/external/mit/libXtst/dist/missing
U xsrc/external/mit/libXtst/dist/depcomp
C xsrc/external/mit/libXtst/dist/src/XRecord.c
C xsrc/external/mit/libXtst/dist/src/XTest.c
U xsrc/external/mit/libXtst/dist/src/Makefile.am
U xsrc/external/mit/libXtst/dist/src/Makefile.in
U xsrc/external/mit/libXtst/dist/specs/Makefile.am
U xsrc/external/mit/libXtst/dist/specs/Makefile.in
U xsrc/external/mit/libXtst/dist/specs/recordlib.xml
U xsrc/external/mit/libXtst/dist/specs/xtestlib.xml
U xsrc/external/mit/libXtst/dist/include/X11/extensions/XTest.h
U xsrc/external/mit/libXtst/dist/include/X11/extensions/record.h
C xsrc/external/mit/libXtst/dist/man/XTestQueryExtension.man
U xsrc/external/mit/libXtst/dist/man/x.stamp
U xsrc/external/mit/libXtst/dist/man/XTestCompareCurrentCursorWithWindow.man
U xsrc/external/mit/libXtst/dist/man/XTestDiscard.man
U xsrc/external/mit/libXtst/dist/man/XTestFakeMotionEvent.man
U xsrc/external/mit/libXtst/dist/man/XTestCompareCursorWithWindow.man
U xsrc/external/mit/libXtst/dist/man/XTestGrabControl.man
U xsrc/external/mit/libXtst/dist/man/XTestSetVisualIDOfVisual.man
U xsrc/external/mit/libXtst/dist/man/Makefile.in
U xsrc/external/mit/libXtst/dist/man/XTestFakeKeyEvent.man
U xsrc/external/mit/libXtst/dist/man/Makefile.am
U xsrc/external/mit/libXtst/dist/man/XTestSetGContextOfGC.man
U xsrc/external/mit/libXtst/dist/man/XTestFakeButtonEvent.man
U xsrc/external/mit/libXtst/dist/man/XTest.xml
U xsrc/external/mit/libXtst/dist/man/XTestFakeRelativeMotionEvent.man

3 conflicts created by this import.
Use the following command to help the merge:

cvs checkout -jxorg:yesterday -jxorg xsrc/external/mit/libXtst/dist

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Tue Sep 27 17:46:59 UTC 2022

Modified Files:
src/usr.bin/make: Makefile arch.c make.c parse.c targ.c var.c

Log Message:
make: set WARNS to 6, from the default 5

No binary change on x86_64.


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/usr.bin/make/Makefile
cvs rdiff -u -r1.210 -r1.211 src/usr.bin/make/arch.c
cvs rdiff -u -r1.256 -r1.257 src/usr.bin/make/make.c
cvs rdiff -u -r1.687 -r1.688 src/usr.bin/make/parse.c
cvs rdiff -u -r1.177 -r1.178 src/usr.bin/make/targ.c
cvs rdiff -u -r1.1032 -r1.1033 src/usr.bin/make/var.c

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

Modified files:

Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.122 src/usr.bin/make/Makefile:1.123
--- src/usr.bin/make/Makefile:1.122	Tue May  3 19:05:34 2022
+++ src/usr.bin/make/Makefile	Tue Sep 27 17:46:58 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.122 2022/05/03 19:05:34 rillig Exp $
+#	$NetBSD: Makefile,v 1.123 2022/09/27 17:46:58 rillig Exp $
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
 
 PROG=	make
@@ -22,6 +22,7 @@ SRCS+=  targ.c
 SRCS+=  trace.c
 SRCS+=  var.c
 SRCS+=  util.c
+WARNS=	6
 
 # Whether to generate a coverage report after running the tests.
 USE_COVERAGE?=	no		# works only with gcc; clang9 fails to link

Index: src/usr.bin/make/arch.c
diff -u src/usr.bin/make/arch.c:1.210 src/usr.bin/make/arch.c:1.211
--- src/usr.bin/make/arch.c:1.210	Sat Jan 15 18:34:41 2022
+++ src/usr.bin/make/arch.c	Tue Sep 27 17:46:58 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: arch.c,v 1.210 2022/01/15 18:34:41 rillig Exp $	*/
+/*	$NetBSD: arch.c,v 1.211 2022/09/27 17:46:58 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -126,7 +126,7 @@
 #include "config.h"
 
 /*	"@(#)arch.c	8.2 (Berkeley) 1/2/94"	*/
-MAKE_RCSID("$NetBSD: arch.c,v 1.210 2022/01/15 18:34:41 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.211 2022/09/27 17:46:58 rillig Exp $");
 
 typedef struct List ArchList;
 typedef struct ListNode ArchListNode;
@@ -546,7 +546,8 @@ ArchStatMember(const char *archive, cons
 		if (strncmp(memName, AR_EFMT1, sizeof AR_EFMT1 - 1) == 0 &&
 		ch_isdigit(memName[sizeof AR_EFMT1 - 1])) {
 
-			size_t elen = atoi(memName + sizeof AR_EFMT1 - 1);
+			size_t elen = (size_t)atoi(
+			memName + sizeof AR_EFMT1 - 1);
 
 			if (elen > MAXPATHLEN)
 goto badarch;
@@ -788,7 +789,7 @@ ArchFindMember(const char *archive, cons
 		if (strncmp(out_arh->ar_name, AR_EFMT1, sizeof AR_EFMT1 - 1) ==
 		0 &&
 		(ch_isdigit(out_arh->ar_name[sizeof AR_EFMT1 - 1]))) {
-			size_t elen = atoi(
+			size_t elen = (size_t)atoi(
 			_arh->ar_name[sizeof AR_EFMT1 - 1]);
 			char ename[MAXPATHLEN + 1];
 

Index: src/usr.bin/make/make.c
diff -u src/usr.bin/make/make.c:1.256 src/usr.bin/make/make.c:1.257
--- src/usr.bin/make/make.c:1.256	Wed Aug 17 20:10:29 2022
+++ src/usr.bin/make/make.c	Tue Sep 27 17:46:58 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: make.c,v 1.256 2022/08/17 20:10:29 rillig Exp $	*/
+/*	$NetBSD: make.c,v 1.257 2022/09/27 17:46:58 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -104,7 +104,7 @@
 #include "job.h"
 
 /*	"@(#)make.c	8.1 (Berkeley) 6/6/93"	*/
-MAKE_RCSID("$NetBSD: make.c,v 1.256 2022/08/17 20:10:29 rillig Exp $");
+MAKE_RCSID("$NetBSD: make.c,v 1.257 2022/09/27 17:46:58 rillig Exp $");
 
 /* Sequence # to detect recursion. */
 static unsigned int checked_seqno = 1;
@@ -462,7 +462,7 @@ Make_HandleUse(GNode *cgn, GNode *pgn)
 	}
 
 	pgn->type |=
-	cgn->type & ~(OP_OPMASK | OP_USE | OP_USEBEFORE | OP_TRANSFORM);
+	cgn->type & (unsigned)~(OP_OPMASK | OP_USE | OP_USEBEFORE | OP_TRANSFORM);
 }
 
 /*
@@ -820,7 +820,7 @@ UnmarkChildren(GNode *gn)
 
 	for (ln = gn->children.first; ln != NULL; ln = ln->next) {
 		GNode *child = ln->datum;
-		child->type &= ~OP_MARK;
+		child->type &= (unsigned)~OP_MARK;
 	}
 }
 

Index: src/usr.bin/make/parse.c
diff -u src/usr.bin/make/parse.c:1.687 src/usr.bin/make/parse.c:1.688
--- src/usr.bin/make/parse.c:1.687	Sat Sep 24 16:13:48 2022
+++ src/usr.bin/make/parse.c	Tue Sep 27 17:46:58 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: parse.c,v 1.687 2022/09/24 16:13:48 rillig Exp $	*/
+/*	$NetBSD: parse.c,v 1.688 2022/09/27 17:46:58 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990, 1993
@@ -105,7 +105,7 @@
 #include "pathnames.h"
 
 /*	"@(#)parse.c	8.3 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: parse.c,v 1.687 2022/09/24 16:13:48 rillig Exp $");
+MAKE_RCSID("$NetBSD: parse.c,v 1.688 2022/09/27 17:46:58 rillig Exp $");
 
 /*
  * A file being read.
@@ -653,7 +653,7 @@ TryApplyDependencyOperator(GNode *gn, GN
 		 * Propagate copied bits to the initial node.  They'll be
 		 * propagated back to the rest of the cohorts later.
 		 */
-		gn->type |= op & ~OP_OPMASK;
+		gn->type |= op & (unsigned)~OP_OPMASK;
 
 		cohort = Targ_NewInternalNode(gn->name);
 		if (doing_depend)

Index: src/usr.bin/make/targ.c
diff -u 

CVS commit: src/usr.bin/make

[Roland Illig]

Module Name:src
Committed By:   rillig
Date:   Tue Sep 27 17:46:59 UTC 2022

Modified Files:
src/usr.bin/make: Makefile arch.c make.c parse.c targ.c var.c

Log Message:
make: set WARNS to 6, from the default 5

No binary change on x86_64.


To generate a diff of this commit:
cvs rdiff -u -r1.122 -r1.123 src/usr.bin/make/Makefile
cvs rdiff -u -r1.210 -r1.211 src/usr.bin/make/arch.c
cvs rdiff -u -r1.256 -r1.257 src/usr.bin/make/make.c
cvs rdiff -u -r1.687 -r1.688 src/usr.bin/make/parse.c
cvs rdiff -u -r1.177 -r1.178 src/usr.bin/make/targ.c
cvs rdiff -u -r1.1032 -r1.1033 src/usr.bin/make/var.c

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

CVS commit: src/sys/dev/dkwedge

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Tue Sep 27 17:04:52 UTC 2022

Modified Files:
src/sys/dev/dkwedge: dk.c

Log Message:
Remove bogus assertions.


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/dev/dkwedge/dk.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/dkwedge/dk.c
diff -u src/sys/dev/dkwedge/dk.c:1.123 src/sys/dev/dkwedge/dk.c:1.124
--- src/sys/dev/dkwedge/dk.c:1.123	Mon Aug 22 00:32:30 2022
+++ src/sys/dev/dkwedge/dk.c	Tue Sep 27 17:04:52 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: dk.c,v 1.123 2022/08/22 00:32:30 riastradh Exp $	*/
+/*	$NetBSD: dk.c,v 1.124 2022/09/27 17:04:52 mlelstv Exp $	*/
 
 /*-
  * Copyright (c) 2004, 2005, 2006, 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.123 2022/08/22 00:32:30 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.124 2022/09/27 17:04:52 mlelstv Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_dkwedge.h"
@@ -1221,8 +1221,6 @@ dklastclose(struct dkwedge_softc *sc)
 
 	KASSERT(mutex_owned(>sc_dk.dk_openlock));
 	KASSERT(mutex_owned(>sc_parent->dk_rawlock));
-	KASSERT(sc->sc_parent->dk_rawopens > 0);
-	KASSERT(sc->sc_parent->dk_rawvp != NULL);
 
 	if (--sc->sc_parent->dk_rawopens == 0) {
 		struct vnode *const vp = sc->sc_parent->dk_rawvp;

CVS commit: src/sys/dev/dkwedge

[Michael van Elst]

Module Name:src
Committed By:   mlelstv
Date:   Tue Sep 27 17:04:52 UTC 2022

Modified Files:
src/sys/dev/dkwedge: dk.c

Log Message:
Remove bogus assertions.


To generate a diff of this commit:
cvs rdiff -u -r1.123 -r1.124 src/sys/dev/dkwedge/dk.c

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

CVS commit: xsrc/local/programs/bdfload

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Tue Sep 27 10:57:23 UTC 2022

Modified Files:
xsrc/local/programs/bdfload: bdfload.c

Log Message:
rename a local variable so it doesn't conflict with a global one
NFC


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 xsrc/local/programs/bdfload/bdfload.c

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

Modified files:

Index: xsrc/local/programs/bdfload/bdfload.c
diff -u xsrc/local/programs/bdfload/bdfload.c:1.14 xsrc/local/programs/bdfload/bdfload.c:1.15
--- xsrc/local/programs/bdfload/bdfload.c:1.14	Tue Sep 27 10:54:04 2022
+++ xsrc/local/programs/bdfload/bdfload.c	Tue Sep 27 10:57:23 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: bdfload.c,v 1.14 2022/09/27 10:54:04 macallan Exp $	*/
+/*	$NetBSD: bdfload.c,v 1.15 2022/09/27 10:57:23 macallan Exp $	*/
 
 /*
  * Copyright (c) 2018 Michael Lorenz
@@ -165,14 +165,14 @@ write_header(const char *filename, struc
 {
 	FILE *output;
 	int i, j, x, y, idx, pxls, left;
-	char fontname[64], c, msk;
+	char name[64], c, msk;
 	
 	/* now output as a header file */
-	snprintf(fontname, sizeof(fontname), "%s_%dx%d", f->name, 
+	snprintf(name, sizeof(name), "%s_%dx%d", f->name, 
 	f->fontwidth, f->fontheight);
-	for (i = 0; i < strlen(fontname); i++) {
-		if (isblank((int)fontname[i]))
-			fontname[i]='_';
+	for (i = 0; i < strlen(name); i++) {
+		if (isblank((int)name[i]))
+			name[i]='_';
 	}
 	if ((output = fopen(filename, "w")) == NULL) {
 		fprintf(stderr, "Can't open output file %s\n", filename);
@@ -184,9 +184,9 @@ write_header(const char *filename, struc
 		fprintf(output, "*/\n\n");
 	}
 
-	fprintf(output, "static u_char %s_data[];\n", fontname);
+	fprintf(output, "static u_char %s_data[];\n", name);
 	fprintf(output, "\n");
-	fprintf(output, "static struct wsdisplay_font %s = {\n", fontname);
+	fprintf(output, "static struct wsdisplay_font %s = {\n", name);
 	fprintf(output, "\t\"%s\",\t\t\t/* typeface name */\n", f->name);
 	fprintf(output, "\t%d,\t\t\t\t/* firstchar */\n", f->firstchar);
 	fprintf(output, "\t%d,\t\t\t\t/* numchars */\n", f->numchars);
@@ -196,9 +196,9 @@ write_header(const char *filename, struc
 	fprintf(output, "\t%d,\t\t\t\t/* stride */\n", f->stride);
 	fprintf(output, "\tWSDISPLAY_FONTORDER_L2R,\t/* bit order */\n");
 	fprintf(output, "\tWSDISPLAY_FONTORDER_L2R,\t/* byte order */\n");
-	fprintf(output, "\t%s_data\t\t/* data */\n", fontname);
+	fprintf(output, "\t%s_data\t\t/* data */\n", name);
 	fprintf(output, "};\n\n");
-	fprintf(output, "static u_char %s_data[] = {\n", fontname);
+	fprintf(output, "static u_char %s_data[] = {\n", name);
 	for (i = f->firstchar; i < f->firstchar + f->numchars; i++) {
 		fprintf(output, "\t/* %d */\n", i);
 		idx = i * f->stride * f->fontheight;

CVS commit: xsrc/local/programs/bdfload

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Tue Sep 27 10:57:23 UTC 2022

Modified Files:
xsrc/local/programs/bdfload: bdfload.c

Log Message:
rename a local variable so it doesn't conflict with a global one
NFC


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 xsrc/local/programs/bdfload/bdfload.c

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

CVS commit: xsrc/local/programs/bdfload

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Tue Sep 27 10:54:04 UTC 2022

Modified Files:
xsrc/local/programs/bdfload: bdfload.c

Log Message:
remove debug printf()


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 xsrc/local/programs/bdfload/bdfload.c

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

Modified files:

Index: xsrc/local/programs/bdfload/bdfload.c
diff -u xsrc/local/programs/bdfload/bdfload.c:1.13 xsrc/local/programs/bdfload/bdfload.c:1.14
--- xsrc/local/programs/bdfload/bdfload.c:1.13	Sun Sep 18 22:04:31 2022
+++ xsrc/local/programs/bdfload/bdfload.c	Tue Sep 27 10:54:04 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: bdfload.c,v 1.13 2022/09/18 22:04:31 macallan Exp $	*/
+/*	$NetBSD: bdfload.c,v 1.14 2022/09/27 10:54:04 macallan Exp $	*/
 
 /*
  * Copyright (c) 2018 Michael Lorenz
@@ -442,7 +442,6 @@ main(int argc, char *argv[])
 			break;
 		case 'N':
 			strncpy(fontname, optarg, 64);
-			printf("given name: %s\n", fontname);
 			break;
 		case '?':	/* FALLTHROUGH */
 		default:

CVS commit: xsrc/local/programs/bdfload

[Michael Lorenz]

Module Name:xsrc
Committed By:   macallan
Date:   Tue Sep 27 10:54:04 UTC 2022

Modified Files:
xsrc/local/programs/bdfload: bdfload.c

Log Message:
remove debug printf()


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 xsrc/local/programs/bdfload/bdfload.c

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

CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs

[Frank Kardel]

Module Name:src
Committed By:   kardel
Date:   Tue Sep 27 10:33:21 UTC 2022

Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c

Log Message:
for unsupported names return EINVAL as per TOG
https://pubs.opengroup.org/onlinepubs/9699919799/functions/fpathconf.html
discussed with christos@


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c

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

Modified files:

Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.78 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.79
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c:1.78	Sun Mar 27 16:26:26 2022
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.c	Tue Sep 27 10:33:21 2022
@@ -5027,7 +5027,7 @@ zfs_pathconf(vnode_t *vp, int cmd, ulong
 #endif
 
 	default:
-		return (EOPNOTSUPP);
+		return (EINVAL);
 	}
 }
 

CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs

[Frank Kardel]

Module Name:src
Committed By:   kardel
Date:   Tue Sep 27 10:33:21 UTC 2022

Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_vnops.c

Log Message:
for unsupported names return EINVAL as per TOG
https://pubs.opengroup.org/onlinepubs/9699919799/functions/fpathconf.html
discussed with christos@


To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_vnops.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/riscv

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 08:18:21 UTC 2022

Modified Files:
src/sys/arch/riscv/conf: GENERIC files.riscv
src/sys/arch/riscv/include: db_machdep.h
src/sys/arch/riscv/riscv: db_machdep.c db_trace.c locore.S trap.c
Added Files:
src/sys/arch/riscv/riscv: db_interface.c

Log Message:
Basic ddb and backtrace support.

[   1.000] panic: kernel diagnostic assertion "msgbufaddr != 0" failed: 
file "/home/nick/netbsd/nbcvs/src/sys/arch/riscv/riscv/riscv_machdep.c", line 
564
[   1.000] cpu0: Begin traceback...
[   1.000] trace fp ffc000801dd0
[   1.000] fp ffc000801e10 ?() at ffc0001eee98
[   1.000] fp ffc000801e30 ?() at ffc0002ad984
[   1.000] fp ffc000801ee0 ?() at ffc05430
[   1.000] cpu0: End traceback...
[   1.000] Trapframe @ 0xffc000801cb0 (cause=3 (breakpoint), 
status=0x100, pc=0xffc007e4, va=0):
[   1.000] ra =0xffc0001eee9c, sp =0xffc000801dd0, gp 
=0xffc0006a8f40, tp = 0
[   1.000] s0 =0xffc000600ac0, s1 =0x1000, s2 
=0xffc000438df0, s3 =0xffc000801d80
[   1.000] s4 =0xffc0001eed78, s5 =0xffc0006d55f8, s6 
=0xffc000801d88, s7 =0xffc0006dfdb8
[   1.000] s8 =0xffc000428c18, s9 =0xffc000801dd0, 
s10=0xffca3822, s11=0xffc0006d55f8
[   1.000] a0 =  0x17, a1 =   0xa, a2 = 
0, a3 =0xffc00041f658
[   1.000] a4 = 0, a5 =   0x1, a5 = 
0, a7 =   0x1
[   1.000] t0 =0xffc0006dfe30, t1 =0xffc000801bb8, t2 
=0xffc000803000, t3 =  0x75
[   1.000] t4 = 0, t5 =  0x63, t6 = 
  0x1
[   1.000] kernel: breakpoint
Stopped in pid 0.0 (system) at  ffc007e4:   c.ebreak
db>


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/riscv/conf/GENERIC
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/riscv/conf/files.riscv
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/include/db_machdep.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/riscv/riscv/db_interface.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/riscv/riscv/db_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/riscv/db_trace.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/riscv/riscv/locore.S
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/riscv/riscv/trap.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/riscv/conf/GENERIC
diff -u src/sys/arch/riscv/conf/GENERIC:1.14 src/sys/arch/riscv/conf/GENERIC:1.15
--- src/sys/arch/riscv/conf/GENERIC:1.14	Sun Sep 11 15:31:11 2022
+++ src/sys/arch/riscv/conf/GENERIC	Tue Sep 27 08:18:21 2022
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.14 2022/09/11 15:31:11 skrll Exp $
+# $NetBSD: GENERIC,v 1.15 2022/09/27 08:18:21 skrll Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/riscv/conf/std.riscv64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.14 $"
+#ident 		"GENERIC-$Revision: 1.15 $"
 
 maxusers	64		# estimated number of users
 
@@ -74,7 +74,7 @@ options 	DIAGNOSTIC	# inexpensive kernel
 # Because gcc omits the frame pointer for any -O level, the line below
 # is needed to make backtraces in DDB work.
 #
-#makeoptions	COPTS="-O2 -fno-omit-frame-pointer"
+makeoptions	COPTS="-O2 -fno-omit-frame-pointer"
 makeoptions	COPY_SYMTAB=1
 options 	DDB		# in-kernel debugger
 #options	DDB_COMMANDONENTER="bt"	# execute command when ddb is entered

Index: src/sys/arch/riscv/conf/files.riscv
diff -u src/sys/arch/riscv/conf/files.riscv:1.9 src/sys/arch/riscv/conf/files.riscv:1.10
--- src/sys/arch/riscv/conf/files.riscv:1.9	Mon Sep 19 09:15:01 2022
+++ src/sys/arch/riscv/conf/files.riscv	Tue Sep 27 08:18:21 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: files.riscv,v 1.9 2022/09/19 09:15:01 skrll Exp $
+#	$NetBSD: files.riscv,v 1.10 2022/09/27 08:18:21 skrll Exp $
 #
 
 maxpartitions	16
@@ -21,6 +21,7 @@ file	arch/riscv/riscv/bus_space_notimpl.
 file	arch/riscv/riscv/clock_machdep.c
 file	arch/riscv/riscv/core_machdep.c		coredump
 file	arch/riscv/riscv/cpu_subr.c
+file	arch/riscv/riscv/db_interface.c		ddb
 file	arch/riscv/riscv/db_disasm.c		ddb
 file	arch/riscv/riscv/db_machdep.c		ddb | kgdb
 file	arch/riscv/riscv/db_trace.c		ddb

Index: src/sys/arch/riscv/include/db_machdep.h
diff -u src/sys/arch/riscv/include/db_machdep.h:1.5 src/sys/arch/riscv/include/db_machdep.h:1.6
--- src/sys/arch/riscv/include/db_machdep.h:1.5	Tue May 18 06:42:11 2021
+++ src/sys/arch/riscv/include/db_machdep.h	Tue Sep 27 08:18:21 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.5 2021/05/18 06:42:11 skrll Exp $ */
+/* $NetBSD: db_machdep.h,v 1.6 2022/09/27 08:18:21 skrll Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -43,7 +43,8 @@ typedef	long		db_expr_t;	/* 

CVS commit: src/sys/arch/riscv

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 08:18:21 UTC 2022

Modified Files:
src/sys/arch/riscv/conf: GENERIC files.riscv
src/sys/arch/riscv/include: db_machdep.h
src/sys/arch/riscv/riscv: db_machdep.c db_trace.c locore.S trap.c
Added Files:
src/sys/arch/riscv/riscv: db_interface.c

Log Message:
Basic ddb and backtrace support.

[   1.000] panic: kernel diagnostic assertion "msgbufaddr != 0" failed: 
file "/home/nick/netbsd/nbcvs/src/sys/arch/riscv/riscv/riscv_machdep.c", line 
564
[   1.000] cpu0: Begin traceback...
[   1.000] trace fp ffc000801dd0
[   1.000] fp ffc000801e10 ?() at ffc0001eee98
[   1.000] fp ffc000801e30 ?() at ffc0002ad984
[   1.000] fp ffc000801ee0 ?() at ffc05430
[   1.000] cpu0: End traceback...
[   1.000] Trapframe @ 0xffc000801cb0 (cause=3 (breakpoint), 
status=0x100, pc=0xffc007e4, va=0):
[   1.000] ra =0xffc0001eee9c, sp =0xffc000801dd0, gp 
=0xffc0006a8f40, tp = 0
[   1.000] s0 =0xffc000600ac0, s1 =0x1000, s2 
=0xffc000438df0, s3 =0xffc000801d80
[   1.000] s4 =0xffc0001eed78, s5 =0xffc0006d55f8, s6 
=0xffc000801d88, s7 =0xffc0006dfdb8
[   1.000] s8 =0xffc000428c18, s9 =0xffc000801dd0, 
s10=0xffca3822, s11=0xffc0006d55f8
[   1.000] a0 =  0x17, a1 =   0xa, a2 = 
0, a3 =0xffc00041f658
[   1.000] a4 = 0, a5 =   0x1, a5 = 
0, a7 =   0x1
[   1.000] t0 =0xffc0006dfe30, t1 =0xffc000801bb8, t2 
=0xffc000803000, t3 =  0x75
[   1.000] t4 = 0, t5 =  0x63, t6 = 
  0x1
[   1.000] kernel: breakpoint
Stopped in pid 0.0 (system) at  ffc007e4:   c.ebreak
db>


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/riscv/conf/GENERIC
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/riscv/conf/files.riscv
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/riscv/include/db_machdep.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/riscv/riscv/db_interface.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/riscv/riscv/db_machdep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/riscv/db_trace.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/riscv/riscv/locore.S
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/riscv/riscv/trap.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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:36:44 UTC 2022

Modified Files:
src/sys/arch/arm/at91: at91emac.c
src/sys/arch/arm/ep93xx: epe.c
src/sys/arch/arm/footbridge: footbridge.c footbridge_pci.c
src/sys/arch/arm/footbridge/isa: isadma_machdep.c isapnp_machdep.c
src/sys/arch/arm/gemini: gemini_dma.c gemini_ipm.c obio_wdc.c
src/sys/arch/arm/imx: imx_dma.c imx_pcic.c
src/sys/arch/arm/iomd: iomd.c qms.c vidcvideo.c
src/sys/arch/arm/ixp12x0: ixp12x0_pci.c ixp12x0_pci_dma.c
src/sys/arch/arm/mainbus: mainbus.c
src/sys/arch/arm/nxp: imx6_ccm.c imx6_clk.c
src/sys/arch/arm/omap: omap3_sdma.c omap5912_intr.c omap_dma.c
omap_intr.c omapfb.c tifb.c
src/sys/arch/arm/s3c2xx0: s3c2410_extint.c s3c2410_intr.c
s3c2440_extint.c s3c2440_i2s.c s3c2440_intr.c s3c2440_sdi.c
s3c2800_intr.c s3c2xx0_intr.c sscom_s3c2410.c sscom_s3c2800.c
src/sys/arch/arm/sa11x0: sa_kbc.c sa11x1_pcic.c sa11xx_pcic.c
src/sys/arch/arm/sociox: if_scx.c
src/sys/arch/arm/ti: omap3_dss.c
src/sys/arch/arm/xscale: becc_pci.c i80312_pci.c i80321_pci.c
ixp425_npe.c ixp425_pci.c ixp425_pci_dma.c pxa2x0_ac97.c
pxa2x0_dma.c pxa2x0_intr.c pxa2x0_mci.c pxa2x0_pcic.c
src/sys/arch/arm/zynq: zynq_dma.c

Log Message:
Remove unnecessary sys/malloc.h include


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/at91/at91emac.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/ep93xx/epe.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/footbridge/footbridge.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/footbridge/footbridge_pci.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/footbridge/isa/isadma_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/footbridge/isa/isapnp_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_dma.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/gemini/gemini_ipm.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/gemini/obio_wdc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx_dma.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/imx_pcic.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/iomd/iomd.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/iomd/qms.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/iomd/vidcvideo.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/ixp12x0/ixp12x0_pci.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/mainbus/mainbus.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nxp/imx6_ccm.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nxp/imx6_clk.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/omap3_sdma.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap5912_intr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/omap_dma.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/omap_intr.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/omap/omapfb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/omap/tifb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/s3c2xx0/s3c2410_extint.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/s3c2xx0/s3c2410_intr.c \
src/sys/arch/arm/s3c2xx0/s3c2800_intr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/s3c2xx0/s3c2440_extint.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/s3c2xx0/s3c2440_intr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/s3c2xx0/s3c2440_sdi.c \
src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/s3c2xx0/sscom_s3c2800.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/sa11x0/sa_kbc.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/sa11x0/sa11x1_pcic.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/sa11x0/sa11xx_pcic.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/sociox/if_scx.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/ti/omap3_dss.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/xscale/becc_pci.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/xscale/i80312_pci.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/xscale/i80321_pci.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/xscale/ixp425_npe.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/xscale/ixp425_pci.c \
src/sys/arch/arm/xscale/pxa2x0_pcic.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/xscale/ixp425_pci_dma.c \
src/sys/arch/arm/xscale/pxa2x0_dma.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/xscale/pxa2x0_ac97.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/xscale/pxa2x0_intr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/xscale/pxa2x0_mci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/zynq/zynq_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/at91/at91emac.c
diff -u src/sys/arch/arm/at91/at91emac.c:1.34 src/sys/arch/arm/at91/at91emac.c:1.35
--- src/sys/arch/arm/at91/at91emac.c:1.34	Sat Sep 17 

CVS commit: src/sys/arch/arm

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:36:44 UTC 2022

Modified Files:
src/sys/arch/arm/at91: at91emac.c
src/sys/arch/arm/ep93xx: epe.c
src/sys/arch/arm/footbridge: footbridge.c footbridge_pci.c
src/sys/arch/arm/footbridge/isa: isadma_machdep.c isapnp_machdep.c
src/sys/arch/arm/gemini: gemini_dma.c gemini_ipm.c obio_wdc.c
src/sys/arch/arm/imx: imx_dma.c imx_pcic.c
src/sys/arch/arm/iomd: iomd.c qms.c vidcvideo.c
src/sys/arch/arm/ixp12x0: ixp12x0_pci.c ixp12x0_pci_dma.c
src/sys/arch/arm/mainbus: mainbus.c
src/sys/arch/arm/nxp: imx6_ccm.c imx6_clk.c
src/sys/arch/arm/omap: omap3_sdma.c omap5912_intr.c omap_dma.c
omap_intr.c omapfb.c tifb.c
src/sys/arch/arm/s3c2xx0: s3c2410_extint.c s3c2410_intr.c
s3c2440_extint.c s3c2440_i2s.c s3c2440_intr.c s3c2440_sdi.c
s3c2800_intr.c s3c2xx0_intr.c sscom_s3c2410.c sscom_s3c2800.c
src/sys/arch/arm/sa11x0: sa_kbc.c sa11x1_pcic.c sa11xx_pcic.c
src/sys/arch/arm/sociox: if_scx.c
src/sys/arch/arm/ti: omap3_dss.c
src/sys/arch/arm/xscale: becc_pci.c i80312_pci.c i80321_pci.c
ixp425_npe.c ixp425_pci.c ixp425_pci_dma.c pxa2x0_ac97.c
pxa2x0_dma.c pxa2x0_intr.c pxa2x0_mci.c pxa2x0_pcic.c
src/sys/arch/arm/zynq: zynq_dma.c

Log Message:
Remove unnecessary sys/malloc.h include


To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/at91/at91emac.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/ep93xx/epe.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/arm/footbridge/footbridge.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/arm/footbridge/footbridge_pci.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/footbridge/isa/isadma_machdep.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/footbridge/isa/isapnp_machdep.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/gemini/gemini_dma.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/gemini/gemini_ipm.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/gemini/obio_wdc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx_dma.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/imx_pcic.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/iomd/iomd.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/iomd/qms.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/arm/iomd/vidcvideo.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/ixp12x0/ixp12x0_pci.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/ixp12x0/ixp12x0_pci_dma.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/mainbus/mainbus.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nxp/imx6_ccm.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nxp/imx6_clk.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/omap/omap3_sdma.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/omap/omap5912_intr.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/omap/omap_dma.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/omap/omap_intr.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/omap/omapfb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/omap/tifb.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/s3c2xx0/s3c2410_extint.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/s3c2xx0/s3c2410_intr.c \
src/sys/arch/arm/s3c2xx0/s3c2800_intr.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/s3c2xx0/s3c2440_extint.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/s3c2xx0/s3c2440_i2s.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/s3c2xx0/s3c2440_intr.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/s3c2xx0/s3c2440_sdi.c \
src/sys/arch/arm/s3c2xx0/sscom_s3c2410.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/s3c2xx0/s3c2xx0_intr.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/s3c2xx0/sscom_s3c2800.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/sa11x0/sa_kbc.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/sa11x0/sa11x1_pcic.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/sa11x0/sa11xx_pcic.c
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/arm/sociox/if_scx.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/ti/omap3_dss.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/xscale/becc_pci.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/arm/xscale/i80312_pci.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/xscale/i80321_pci.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/xscale/ixp425_npe.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/xscale/ixp425_pci.c \
src/sys/arch/arm/xscale/pxa2x0_pcic.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/xscale/ixp425_pci_dma.c \
src/sys/arch/arm/xscale/pxa2x0_dma.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/xscale/pxa2x0_ac97.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/arm/xscale/pxa2x0_intr.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/xscale/pxa2x0_mci.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/zynq/zynq_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/at91

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:34:45 UTC 2022

Modified Files:
src/sys/arch/arm/at91: at91cf.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/at91/at91cf.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/at91/at91cf.c
diff -u src/sys/arch/arm/at91/at91cf.c:1.7 src/sys/arch/arm/at91/at91cf.c:1.8
--- src/sys/arch/arm/at91/at91cf.c:1.7	Sat Aug  7 16:18:43 2021
+++ src/sys/arch/arm/at91/at91cf.c	Tue Sep 27 06:34:44 2022
@@ -1,5 +1,5 @@
-/*	$Id: at91cf.c,v 1.7 2021/08/07 16:18:43 thorpej Exp $	*/
-/*	$NetBSD: at91cf.c,v 1.7 2021/08/07 16:18:43 thorpej Exp $	*/
+/*	$Id: at91cf.c,v 1.8 2022/09/27 06:34:44 skrll Exp $	*/
+/*	$NetBSD: at91cf.c,v 1.8 2022/09/27 06:34:44 skrll Exp $	*/
 
 /*
  * Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -30,12 +30,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: at91cf.c,v 1.7 2021/08/07 16:18:43 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91cf.c,v 1.8 2022/09/27 06:34:44 skrll Exp $");
 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -174,7 +174,7 @@ at91cf_attach_common(device_t parent, de
 	printf("\n");
 
 	/* socket 0 */
-	ph = malloc(sizeof(struct at91cf_handle), M_DEVBUF, M_WAITOK|M_ZERO);
+	ph = kmem_zalloc(sizeof(*ph), KM_SLEEP);
 	sc->sc_ph = ph;
 	ph->ph_sc = sc;
 	ph->ph_space[IO].base = sa->sa_addr + IO_BASE;

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:34:45 UTC 2022

Modified Files:
src/sys/arch/arm/at91: at91cf.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/at91/at91cf.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/ep93xx

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:32:53 UTC 2022

Modified Files:
src/sys/arch/arm/ep93xx: eppcic.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/ep93xx/eppcic.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/ep93xx/eppcic.c
diff -u src/sys/arch/arm/ep93xx/eppcic.c:1.11 src/sys/arch/arm/ep93xx/eppcic.c:1.12
--- src/sys/arch/arm/ep93xx/eppcic.c:1.11	Sun Nov 21 08:25:26 2021
+++ src/sys/arch/arm/ep93xx/eppcic.c	Tue Sep 27 06:32:53 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: eppcic.c,v 1.11 2021/11/21 08:25:26 skrll Exp $	*/
+/*	$NetBSD: eppcic.c,v 1.12 2022/09/27 06:32:53 skrll Exp $	*/
 
 /*
  * Copyright (c) 2005 HAMAJIMA Katsuomi. All rights reserved.
@@ -26,12 +26,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1.11 2021/11/21 08:25:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eppcic.c,v 1.12 2022/09/27 06:32:53 skrll Exp $");
 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -175,7 +175,7 @@ eppcic_attach_common(device_t parent, de
 	epled_red_off();
 #endif
 	/* socket 0 */
-	ph = malloc(sizeof(struct eppcic_handle), M_DEVBUF, M_WAITOK);
+	ph = kmem_alloc(sizeof(*ph), KM_SLEEP);
 	sc->sc_ph[0] = ph;
 	ph->ph_sc = sc;
 	ph->ph_socket = 0;

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:32:53 UTC 2022

Modified Files:
src/sys/arch/arm/ep93xx: eppcic.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/ep93xx/eppcic.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/iomd

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:14:41 UTC 2022

Modified Files:
src/sys/arch/arm/iomd: vidcaudio.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/arm/iomd/vidcaudio.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/iomd/vidcaudio.c
diff -u src/sys/arch/arm/iomd/vidcaudio.c:1.61 src/sys/arch/arm/iomd/vidcaudio.c:1.62
--- src/sys/arch/arm/iomd/vidcaudio.c:1.61	Wed Feb  3 14:22:21 2021
+++ src/sys/arch/arm/iomd/vidcaudio.c	Tue Sep 27 06:14:41 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: vidcaudio.c,v 1.61 2021/02/03 14:22:21 isaki Exp $	*/
+/*	$NetBSD: vidcaudio.c,v 1.62 2022/09/27 06:14:41 skrll Exp $	*/
 
 /*
  * Copyright (c) 1995 Melvin Tang-Richardson
@@ -65,13 +65,13 @@
 
 #include 	/* proc.h */
 
-__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.61 2021/02/03 14:22:21 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vidcaudio.c,v 1.62 2022/09/27 06:14:41 skrll Exp $");
 
 #include 
 #include/* autoconfig functions */
 #include  /* device calls */
 #include 
-#include 
+#include 
 #include 	/* device calls */
 #include 
 
@@ -121,6 +121,7 @@ struct vidcaudio_softc {
 	vaddr_t	sc_poffset;
 	vaddr_t	sc_pbufsize;
 	paddr_t	*sc_ppages;
+	size_t	sc_szppages;
 	void	(*sc_pintr)(void *);
 	void	*sc_parg;
 	int	sc_pcountdown;
@@ -294,8 +295,9 @@ vidcaudio_close(void *addr)
 	DPRINTF(("DEBUG: vidcaudio_close called\n"));
 	sc = addr;
 	if (sc->sc_ppages != NULL) {
-		free(sc->sc_ppages, M_DEVBUF);
+		kmem_free(sc->sc_ppages, sc->sc_szppages * sizeof(paddr_t));
 		sc->sc_ppages = NULL;
+		sc->sc_szppages = 0;
 	}
 }
 
@@ -390,8 +392,9 @@ vidcaudio_trigger_output(void *addr, voi
 	sc->sc_pbufsize = (char *)end - (char *)start;
 	npages = sc->sc_pbufsize >> PGSHIFT;
 	if (sc->sc_ppages != NULL)
-		free(sc->sc_ppages, M_DEVBUF);
-	sc->sc_ppages = malloc(npages * sizeof(paddr_t), M_DEVBUF, M_WAITOK);
+		kmem_free(sc->sc_ppages, sc->sc_szppages);
+	sc->sc_szppages = npages * sizeof(paddr_t);
+	sc->sc_ppages = kmem_alloc(sc->sc_szppages, KM_SLEEP);
 	if (sc->sc_ppages == NULL)
 		return ENOMEM;
 	for (i = 0; i < npages; i++)

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:14:41 UTC 2022

Modified Files:
src/sys/arch/arm/iomd: vidcaudio.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/arm/iomd/vidcaudio.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/sunxi

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:14:13 UTC 2022

Modified Files:
src/sys/arch/arm/sunxi: sunxi_can.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/sunxi/sunxi_can.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_can.c
diff -u src/sys/arch/arm/sunxi/sunxi_can.c:1.11 src/sys/arch/arm/sunxi/sunxi_can.c:1.12
--- src/sys/arch/arm/sunxi/sunxi_can.c:1.11	Wed Sep 21 20:21:16 2022
+++ src/sys/arch/arm/sunxi/sunxi_can.c	Tue Sep 27 06:14:13 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: sunxi_can.c,v 1.11 2022/09/21 20:21:16 bouyer Exp $	*/
+/*	$NetBSD: sunxi_can.c,v 1.12 2022/09/27 06:14:13 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2017,2018 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
 
 #include 
 
-__KERNEL_RCSID(1, "$NetBSD: sunxi_can.c,v 1.11 2022/09/21 20:21:16 bouyer Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_can.c,v 1.12 2022/09/27 06:14:13 skrll Exp $");
 
 #include 
 #include 
@@ -232,8 +232,7 @@ sunxi_can_attach(device_t parent, device
 	rnd_attach_source(>sc_rnd_source, device_xname(self),
 	RND_TYPE_NET, RND_FLAG_DEFAULT);
 #ifdef MBUFTRACE
-	ifp->if_mowner = malloc(sizeof(struct mowner), M_DEVBUF,
-	M_WAITOK | M_ZERO);
+	ifp->if_mowner = kmem_zalloc(sizeof(*ifp->if_mowner), KM_SLEEP);
 	strlcpy(ifp->if_mowner->mo_name, ifp->if_xname,
 		sizeof(ifp->if_mowner->mo_name));
 	MOWNER_ATTACH(ifp->if_mowner);

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:14:13 UTC 2022

Modified Files:
src/sys/arch/arm/sunxi: sunxi_can.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/sunxi/sunxi_can.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/xscale

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:13:42 UTC 2022

Modified Files:
src/sys/arch/arm/xscale: ixp425_if_npe.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/xscale/ixp425_if_npe.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/xscale/ixp425_if_npe.c
diff -u src/sys/arch/arm/xscale/ixp425_if_npe.c:1.52 src/sys/arch/arm/xscale/ixp425_if_npe.c:1.53
--- src/sys/arch/arm/xscale/ixp425_if_npe.c:1.52	Sun Sep 18 15:49:42 2022
+++ src/sys/arch/arm/xscale/ixp425_if_npe.c	Tue Sep 27 06:13:42 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp425_if_npe.c,v 1.52 2022/09/18 15:49:42 thorpej Exp $ */
+/*	$NetBSD: ixp425_if_npe.c,v 1.53 2022/09/27 06:13:42 skrll Exp $ */
 
 /*-
  * Copyright (c) 2006 Sam Leffler.  All rights reserved.
@@ -28,7 +28,7 @@
 #if 0
 __FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.1 2006/11/19 23:55:23 sam Exp $");
 #endif
-__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.52 2022/09/18 15:49:42 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_if_npe.c,v 1.53 2022/09/27 06:13:42 skrll Exp $");
 
 /*
  * Intel XScale NPE Ethernet driver.
@@ -52,8 +52,8 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_if_np
 #include 
 #include 
 #include 
+#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -468,9 +468,7 @@ npe_dma_setup(struct npe_softc *sc, stru
 		goto unmap_dmamem;
 	}
 
-	/* XXX M_TEMP */
-	dma->buf = malloc(nbuf * sizeof(struct npebuf), M_TEMP,
-	M_WAITOK | M_ZERO);
+	dma->buf = kmem_zalloc(nbuf * sizeof(struct npebuf), KM_SLEEP);
 	dma->buf_phys = dma->buf_map->dm_segs[0].ds_addr;
 	for (i = 0; i < dma->nbuf; i++) {
 		struct npebuf *npe = >buf[i];
@@ -514,7 +512,7 @@ npe_dma_destroy(struct npe_softc *sc, st
 		bus_dmamap_destroy(sc->sc_dt, dma->buf_map);
 	}
 	if (dma->buf != NULL)
-		free(dma->buf, M_TEMP);
+		kmem_free(dma->buf, dma->nbuf * sizeof(struct npebuf));
 	memset(dma, 0, sizeof(*dma));
 }
 #endif

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:13:42 UTC 2022

Modified Files:
src/sys/arch/arm/xscale: ixp425_if_npe.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/arm/xscale/ixp425_if_npe.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/xscale

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:12:58 UTC 2022

Modified Files:
src/sys/arch/arm/xscale: ixp425_qmgr.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/xscale/ixp425_qmgr.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/xscale/ixp425_qmgr.c
diff -u src/sys/arch/arm/xscale/ixp425_qmgr.c:1.11 src/sys/arch/arm/xscale/ixp425_qmgr.c:1.12
--- src/sys/arch/arm/xscale/ixp425_qmgr.c:1.11	Fri Dec 10 20:36:02 2021
+++ src/sys/arch/arm/xscale/ixp425_qmgr.c	Tue Sep 27 06:12:58 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: ixp425_qmgr.c,v 1.11 2021/12/10 20:36:02 andvar Exp $	*/
+/*	$NetBSD: ixp425_qmgr.c,v 1.12 2022/09/27 06:12:58 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2006 Sam Leffler, Errno Consulting
@@ -60,7 +60,7 @@
 */
 #include 
 /*__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_qmgr.c,v 1.1 2006/11/19 23:55:23 sam Exp $");*/
-__KERNEL_RCSID(0, "$NetBSD: ixp425_qmgr.c,v 1.11 2021/12/10 20:36:02 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ixp425_qmgr.c,v 1.12 2022/09/27 06:12:58 skrll Exp $");
 
 /*
  * Intel XScale Queue Manager support.
@@ -80,7 +80,7 @@ __KERNEL_RCSID(0, "$NetBSD: ixp425_qmgr.
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include 
@@ -229,7 +229,7 @@ ixpqmgr_init(bus_space_tag_t iot)
 	sc->sc_dev = dev;
 	sc->sc_iot = sa->sc_iot;
 #else
-	sc = malloc(sizeof(*sc), M_DEVBUF, M_WAITOK | M_ZERO);
+	sc = kmem_zalloc(sizeof(*sc), KM_SLEEP);
 	sc->sc_iot = iot;
 #endif
 
@@ -252,7 +252,7 @@ ixpqmgr_init(bus_space_tag_t iot)
 	ixpqmgr_intr, sc);
 	if (sc->sc_ih[0] == NULL) {
 		ixpqmgr_sc = NULL;
-		free(sc, M_DEVBUF);
+		kmem_free(sc, sizeof(*sc));
 		return (NULL);
 	}
 	sc->sc_ih[1] = ixp425_intr_establish(IXP425_INT_QUE33_64, IPL_NET,
@@ -260,7 +260,7 @@ ixpqmgr_init(bus_space_tag_t iot)
 	if (sc->sc_ih[1] == NULL) {
 		ixp425_intr_disestablish(sc->sc_ih[0]);
 		ixpqmgr_sc = NULL;
-		free(sc, M_DEVBUF);
+		kmem_free(sc, sizeof(*sc));
 		return (NULL);
 	}
 #endif

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:12:58 UTC 2022

Modified Files:
src/sys/arch/arm/xscale: ixp425_qmgr.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/xscale/ixp425_qmgr.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/evbarm/ifpga

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:12:19 UTC 2022

Modified Files:
src/sys/arch/evbarm/ifpga: ifpga.c

Log Message:
malloc -> kmem
small KNF while I'm here


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/ifpga/ifpga.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/evbarm/ifpga/ifpga.c
diff -u src/sys/arch/evbarm/ifpga/ifpga.c:1.30 src/sys/arch/evbarm/ifpga/ifpga.c:1.31
--- src/sys/arch/evbarm/ifpga/ifpga.c:1.30	Sat Aug  7 16:18:49 2021
+++ src/sys/arch/evbarm/ifpga/ifpga.c	Tue Sep 27 06:12:19 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: ifpga.c,v 1.30 2021/08/07 16:18:49 thorpej Exp $ */
+/*	$NetBSD: ifpga.c,v 1.31 2022/09/27 06:12:19 skrll Exp $ */
 
 /*
  * Copyright (c) 2001 ARM Ltd
@@ -38,13 +38,13 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ifpga.c,v 1.30 2021/08/07 16:18:49 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ifpga.c,v 1.31 2022/09/27 06:12:19 skrll Exp $");
 
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include 
@@ -267,7 +267,7 @@ ifpga_attach(device_t parent, device_t s
 	printf("\n");
 
 #if NPCI > 0
-	pci_sc = malloc(sizeof(struct ifpga_pci_softc), M_DEVBUF, M_WAITOK);
+	pci_sc = kmem_alloc(sizeof(*pci_sc), KM_SLEEP);
 	pci_sc->sc_iot = _pci_io_tag;
 	pci_sc->sc_memt = _pci_mem_tag;
 

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:12:19 UTC 2022

Modified Files:
src/sys/arch/evbarm/ifpga: ifpga.c

Log Message:
malloc -> kmem
small KNF while I'm here


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/ifpga/ifpga.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/evbarm/dev

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:11:36 UTC 2022

Modified Files:
src/sys/arch/evbarm/dev: plcom.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbarm/dev/plcom.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/evbarm/dev/plcom.c
diff -u src/sys/arch/evbarm/dev/plcom.c:1.64 src/sys/arch/evbarm/dev/plcom.c:1.65
--- src/sys/arch/evbarm/dev/plcom.c:1.64	Wed Oct 20 01:09:49 2021
+++ src/sys/arch/evbarm/dev/plcom.c	Tue Sep 27 06:11:36 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: plcom.c,v 1.64 2021/10/20 01:09:49 jmcneill Exp $	*/
+/*	$NetBSD: plcom.c,v 1.65 2022/09/27 06:11:36 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2001 ARM Ltd
@@ -94,7 +94,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.64 2021/10/20 01:09:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.65 2022/09/27 06:11:36 skrll Exp $");
 
 #include "opt_plcom.h"
 #include "opt_ddb.h"
@@ -127,7 +127,7 @@ __KERNEL_RCSID(0, "$NetBSD: plcom.c,v 1.
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -514,7 +514,7 @@ plcom_attach_subr(struct plcom_softc *sc
 	tp->t_hwiflow = plcomhwiflow;
 
 	sc->sc_tty = tp;
-	sc->sc_rbuf = malloc(plcom_rbuf_size << 1, M_DEVBUF, M_WAITOK);
+	sc->sc_rbuf = kmem_alloc(plcom_rbuf_size << 1, KM_SLEEP);
 	sc->sc_rbput = sc->sc_rbget = sc->sc_rbuf;
 	sc->sc_rbavail = plcom_rbuf_size;
 	sc->sc_ebuf = sc->sc_rbuf + (plcom_rbuf_size << 1);
@@ -624,7 +624,7 @@ plcom_detach(device_t self, int flags)
 	}
 
 	/* Free the receive buffer. */
-	free(sc->sc_rbuf, M_DEVBUF);
+	kmem_free(sc->sc_rbuf, sc->sc_ebuf - sc->sc_rbuf);
 
 	/* Detach and free the tty. */
 	tty_detach(sc->sc_tty);

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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Sep 27 06:11:36 UTC 2022

Modified Files:
src/sys/arch/evbarm/dev: plcom.c

Log Message:
malloc -> kmem


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/evbarm/dev/plcom.c

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