CVS commit: src/sbin/mount
Module Name:src Committed By: charlotte Date: Wed Apr 3 03:54:53 UTC 2024 Modified Files: src/sbin/mount: mount.8 Log Message: mount(8): Mention the ability to refer to dk(4) wedges in the manpage To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sbin/mount/mount.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount/mount.8 diff -u src/sbin/mount/mount.8:1.90 src/sbin/mount/mount.8:1.91 --- src/sbin/mount/mount.8:1.90 Sun Jul 10 18:52:34 2022 +++ src/sbin/mount/mount.8 Wed Apr 3 03:54:53 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: mount.8,v 1.90 2022/07/10 18:52:34 snj Exp $ +.\" $NetBSD: mount.8,v 1.91 2024/04/03 03:54:53 charlotte Exp $ .\" .\" Copyright (c) 1980, 1989, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 .\" -.Dd July 10, 2022 +.Dd April 2, 2024 .Dt MOUNT 8 .Os .Sh NAME @@ -137,7 +137,13 @@ or at sign .Pq Ql \&@ , then the .Li nfs -type is inferred. +type is inferred. Otherwise, a +.Xr dk 4 +wedge may be referred to by its name with a +.Ar special +argument of the form +.Dq NAME= . +.Pp In .Nx , the file system mounting policy is dictated by the running security models.
CVS commit: src/sbin/mount
Module Name:src Committed By: charlotte Date: Wed Apr 3 03:54:53 UTC 2024 Modified Files: src/sbin/mount: mount.8 Log Message: mount(8): Mention the ability to refer to dk(4) wedges in the manpage To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sbin/mount/mount.8 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
Module Name:src
Committed By: charlotte
Date: Tue Apr 2 23:46:20 UTC 2024
Modified Files:
src/share/man/man4: dk.4
Log Message:
dk.4: Document DKWEDGE_METHOD_TOS
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/dk.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/dk.4
diff -u src/share/man/man4/dk.4:1.13 src/share/man/man4/dk.4:1.14
--- src/share/man/man4/dk.4:1.13 Wed Jan 6 18:05:58 2021
+++ src/share/man/man4/dk.4 Tue Apr 2 23:46:19 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: dk.4,v 1.13 2021/01/06 18:05:58 wiz Exp $
+.\" $NetBSD: dk.4,v 1.14 2024/04/02 23:46:19 charlotte Exp $
.\"
.\" Copyright (c) 2006 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" Jonathan A. Kollasch used vnd(4) as the template for this man page.
.\"
-.Dd January 6, 2021
+.Dd April 2, 2024
.Dt DK 4
.Os
.Sh NAME
@@ -44,6 +44,7 @@ driver
.Cd "options DKWEDGE_METHOD_MBR"
.Cd "options DKWEDGE_METHOD_RDB"
.Cd "options DKWEDGE_METHOD_APPLE"
+.Cd "options DKWEDGE_METHOD_TOS"
.Sh DESCRIPTION
The
.Nm
@@ -114,6 +115,19 @@ extended partitions start with
Amiga Rigid Disk Block (RDB) partitioning detection method.
.It Dv DKWEDGE_METHOD_APPLE
Apple partition map detection method.
+.It Dv DKWEDGE_METHOD_TOS
+Atari's TOS partition map detection method.
+.Pp
+For each partition, a wedge is created with a name of the format
+.Dq ATARI_{TYPE}_{NUMBER}
+where TYPE may either be
+.Dq GEM
+or
+.Dq BGM .
+The first partition typically corresponds to the C: drive when read on an
+actual Atari, the second to D: and so on. Extended partitions (those of type
+.Dq XGM )
+are not currently supported.
.El
.Sh FILES
.Bl -tag -width /dev/XXrXdkX -compact
CVS commit: src/share/man/man4
Module Name:src Committed By: charlotte Date: Tue Apr 2 23:46:20 UTC 2024 Modified Files: src/share/man/man4: dk.4 Log Message: dk.4: Document DKWEDGE_METHOD_TOS To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/share/man/man4/dk.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: charlotte Date: Tue Apr 2 22:56:51 UTC 2024 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/i386/conf: GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU src/sys/arch/macppc/conf: GENERIC GENERIC_601 POWERMAC_G5 src/sys/arch/ofppc/conf: GENERIC src/sys/arch/riscv/conf: GENERIC.common src/sys/arch/sandpoint/conf: GENERIC src/sys/arch/sparc64/conf: GENERIC src/sys/arch/zaurus/conf: GENERIC Log Message: Mention DKWEDGE_METHOD_TOS in several kernel config files To generate a diff of this commit: cvs rdiff -u -r1.609 -r1.610 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.202 -r1.203 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.104 -r1.105 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.1253 -r1.1254 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/conf/XEN3PAE_DOMU cvs rdiff -u -r1.379 -r1.380 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.31 -r1.32 src/sys/arch/macppc/conf/GENERIC_601 cvs rdiff -u -r1.57 -r1.58 src/sys/arch/macppc/conf/POWERMAC_G5 cvs rdiff -u -r1.180 -r1.181 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.11 -r1.12 src/sys/arch/riscv/conf/GENERIC.common cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sandpoint/conf/GENERIC cvs rdiff -u -r1.239 -r1.240 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.96 -r1.97 src/sys/arch/zaurus/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/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.609 src/sys/arch/amd64/conf/GENERIC:1.610 --- src/sys/arch/amd64/conf/GENERIC:1.609 Mon Jan 29 18:27:10 2024 +++ src/sys/arch/amd64/conf/GENERIC Tue Apr 2 22:56:50 2024 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.609 2024/01/29 18:27:10 christos Exp $ +# $NetBSD: GENERIC,v 1.610 2024/04/02 22:56:50 charlotte Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.609 $" +#ident "GENERIC-$Revision: 1.610 $" maxusers 64 # estimated number of users @@ -198,6 +198,7 @@ options DKWEDGE_METHOD_GPT # Supports G #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges #options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges +#options DKWEDGE_METHOD_TOS # Support Atari "TOS" partitions as wedges # File systems include "conf/filesystems.config" Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.202 src/sys/arch/amd64/conf/XEN3_DOM0:1.203 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.202 Mon Jan 29 18:27:10 2024 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Apr 2 22:56:50 2024 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.202 2024/01/29 18:27:10 christos Exp $ +# $NetBSD: XEN3_DOM0,v 1.203 2024/04/02 22:56:50 charlotte Exp $ # XEN3_DOM0 machine description file # @@ -14,7 +14,7 @@ include "arch/amd64/conf/std.xen" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "XEN3_DOM0-$Revision: 1.202 $" +#ident "XEN3_DOM0-$Revision: 1.203 $" maxusers 32 # estimated number of users @@ -193,6 +193,7 @@ options DKWEDGE_METHOD_GPT # Supports G #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges #options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges +#options DKWEDGE_METHOD_TOS # Support Atari "TOS" partitions as wedges # File systems include "conf/filesystems.config" Index: src/sys/arch/amd64/conf/XEN3_DOMU diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.104 src/sys/arch/amd64/conf/XEN3_DOMU:1.105 --- src/sys/arch/amd64/conf/XEN3_DOMU:1.104 Mon Jan 29 18:27:10 2024 +++ src/sys/arch/amd64/conf/XEN3_DOMU Tue Apr 2 22:56:50 2024 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOMU,v 1.104 2024/01/29 18:27:10 christos Exp $ +# $NetBSD: XEN3_DOMU,v 1.105 2024/04/02 22:56:50 charlotte Exp $ include "arch/amd64/conf/std.xen" @@ -11,7 +11,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOMU-$Revision: 1.104 $" +#ident "XEN3_DOMU-$Revision: 1.105 $" maxusers 32 # estimated number of users @@ -74,6 +74,7 @@ options DKWEDGE_METHOD_GPT # Supports G #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges #options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges +#options DKWEDGE_METHOD_TOS # Support Atari "TOS" partitions as wedges # File systems include "conf/filesystems.config" Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1253 src/sys/arch/i386/conf/GENERIC:1.1254 ---
CVS commit: src/sys/arch
Module Name:src Committed By: charlotte Date: Tue Apr 2 22:56:51 UTC 2024 Modified Files: src/sys/arch/amd64/conf: GENERIC XEN3_DOM0 XEN3_DOMU src/sys/arch/i386/conf: GENERIC XEN3PAE_DOM0 XEN3PAE_DOMU src/sys/arch/macppc/conf: GENERIC GENERIC_601 POWERMAC_G5 src/sys/arch/ofppc/conf: GENERIC src/sys/arch/riscv/conf: GENERIC.common src/sys/arch/sandpoint/conf: GENERIC src/sys/arch/sparc64/conf: GENERIC src/sys/arch/zaurus/conf: GENERIC Log Message: Mention DKWEDGE_METHOD_TOS in several kernel config files To generate a diff of this commit: cvs rdiff -u -r1.609 -r1.610 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.202 -r1.203 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.104 -r1.105 src/sys/arch/amd64/conf/XEN3_DOMU cvs rdiff -u -r1.1253 -r1.1254 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.42 -r1.43 src/sys/arch/i386/conf/XEN3PAE_DOM0 cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/conf/XEN3PAE_DOMU cvs rdiff -u -r1.379 -r1.380 src/sys/arch/macppc/conf/GENERIC cvs rdiff -u -r1.31 -r1.32 src/sys/arch/macppc/conf/GENERIC_601 cvs rdiff -u -r1.57 -r1.58 src/sys/arch/macppc/conf/POWERMAC_G5 cvs rdiff -u -r1.180 -r1.181 src/sys/arch/ofppc/conf/GENERIC cvs rdiff -u -r1.11 -r1.12 src/sys/arch/riscv/conf/GENERIC.common cvs rdiff -u -r1.112 -r1.113 src/sys/arch/sandpoint/conf/GENERIC cvs rdiff -u -r1.239 -r1.240 src/sys/arch/sparc64/conf/GENERIC cvs rdiff -u -r1.96 -r1.97 src/sys/arch/zaurus/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
Module Name:src Committed By: charlotte Date: Tue Apr 2 22:30:04 UTC 2024 Modified Files: src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL src/sys/conf: files src/sys/dev: files.dev Added Files: src/sys/dev/dkwedge: dkwedge_tos.c Log Message: dk(4): Add support for discovering Atari TOS partitions as wedges Any partitioning scheme which conforms to the Atari AHDI 3.00 spec should be recognized by the new DKWEDGE_METHOD_TOS. To generate a diff of this commit: cvs rdiff -u -r1.186 -r1.187 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.517 -r1.518 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1311 -r1.1312 src/sys/conf/files cvs rdiff -u -r1.9 -r1.10 src/sys/dev/files.dev cvs rdiff -u -r0 -r1.1 src/sys/dev/dkwedge/dkwedge_tos.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: charlotte Date: Tue Apr 2 22:30:04 UTC 2024 Modified Files: src/sys/arch/amd64/conf: ALL src/sys/arch/i386/conf: ALL src/sys/conf: files src/sys/dev: files.dev Added Files: src/sys/dev/dkwedge: dkwedge_tos.c Log Message: dk(4): Add support for discovering Atari TOS partitions as wedges Any partitioning scheme which conforms to the Atari AHDI 3.00 spec should be recognized by the new DKWEDGE_METHOD_TOS. To generate a diff of this commit: cvs rdiff -u -r1.186 -r1.187 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.517 -r1.518 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1311 -r1.1312 src/sys/conf/files cvs rdiff -u -r1.9 -r1.10 src/sys/dev/files.dev cvs rdiff -u -r0 -r1.1 src/sys/dev/dkwedge/dkwedge_tos.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/amd64/conf/ALL diff -u src/sys/arch/amd64/conf/ALL:1.186 src/sys/arch/amd64/conf/ALL:1.187 --- src/sys/arch/amd64/conf/ALL:1.186 Thu Mar 21 02:36:01 2024 +++ src/sys/arch/amd64/conf/ALL Tue Apr 2 22:30:03 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.186 2024/03/21 02:36:01 riastradh Exp $ +# $NetBSD: ALL,v 1.187 2024/04/02 22:30:03 charlotte Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.186 $" +#ident "ALL-$Revision: 1.187 $" maxusers 64 # estimated number of users @@ -164,6 +164,7 @@ options DKWEDGE_METHOD_BSDLABEL # Suppo options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges +options DKWEDGE_METHOD_TOS # Support Atari "TOS" partitions as wedges # File systems file-system FFS # UFS Index: src/sys/arch/i386/conf/ALL diff -u src/sys/arch/i386/conf/ALL:1.517 src/sys/arch/i386/conf/ALL:1.518 --- src/sys/arch/i386/conf/ALL:1.517 Thu Mar 21 02:36:01 2024 +++ src/sys/arch/i386/conf/ALL Tue Apr 2 22:30:03 2024 @@ -1,4 +1,4 @@ -# $NetBSD: ALL,v 1.517 2024/03/21 02:36:01 riastradh Exp $ +# $NetBSD: ALL,v 1.518 2024/04/02 22:30:03 charlotte Exp $ # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp # # ALL machine description file @@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "ALL-$Revision: 1.517 $" +#ident "ALL-$Revision: 1.518 $" maxusers 64 # estimated number of users @@ -151,6 +151,7 @@ options DKWEDGE_METHOD_GPT # Supports G #options DKWEDGE_METHOD_MBR # Support MBR partitions as wedges options DKWEDGE_METHOD_APPLE # Support Apple partitions as wedges options DKWEDGE_METHOD_RDB # Support RDB partitions as wedges +options DKWEDGE_METHOD_TOS # Support Atari "TOS" partitions as wedges # File systems file-system FFS # UFS Index: src/sys/conf/files diff -u src/sys/conf/files:1.1311 src/sys/conf/files:1.1312 --- src/sys/conf/files:1.1311 Fri Feb 9 22:08:34 2024 +++ src/sys/conf/files Tue Apr 2 22:30:03 2024 @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.1311 2024/02/09 22:08:34 andvar Exp $ +# $NetBSD: files,v 1.1312 2024/04/02 22:30:03 charlotte Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 version 20171118 @@ -105,6 +105,7 @@ defflag opt_dkwedge.h DKWEDGE_AUTODISCO DKWEDGE_METHOD_MBR DKWEDGE_METHOD_APPLE DKWEDGE_METHOD_RDB +DKWEDGE_METHOD_TOS defflag opt_veriexec.h VERIFIED_EXEC_FP_SHA256 VERIFIED_EXEC_FP_SHA384 Index: src/sys/dev/files.dev diff -u src/sys/dev/files.dev:1.9 src/sys/dev/files.dev:1.10 --- src/sys/dev/files.dev:1.9 Sat Jun 4 03:31:10 2022 +++ src/sys/dev/files.dev Tue Apr 2 22:30:03 2024 @@ -1,4 +1,4 @@ -# $NetBSD: files.dev,v 1.9 2022/06/04 03:31:10 pgoyette Exp $ +# $NetBSD: files.dev,v 1.10 2024/04/02 22:30:03 charlotte Exp $ file dev/bio.c bio needs-flag file dev/ccd.c ccd @@ -13,6 +13,7 @@ file dev/dkwedge/dkwedge_bsdlabel.c dkwe file dev/dkwedge/dkwedge_gpt.c dkwedge_method_gpt file dev/dkwedge/dkwedge_mbr.c dkwedge_method_mbr file dev/dkwedge/dkwedge_rdb.c dkwedge_method_rdb +file dev/dkwedge/dkwedge_tos.c dkwedge_method_tos file dev/firmload.c firmload file dev/fss.c fss file dev/keylock.c keylock Added files: Index: src/sys/dev/dkwedge/dkwedge_tos.c diff -u /dev/null src/sys/dev/dkwedge/dkwedge_tos.c:1.1 --- /dev/null Tue Apr 2 22:30:04 2024 +++ src/sys/dev/dkwedge/dkwedge_tos.c Tue Apr 2 22:30:03 2024 @@ -0,0 +1,175 @@ +/* $NetBSD: dkwedge_tos.c,v 1.1 2024/04/02 22:30:03 charlotte Exp $ */ + +/* + * Copyright (c) 2024 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Found
CVS commit: src/games/rain
Module Name:src
Committed By: charlotte
Date: Wed Feb 28 23:24:52 UTC 2024
Modified Files:
src/games/rain: rain.c
Log Message:
rain(6): Update the "rainable area" upon SIGWINCH
This makes sure rain falls to fill the entire window even if the window
grows in size.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/games/rain/rain.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/rain/rain.c
diff -u src/games/rain/rain.c:1.23 src/games/rain/rain.c:1.24
--- src/games/rain/rain.c:1.23 Wed Feb 28 23:14:37 2024
+++ src/games/rain/rain.c Wed Feb 28 23:24:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: rain.c,v 1.23 2024/02/28 23:14:37 charlotte Exp $ */
+/* $NetBSD: rain.c,v 1.24 2024/02/28 23:24:52 charlotte Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)rain.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: rain.c,v 1.23 2024/02/28 23:14:37 charlotte Exp $");
+__RCSID("$NetBSD: rain.c,v 1.24 2024/02/28 23:24:52 charlotte Exp $");
#endif
#endif /* not lint */
@@ -59,8 +59,11 @@ __RCSID("$NetBSD: rain.c,v 1.23 2024/02/
#include
static volatile sig_atomic_t sig_caught = 0;
+static long cols;
+static long lines;
int main(int, char **);
+static void winupdate(void);
static void onsig(int);
@@ -68,7 +71,6 @@ int
main(int argc, char **argv)
{
int x, y, j;
- long cols, lines;
unsigned int delay = 12;
unsigned long val = 0;
int ch;
@@ -95,10 +97,7 @@ main(int argc, char **argv)
if (!initscr())
errx(0, "couldn't initialize screen");
- cols = COLS - 4;
- lines = LINES - 4;
- if (cols == 0) cols++;
- if (lines == 0) lines++;
+ winupdate();
(void)signal(SIGHUP, onsig);
(void)signal(SIGINT, onsig);
@@ -114,6 +113,10 @@ main(int argc, char **argv)
(void)endwin();
exit(0);
}
+ if (is_term_resized(LINES, COLS)) {
+ resizeterm(LINES, COLS);
+ winupdate();
+ }
x = random() % cols + 2;
y = random() % lines + 2;
(void)mvaddch(y, x, '.');
@@ -147,6 +150,15 @@ main(int argc, char **argv)
}
}
+static void
+winupdate(void)
+{
+ cols = COLS - 4;
+ lines = LINES - 4;
+ if (cols == 0) cols++;
+ if (lines == 0) lines++;
+}
+
/* ARGSUSED */
static void
onsig(int dummy __unused)
CVS commit: src/games/rain
Module Name:src Committed By: charlotte Date: Wed Feb 28 23:24:52 UTC 2024 Modified Files: src/games/rain: rain.c Log Message: rain(6): Update the "rainable area" upon SIGWINCH This makes sure rain falls to fill the entire window even if the window grows in size. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/games/rain/rain.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/rain
Module Name:src
Committed By: charlotte
Date: Wed Feb 28 23:14:37 UTC 2024
Modified Files:
src/games/rain: rain.c
Log Message:
rain(6): Avoid division by zero
If there were exactly 4 LINES or COLS then we'd attempt to draw a raindrop
at some value mod 0, which is invalid.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/games/rain/rain.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/games/rain/rain.c
diff -u src/games/rain/rain.c:1.22 src/games/rain/rain.c:1.23
--- src/games/rain/rain.c:1.22 Wed Oct 14 18:32:04 2020
+++ src/games/rain/rain.c Wed Feb 28 23:14:37 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: rain.c,v 1.22 2020/10/14 18:32:04 nia Exp $ */
+/* $NetBSD: rain.c,v 1.23 2024/02/28 23:14:37 charlotte Exp $ */
/*
* Copyright (c) 1980, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)rain.c 8.1 (Berkeley) 5/31/93";
#else
-__RCSID("$NetBSD: rain.c,v 1.22 2020/10/14 18:32:04 nia Exp $");
+__RCSID("$NetBSD: rain.c,v 1.23 2024/02/28 23:14:37 charlotte Exp $");
#endif
#endif /* not lint */
@@ -97,6 +97,8 @@ main(int argc, char **argv)
errx(0, "couldn't initialize screen");
cols = COLS - 4;
lines = LINES - 4;
+ if (cols == 0) cols++;
+ if (lines == 0) lines++;
(void)signal(SIGHUP, onsig);
(void)signal(SIGINT, onsig);
CVS commit: src/games/rain
Module Name:src Committed By: charlotte Date: Wed Feb 28 23:14:37 UTC 2024 Modified Files: src/games/rain: rain.c Log Message: rain(6): Avoid division by zero If there were exactly 4 LINES or COLS then we'd attempt to draw a raindrop at some value mod 0, which is invalid. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/games/rain/rain.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
Module Name:src
Committed By: charlotte
Date: Mon Feb 26 21:55:05 UTC 2024
Modified Files:
src/sys/dev/dkwedge: dkwedge_mbr.c
Log Message:
In case of trouble reading an MBR, make sure error field is set before
reporting it
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/dkwedge/dkwedge_mbr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dkwedge/dkwedge_mbr.c
diff -u src/sys/dev/dkwedge/dkwedge_mbr.c:1.12 src/sys/dev/dkwedge/dkwedge_mbr.c:1.13
--- src/sys/dev/dkwedge/dkwedge_mbr.c:1.12 Sat Apr 11 16:00:34 2020
+++ src/sys/dev/dkwedge/dkwedge_mbr.c Mon Feb 26 21:55:05 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dkwedge_mbr.c,v 1.12 2020/04/11 16:00:34 jdolecek Exp $ */
+/* $NetBSD: dkwedge_mbr.c,v 1.13 2024/02/26 21:55:05 charlotte Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_mbr.c,v 1.12 2020/04/11 16:00:34 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_mbr.c,v 1.13 2024/02/26 21:55:05 charlotte Exp $");
#include
#include
@@ -90,9 +90,9 @@ getparts(mbr_args_t *a, uint32_t off, ui
error = dkwedge_read(a->pdk, a->vp, off, a->bp->b_data, a->secsize);
if (error) {
+ a->error = error;
aprint_error("%s: unable to read MBR @ %u/%u, "
"error = %d\n", a->pdk->dk_name, off, a->secsize, a->error);
- a->error = error;
return;
}
CVS commit: src/sys/dev/dkwedge
Module Name:src Committed By: charlotte Date: Mon Feb 26 21:55:05 UTC 2024 Modified Files: src/sys/dev/dkwedge: dkwedge_mbr.c Log Message: In case of trouble reading an MBR, make sure error field is set before reporting it To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/dev/dkwedge/dkwedge_mbr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/dev
Module Name:src
Committed By: charlotte
Date: Sat Oct 1 07:59:25 UTC 2022
Modified Files:
src/sys/arch/sparc64/dev: pci_machdep.c
Log Message:
Don't try to make a tag based on node 0
To generate a diff of this commit:
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/sparc64/dev/pci_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/sparc64/dev/pci_machdep.c
diff -u src/sys/arch/sparc64/dev/pci_machdep.c:1.78 src/sys/arch/sparc64/dev/pci_machdep.c:1.79
--- src/sys/arch/sparc64/dev/pci_machdep.c:1.78 Mon Sep 3 16:29:27 2018
+++ src/sys/arch/sparc64/dev/pci_machdep.c Sat Oct 1 07:59:25 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.78 2018/09/03 16:29:27 riastradh Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.79 2022/10/01 07:59:25 charlotte Exp $ */
/*
* Copyright (c) 1999, 2000 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.78 2018/09/03 16:29:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.79 2022/10/01 07:59:25 charlotte Exp $");
#include
#include
@@ -116,7 +116,7 @@ pci_make_tag(pci_chipset_tag_t pc, int b
struct ofw_pci_register reg;
pcitag_t tag;
int (*valid)(void *);
- int node, len;
+ int node, new_node, len;
#ifdef DEBUG
char name[80];
memset(name, 0, sizeof(name));
@@ -193,8 +193,11 @@ pci_make_tag(pci_chipset_tag_t pc, int b
break;
if (len != 2 || b < busrange[0] || b > busrange[1])
break;
- /* Go down 1 level */
- node = prom_firstchild(node);
+ /* Go down 1 level, as long as we're able */
+ new_node = prom_firstchild(node);
+ if (new_node == 0)
+break;
+ node = new_node;
DPRINTF(SPDB_PROBE, ("going down to node %x %s\n", node,
prom_getpropstringA(node, "name", name,
sizeof(name;
CVS commit: src/sys/arch/sparc64/dev
Module Name:src Committed By: charlotte Date: Sat Oct 1 07:59:25 UTC 2022 Modified Files: src/sys/arch/sparc64/dev: pci_machdep.c Log Message: Don't try to make a tag based on node 0 To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/arch/sparc64/dev/pci_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/distrib/notes/sparc64
On Thu, 29 Sep 2022, Izumi Tsutsui wrote: Modified Files: src/distrib/notes/sparc64: prep Log Message: Avoid dead link to the NVRAM/Hostid FAQ Maybe this mirror is better than archive.org: http://www.obsolyte.com/sunFAQ/faq_nvram.html --- Izumi Tsutsui That link is a mirror to an older version of the document (1998 versus 2004), but indeed it certainly feels nicer than relying upon the Wayback Machine. Besides, I *wanted* to use something better than archive.org in the first place, but couldn't find anything. I think I will change it to the obsolyte.com link, thanks for the pointer. Maybe it makes sense to write an article in our own wiki instead? From what I gather, reprogramming these NVRAM/clock chips is a *very* common task. (In fact, I'm going to do it myself with the Sun Blade 100 that I'm getting tomorrow!) Charlotte
CVS commit: src/distrib/notes/sparc
Module Name:src Committed By: charlotte Date: Wed Sep 28 06:09:14 UTC 2022 Modified Files: src/distrib/notes/sparc: prep Log Message: Avoid dead link to the NVRAM FAQ in docs for sparc, too To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/distrib/notes/sparc/prep Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/sparc/prep diff -u src/distrib/notes/sparc/prep:1.30 src/distrib/notes/sparc/prep:1.31 --- src/distrib/notes/sparc/prep:1.30 Wed Nov 27 18:34:56 2019 +++ src/distrib/notes/sparc/prep Wed Sep 28 06:09:14 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: prep,v 1.30 2019/11/27 18:34:56 uwe Exp $ +.\" $NetBSD: prep,v 1.31 2022/09/28 06:09:14 charlotte Exp $ . .Ss2 Configuring your PROM . @@ -33,7 +33,7 @@ If the ethernet address of your \*M syst .Li ff:ff:ff:ff:ff:ff , then your NVRAM battery is dead and you will have trouble using ethernet (among other problems). Read the -.Lk http://www.squirrel.com/squirrel/sun-nvram-hostid.faq.html "Sun NVRAM/Hostid FAQ" . +.Lk https://web.archive.org/web/20150611091616/https://www.squirrel.com/squirrel/sun-nvram-hostid.faq.html "Sun NVRAM/Hostid FAQ" . .Pp If you have a valid ethernet address and you plan to netboot, write down your system's ethernet address.
CVS commit: src/distrib/notes/sparc
Module Name:src Committed By: charlotte Date: Wed Sep 28 06:09:14 UTC 2022 Modified Files: src/distrib/notes/sparc: prep Log Message: Avoid dead link to the NVRAM FAQ in docs for sparc, too To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/distrib/notes/sparc/prep Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/sparc64
Module Name:src Committed By: charlotte Date: Wed Sep 28 06:06:59 UTC 2022 Modified Files: src/distrib/notes/sparc64: prep Log Message: Avoid dead link to the NVRAM/Hostid FAQ To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/distrib/notes/sparc64/prep Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/sparc64/prep diff -u src/distrib/notes/sparc64/prep:1.16 src/distrib/notes/sparc64/prep:1.17 --- src/distrib/notes/sparc64/prep:1.16 Wed Nov 27 09:29:25 2019 +++ src/distrib/notes/sparc64/prep Wed Sep 28 06:06:59 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: prep,v 1.16 2019/11/27 09:29:25 martin Exp $ +.\" $NetBSD: prep,v 1.17 2022/09/28 06:06:59 charlotte Exp $ . .Ss2 Deciding on partition sizes . @@ -74,7 +74,7 @@ If the ethernet address of your \*M syst command), then your NVRAM battery is dead and you will have trouble using ethernet (among other problems). Read the -.Lk http://www.squirrel.com/squirrel/sun-nvram-hostid.faq.html "Sun NVRAM/Hostid FAQ" . +.Lk https://web.archive.org/web/20150611091616/https://www.squirrel.com/squirrel/sun-nvram-hostid.faq.html "Sun NVRAM/Hostid FAQ" . .Pp If you have a valid ethernet address and you plan to netboot, write down your system's ethernet address.
CVS commit: src/distrib/notes/sparc64
Module Name:src Committed By: charlotte Date: Wed Sep 28 06:06:59 UTC 2022 Modified Files: src/distrib/notes/sparc64: prep Log Message: Avoid dead link to the NVRAM/Hostid FAQ To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/distrib/notes/sparc64/prep Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/db
Module Name:src
Committed By: charlotte
Date: Wed Aug 10 00:28:00 UTC 2022
Modified Files:
src/usr.bin/db: db.c
Log Message:
db(1): Don't lie in the usage message re: `-q`
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/db/db.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/db/db.c
diff -u src/usr.bin/db/db.c:1.27 src/usr.bin/db/db.c:1.28
--- src/usr.bin/db/db.c:1.27 Wed Aug 25 23:11:51 2021
+++ src/usr.bin/db/db.c Wed Aug 10 00:28:00 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: db.c,v 1.27 2021/08/25 23:11:51 rillig Exp $ */
+/* $NetBSD: db.c,v 1.28 2022/08/10 00:28:00 charlotte Exp $ */
/*-
* Copyright (c) 2002-2009 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include
#ifndef lint
#ifdef __RCSID
-__RCSID("$NetBSD: db.c,v 1.27 2021/08/25 23:11:51 rillig Exp $");
+__RCSID("$NetBSD: db.c,v 1.28 2022/08/10 00:28:00 charlotte Exp $");
#endif /* __RCSID */
#endif /* not lint */
@@ -741,7 +741,7 @@ usage(void)
" -N don't NUL terminate key\n"
" -O outsepoutput field separator string [default: a tab]\n"
" -P pagesize database page size [default: 4096]\n"
-" -q quiet operation (missing keys aren't errors)\n"
+" -q quiet operation\n"
" -R replace existing keys\n"
" -S visitem items to strvis(3) encode: 'k'ey, 'v'alue, 'b'oth\n"
" -T visspec options to control -S and -U; like vis(1) options\n"
CVS commit: src/usr.bin/db
Module Name:src Committed By: charlotte Date: Wed Aug 10 00:28:00 UTC 2022 Modified Files: src/usr.bin/db: db.c Log Message: db(1): Don't lie in the usage message re: `-q` To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/db/db.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/mixerctl
Module Name:src
Committed By: charlotte
Date: Wed Aug 10 00:14:22 UTC 2022
Modified Files:
src/tests/usr.bin/mixerctl: t_mixerctl.sh
Log Message:
Add a TNF copyright statement in t_mixerctl.sh
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/mixerctl/t_mixerctl.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/usr.bin/mixerctl/t_mixerctl.sh
diff -u src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.11 src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.12
--- src/tests/usr.bin/mixerctl/t_mixerctl.sh:1.11 Sat Dec 18 10:50:48 2021
+++ src/tests/usr.bin/mixerctl/t_mixerctl.sh Wed Aug 10 00:14:22 2022
@@ -1,4 +1,32 @@
-# $NetBSD: t_mixerctl.sh,v 1.11 2021/12/18 10:50:48 kre Exp $
+# $NetBSD: t_mixerctl.sh,v 1.12 2022/08/10 00:14:22 charlotte Exp $
+#
+# Copyright (c) 2017 The NetBSD Foundation, Inc.
+# All rights reserved.
+#
+# This code is derived from software contributed to The NetBSD Foundation
+# by Charlotte Koch.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#notice, this list of conditions and the following disclaimer in the
+#documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+# ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+# BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
audio_setup() {
# Open /dev/pad0 so we have a configured audio device.
CVS commit: src/tests/usr.bin/mixerctl
Module Name:src Committed By: charlotte Date: Wed Aug 10 00:14:22 UTC 2022 Modified Files: src/tests/usr.bin/mixerctl: t_mixerctl.sh Log Message: Add a TNF copyright statement in t_mixerctl.sh To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/tests/usr.bin/mixerctl/t_mixerctl.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/db
Module Name:src Committed By: charlotte Date: Tue Aug 9 07:56:19 UTC 2022 Modified Files: src/usr.bin/db: db.1 Log Message: PR bin/51878: db(1)'s man page to describe the actual behavior of '-q' To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/db/db.1 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/db/db.1 diff -u src/usr.bin/db/db.1:1.27 src/usr.bin/db/db.1:1.28 --- src/usr.bin/db/db.1:1.27 Fri Feb 17 11:43:24 2012 +++ src/usr.bin/db/db.1 Tue Aug 9 07:56:19 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: db.1,v 1.27 2012/02/17 11:43:24 wiz Exp $ +.\" $NetBSD: db.1,v 1.28 2022/08/09 07:56:19 charlotte Exp $ .\" .\" Copyright (c) 2002-2009,2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -196,7 +196,7 @@ options may be useful to encode the NUL . .It Fl q Quiet operation. -In read mode, missing keys are not considered to be an error. +In read mode, missing keys are considered to be an error. In delete .Pq Fl d and write
CVS commit: src/usr.bin/db
Module Name:src Committed By: charlotte Date: Tue Aug 9 07:56:19 UTC 2022 Modified Files: src/usr.bin/db: db.1 Log Message: PR bin/51878: db(1)'s man page to describe the actual behavior of '-q' To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/db/db.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libusbhid
Module Name:src Committed By: charlotte Date: Sun May 22 05:33:46 UTC 2022 Modified Files: src/lib/libusbhid: usbhid.3 Log Message: usbhid.3: hid_parse_usage_in_page() actually returns int To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/libusbhid/usbhid.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/libusbhid/usbhid.3 diff -u src/lib/libusbhid/usbhid.3:1.16 src/lib/libusbhid/usbhid.3:1.17 --- src/lib/libusbhid/usbhid.3:1.16 Sun Oct 22 16:49:13 2017 +++ src/lib/libusbhid/usbhid.3 Sun May 22 05:33:46 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: usbhid.3,v 1.16 2017/10/22 16:49:13 abhinav Exp $ +.\" $NetBSD: usbhid.3,v 1.17 2022/05/22 05:33:46 charlotte Exp $ .\" .\" Copyright (c) 1999, 2001 Lennart Augustsson .\" All rights reserved. @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd May 12, 2010 +.Dd May 21, 2022 .Dt USBHID 3 .Os .Sh NAME @@ -71,7 +71,7 @@ .Fn hid_usage_in_page "u_int u" .Ft int .Fn hid_parse_usage_page "const char *" -.Ft char * +.Ft int .Fn hid_parse_usage_in_page "const char *" .Ft void .Fn hid_init "const char *file"
CVS commit: src/lib/libusbhid
Module Name:src Committed By: charlotte Date: Sun May 22 05:33:46 UTC 2022 Modified Files: src/lib/libusbhid: usbhid.3 Log Message: usbhid.3: hid_parse_usage_in_page() actually returns int To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/lib/libusbhid/usbhid.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: charlotte
Date: Sun May 22 00:54:08 UTC 2022
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.795 -r1.796 src/sys/dev/usb/usbdevs.h \
src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.795 src/sys/dev/usb/usbdevs.h:1.796
--- src/sys/dev/usb/usbdevs.h:1.795 Thu May 19 03:58:13 2022
+++ src/sys/dev/usb/usbdevs.h Sun May 22 00:54:07 2022
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.795 2022/05/19 03:58:13 charlotte Exp $ */
+/* $NetBSD: usbdevs.h,v 1.796 2022/05/22 00:54:07 charlotte Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.803 2022/05/19 03:42:12 charlotte Exp
+ * NetBSD: usbdevs,v 1.804 2022/05/22 00:47:00 charlotte Exp
*/
/*-
@@ -3557,6 +3557,7 @@
#define USB_PRODUCT_WACOM_INTUOSA5 0x0021 /* Intuos A5 */
#define USB_PRODUCT_WACOM_GD0912U 0x0022 /* Intuos 9x12 Graphics Tablet */
#define USB_PRODUCT_WACOM_XD0912U 0x0043 /* Intuos2 A4 i-920 XD-0912-U */
+#define USB_PRODUCT_WACOM_CTL671 0x0301 /* CTL-671 Tablet */
#define USB_PRODUCT_WACOM_CTH690K0 0x033e /* Intuos Art CTH-690/K0 */
/* Weltrend Semiconductor */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.795 src/sys/dev/usb/usbdevs_data.h:1.796
--- src/sys/dev/usb/usbdevs_data.h:1.795 Thu May 19 03:58:13 2022
+++ src/sys/dev/usb/usbdevs_data.h Sun May 22 00:54:07 2022
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.795 2022/05/19 03:58:13 charlotte Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.796 2022/05/22 00:54:07 charlotte Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.803 2022/05/19 03:42:12 charlotte Exp
+ * NetBSD: usbdevs,v 1.804 2022/05/22 00:47:00 charlotte Exp
*/
/*-
@@ -4848,22 +4848,24 @@ static const uint32_t usb_products[] = {
20241, 20251, 1967, 20176, 0,
USB_VENDOR_WACOM, USB_PRODUCT_WACOM_XD0912U,
20256, 19290, 20264, 20270, 0,
+ USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CTL671,
+ 20280, 20176, 0,
USB_VENDOR_WACOM, USB_PRODUCT_WACOM_CTH690K0,
- 20241, 20280, 20284, 0,
+ 20241, 20288, 20292, 0,
USB_VENDOR_WELTREND, USB_PRODUCT_WELTREND_HID,
- 20295, 8010, 0,
+ 20303, 8010, 0,
USB_VENDOR_WMR, USB_PRODUCT_WMR_RIGBLASTER,
- 20299, 0,
+ 20307, 0,
USB_VENDOR_WESTERN, USB_PRODUCT_WESTERN_EXTHDD,
- 20310, 20319, 0,
+ 20318, 20327, 0,
USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_WNC0600,
- 20323, 0,
+ 20331, 0,
USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR045G,
5373, 4939, 5381, 5346, 0,
USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_UR055G,
- 20335, 0,
+ 20343, 0,
USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_O8494,
- 20342, 20350, 0,
+ 20350, 20358, 0,
USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_1,
7045, 0,
USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_1_NF,
@@ -4873,7 +4875,7 @@ static const uint32_t usb_products[] = {
USB_VENDOR_WISTRONNEWEB, USB_PRODUCT_WISTRONNEWEB_AR5523_2_NF,
7045, 0,
USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_IMAGING,
- 20358, 20366, 0,
+ 20366, 20374, 0,
USB_VENDOR_XIRLINK, USB_PRODUCT_XIRLINK_PCCAM,
767, 5830, 3016, 0,
USB_VENDOR_XRITE, USB_PRODUCT_XRITE_HUEY_1,
@@ -4887,59 +4889,59 @@ static const uint32_t usb_products[] = {
USB_VENDOR_CONEXANT, USB_PRODUCT_CONEXANT_PRISM_GT_2,
5373, 4939, 5381, 5346, 0,
USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX256,
- 20373, 17333, 17324, 0,
+ 20381, 17333, 17324, 0,
USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU1000,
- 20379, 17333, 17368, 0,
+ 20387, 17333, 17368, 0,
USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU2000,
- 20386, 17333, 17368, 0,
+ 20394, 17333, 17368, 0,
USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MU500,
- 20393, 17333, 17368, 0,
+ 20401, 17333, 17368, 0,
USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UW500,
- 20399, 4939, 7296, 17324, 0,
+ 20407, 4939, 7296, 17324, 0,
USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF6,
- 20405, 17333, 17368, 20412, 0,
+ 20413, 17333, 17368, 20420, 0,
USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF7,
- 20424, 17333, 17368, 20412, 0,
+ 20432, 17333, 17368, 20420, 0,
USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_MOTIF8,
- 20431, 17333, 17368, 20412, 0,
+ 20439, 17333, 17368, 20420, 0,
USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX96,
- 20438, 17333, 17324, 0,
+ 20446, 17333, 17324, 0,
USB_VENDOR_YAMAHA, USB_PRODUCT_YAMAHA_UX16,
- 20443, 17333, 17324, 0,
+ 20451, 17333,
CVS commit: src/sys/dev/usb
Module Name:src Committed By: charlotte Date: Sun May 22 00:54:08 UTC 2022 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.795 -r1.796 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: charlotte Date: Sun May 22 00:47:00 UTC 2022 Modified Files: src/sys/dev/usb: usbdevs Log Message: usbdevs: Add Wacom "One" CTL-671 tablet To generate a diff of this commit: cvs rdiff -u -r1.803 -r1.804 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.803 src/sys/dev/usb/usbdevs:1.804 --- src/sys/dev/usb/usbdevs:1.803 Thu May 19 03:42:12 2022 +++ src/sys/dev/usb/usbdevs Sun May 22 00:47:00 2022 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.803 2022/05/19 03:42:12 charlotte Exp $ +$NetBSD: usbdevs,v 1.804 2022/05/22 00:47:00 charlotte Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -3550,6 +3550,7 @@ product WACOM GRAPHIRE4_4X5 0x0015 Graph product WACOM INTUOSA5 0x0021 Intuos A5 product WACOM GD0912U 0x0022 Intuos 9x12 Graphics Tablet product WACOM XD0912U 0x0043 Intuos2 A4 i-920 XD-0912-U +product WACOM CTL671 0x0301 CTL-671 Tablet product WACOM CTH690K0 0x033e Intuos Art CTH-690/K0 /* Weltrend Semiconductor */
CVS commit: src/sys/dev/usb
Module Name:src Committed By: charlotte Date: Sun May 22 00:47:00 UTC 2022 Modified Files: src/sys/dev/usb: usbdevs Log Message: usbdevs: Add Wacom "One" CTL-671 tablet To generate a diff of this commit: cvs rdiff -u -r1.803 -r1.804 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libcurses
Module Name:src Committed By: charlotte Date: Sat May 21 06:22:49 UTC 2022 Modified Files: src/lib/libcurses: curses_input.3 Log Message: curses_input.3: timeout() actually returns void To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libcurses/curses_input.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libcurses
Module Name:src Committed By: charlotte Date: Sat May 21 06:22:49 UTC 2022 Modified Files: src/lib/libcurses: curses_input.3 Log Message: curses_input.3: timeout() actually returns void To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/lib/libcurses/curses_input.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/libcurses/curses_input.3 diff -u src/lib/libcurses/curses_input.3:1.28 src/lib/libcurses/curses_input.3:1.29 --- src/lib/libcurses/curses_input.3:1.28 Mon May 16 20:09:13 2022 +++ src/lib/libcurses/curses_input.3 Sat May 21 06:22:49 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: curses_input.3,v 1.28 2022/05/16 20:09:13 rillig Exp $ +.\" $NetBSD: curses_input.3,v 1.29 2022/05/21 06:22:49 charlotte Exp $ .\" .\" Copyright (c) 2002 .\" Brett Lymn (bl...@netbsd.org, brett_l...@yahoo.com.au) @@ -99,7 +99,7 @@ .Fn is_keypad "const WINDOW *win" .Ft int .Fn notimeout "WINDOW *win" "bool flag" -.Ft int +.Ft void .Fn timeout "int delay" .Ft int .Fn wtimeout "WINDOW *win" "int delay"
CVS commit: src/sys/dev/usb
Module Name:src Committed By: charlotte Date: Thu May 19 03:58:13 UTC 2022 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen for real To generate a diff of this commit: cvs rdiff -u -r1.794 -r1.795 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs.h diff -u src/sys/dev/usb/usbdevs.h:1.794 src/sys/dev/usb/usbdevs.h:1.795 --- src/sys/dev/usb/usbdevs.h:1.794 Thu May 19 03:42:51 2022 +++ src/sys/dev/usb/usbdevs.h Thu May 19 03:58:13 2022 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs.h,v 1.794 2022/05/19 03:42:51 charlotte Exp $ */ +/* $NetBSD: usbdevs.h,v 1.795 2022/05/19 03:58:13 charlotte Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.802 2022/05/10 15:28:45 mlelstv Exp + * NetBSD: usbdevs,v 1.803 2022/05/19 03:42:12 charlotte Exp */ /*- Index: src/sys/dev/usb/usbdevs_data.h diff -u src/sys/dev/usb/usbdevs_data.h:1.794 src/sys/dev/usb/usbdevs_data.h:1.795 --- src/sys/dev/usb/usbdevs_data.h:1.794 Thu May 19 03:42:51 2022 +++ src/sys/dev/usb/usbdevs_data.h Thu May 19 03:58:13 2022 @@ -1,10 +1,10 @@ -/* $NetBSD: usbdevs_data.h,v 1.794 2022/05/19 03:42:51 charlotte Exp $ */ +/* $NetBSD: usbdevs_data.h,v 1.795 2022/05/19 03:58:13 charlotte Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: usbdevs,v 1.802 2022/05/10 15:28:45 mlelstv Exp + * NetBSD: usbdevs,v 1.803 2022/05/19 03:42:12 charlotte Exp */ /*-
CVS commit: src/sys/dev/usb
Module Name:src Committed By: charlotte Date: Thu May 19 03:58:13 UTC 2022 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen for real To generate a diff of this commit: cvs rdiff -u -r1.794 -r1.795 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: charlotte
Date: Thu May 19 03:42:51 UTC 2022
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
Regen
To generate a diff of this commit:
cvs rdiff -u -r1.793 -r1.794 src/sys/dev/usb/usbdevs.h \
src/sys/dev/usb/usbdevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.793 src/sys/dev/usb/usbdevs.h:1.794
--- src/sys/dev/usb/usbdevs.h:1.793 Tue May 10 15:29:04 2022
+++ src/sys/dev/usb/usbdevs.h Thu May 19 03:42:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs.h,v 1.793 2022/05/10 15:29:04 mlelstv Exp $ */
+/* $NetBSD: usbdevs.h,v 1.794 2022/05/19 03:42:51 charlotte Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -2363,6 +2363,7 @@
#define USB_PRODUCT_MICROSOFT_XBOX_CONTROLLER_S10 0x0285 /* Xbox Controller S (1.0) */
#define USB_PRODUCT_MICROSOFT_XBOX_CONTROLLER_HUB 0x0288 /* Xbox Controller Hub */
#define USB_PRODUCT_MICROSOFT_XBOX_CONTROLLER_S12 0x0289 /* Xbox Controller S (1.2) */
+#define USB_PRODUCT_MICROSOFT_XBOX_360_CONTROLLER 0x028e /* Xbox 360 Controller */
#define USB_PRODUCT_MICROSOFT_XBOX_360_WIRELESS_RECEIVER 0x0291 /* Xbox 360 Wireless Receiver */
#define USB_PRODUCT_MICROSOFT_24GHZ_XCVR10 0x071d /* 2.4GHz Transceiver V1.0 */
#define USB_PRODUCT_MICROSOFT_24GHZ_XCVR20 0x071f /* 2.4GHz Transceiver V2.0 */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.793 src/sys/dev/usb/usbdevs_data.h:1.794
--- src/sys/dev/usb/usbdevs_data.h:1.793 Tue May 10 15:29:04 2022
+++ src/sys/dev/usb/usbdevs_data.h Thu May 19 03:42:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdevs_data.h,v 1.793 2022/05/10 15:29:04 mlelstv Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.794 2022/05/19 03:42:51 charlotte Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
@@ -3148,6 +3148,8 @@ static const uint32_t usb_products[] = {
14500, 5921, 5877, 0,
USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_XBOX_CONTROLLER_S12,
14500, 5921, 13095, 14538, 0,
+ USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_XBOX_360_CONTROLLER,
+ 14500, 14544, 5921, 0,
USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_XBOX_360_WIRELESS_RECEIVER,
14500, 14544, 651, 13631, 0,
USB_VENDOR_MICROSOFT, USB_PRODUCT_MICROSOFT_24GHZ_XCVR10,
@@ -5845,7 +5847,7 @@ static const char usb_words[] = { "."
"Multiple\0" /* 1 refs @ 5899 */
"Flash\0" /* 9 refs @ 5908 */
"Reader\0" /* 25 refs @ 5914 */
- "Controller\0" /* 21 refs @ 5921 */
+ "Controller\0" /* 22 refs @ 5921 */
"MacAlly\0" /* 1 refs @ 5932 */
"AU9814\0" /* 1 refs @ 5940 */
"MicroConnectors/StrongMan\0" /* 1 refs @ 5947 */
@@ -6962,14 +6964,14 @@ static const char usb_words[] = { "."
"NIC\0" /* 2 refs @ 14485 */
"Laser\0" /* 1 refs @ 14489 */
"6000\0" /* 3 refs @ 14495 */
- "Xbox\0" /* 6 refs @ 14500 */
+ "Xbox\0" /* 7 refs @ 14500 */
"Memory\0" /* 4 refs @ 14505 */
"Unit\0" /* 1 refs @ 14512 */
"Movie\0" /* 1 refs @ 14517 */
"Playback\0" /* 1 refs @ 14523 */
"(1.0)\0" /* 1 refs @ 14532 */
"(1.2)\0" /* 1 refs @ 14538 */
- "360\0" /* 1 refs @ 14544 */
+ "360\0" /* 2 refs @ 14544 */
"2.4GHz\0" /* 4 refs @ 14548 */
"Transceiver\0" /* 5 refs @ 14555 */
"V1.0\0" /* 1 refs @ 14567 */
CVS commit: src/sys/dev/usb
Module Name:src Committed By: charlotte Date: Thu May 19 03:42:51 UTC 2022 Modified Files: src/sys/dev/usb: usbdevs.h usbdevs_data.h Log Message: Regen To generate a diff of this commit: cvs rdiff -u -r1.793 -r1.794 src/sys/dev/usb/usbdevs.h \ src/sys/dev/usb/usbdevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/usb
Module Name:src Committed By: charlotte Date: Thu May 19 03:42:12 UTC 2022 Modified Files: src/sys/dev/usb: usbdevs Log Message: usbdevs: Add Xbox 360 controller To generate a diff of this commit: cvs rdiff -u -r1.802 -r1.803 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevs diff -u src/sys/dev/usb/usbdevs:1.802 src/sys/dev/usb/usbdevs:1.803 --- src/sys/dev/usb/usbdevs:1.802 Tue May 10 15:28:45 2022 +++ src/sys/dev/usb/usbdevs Thu May 19 03:42:12 2022 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.802 2022/05/10 15:28:45 mlelstv Exp $ +$NetBSD: usbdevs,v 1.803 2022/05/19 03:42:12 charlotte Exp $ /*- * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2356,6 +2356,7 @@ product MICROSOFT XBOX_DVD_PLAYBACK 0x02 product MICROSOFT XBOX_CONTROLLER_S10 0x0285 Xbox Controller S (1.0) product MICROSOFT XBOX_CONTROLLER_HUB 0x0288 Xbox Controller Hub product MICROSOFT XBOX_CONTROLLER_S12 0x0289 Xbox Controller S (1.2) +product MICROSOFT XBOX_360_CONTROLLER 0x028e Xbox 360 Controller product MICROSOFT XBOX_360_WIRELESS_RECEIVER 0x0291 Xbox 360 Wireless Receiver product MICROSOFT 24GHZ_XCVR10 0x071d 2.4GHz Transceiver V1.0 product MICROSOFT 24GHZ_XCVR20 0x071f 2.4GHz Transceiver V2.0
CVS commit: src/sys/dev/usb
Module Name:src Committed By: charlotte Date: Thu May 19 03:42:12 UTC 2022 Modified Files: src/sys/dev/usb: usbdevs Log Message: usbdevs: Add Xbox 360 controller To generate a diff of this commit: cvs rdiff -u -r1.802 -r1.803 src/sys/dev/usb/usbdevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
