CVS commit: src/sys/arch/mac68k/mac68k
Module Name:src Committed By: nat Date: Fri Jun 7 02:51:45 UTC 2024 Modified Files: src/sys/arch/mac68k/mac68k: machdep.c Log Message: Relax the video size sanity check. If stride and height are defined, compute the required size. Fixes external video on my Powerbook 160. A similar approach is done for macfb - should the mv_len == 0 an appropriate value is calculated. To generate a diff of this commit: cvs rdiff -u -r1.368 -r1.369 src/sys/arch/mac68k/mac68k/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/mac68k/mac68k
Module Name:src Committed By: nat Date: Fri Jun 7 02:51:45 UTC 2024 Modified Files: src/sys/arch/mac68k/mac68k: machdep.c Log Message: Relax the video size sanity check. If stride and height are defined, compute the required size. Fixes external video on my Powerbook 160. A similar approach is done for macfb - should the mv_len == 0 an appropriate value is calculated. To generate a diff of this commit: cvs rdiff -u -r1.368 -r1.369 src/sys/arch/mac68k/mac68k/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/mac68k/mac68k/machdep.c diff -u src/sys/arch/mac68k/mac68k/machdep.c:1.368 src/sys/arch/mac68k/mac68k/machdep.c:1.369 --- src/sys/arch/mac68k/mac68k/machdep.c:1.368 Sun Jun 2 13:28:44 2024 +++ src/sys/arch/mac68k/mac68k/machdep.c Fri Jun 7 02:51:45 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.368 2024/06/02 13:28:44 andvar Exp $ */ +/* $NetBSD: machdep.c,v 1.369 2024/06/07 02:51:45 nat Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -74,7 +74,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.368 2024/06/02 13:28:44 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.369 2024/06/07 02:51:45 nat Exp $"); #include "opt_adb.h" #include "opt_compat_netbsd.h" @@ -2619,7 +2619,7 @@ get_mapping(void) } /* mv_len sanity check */ int reqsize = mac68k_video.mv_height * mac68k_video.mv_stride; - if (mac68k_video.mv_len != 0 && mac68k_video.mv_len < reqsize) + if (mac68k_video.mv_len < reqsize) mac68k_video.mv_len = reqsize; return load_addr; /* Return physical address of logical 0 */
CVS commit: src/sys/dev/mii
Module Name:src Committed By: andvar Date: Thu Jun 6 21:28:31 UTC 2024 Modified Files: src/sys/dev/mii: bmtphyreg.h icsphyreg.h Log Message: s/dupled/duplex/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/mii/bmtphyreg.h \ src/sys/dev/mii/icsphyreg.h 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: andvar Date: Thu Jun 6 21:26:12 UTC 2024 Modified Files: src/share/man/man4: bge.4 Log Message: s/dupex/duplex/ To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/bge.4 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: andvar Date: Thu Jun 6 21:26:12 UTC 2024 Modified Files: src/share/man/man4: bge.4 Log Message: s/dupex/duplex/ To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/bge.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/bge.4 diff -u src/share/man/man4/bge.4:1.17 src/share/man/man4/bge.4:1.18 --- src/share/man/man4/bge.4:1.17 Tue Oct 15 13:21:19 2019 +++ src/share/man/man4/bge.4 Thu Jun 6 21:26:12 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: bge.4,v 1.17 2019/10/15 13:21:19 ryoon Exp $ +.\" $NetBSD: bge.4,v 1.18 2024/06/06 21:26:12 andvar Exp $ .\" .\" Copyright (c) 2003 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -187,7 +187,7 @@ Set 1000baseT operation over twisted pai Both .Cm full-duplex and -.Cm half-dupex +.Cm half-duplex modes are supported. .It Cm 1000baseSX Set 1000Mbps (Gigabit Ethernet) operation.
CVS commit: src/sys/arch/mips/rmi
Module Name:src Committed By: andvar Date: Thu Jun 6 21:18:41 UTC 2024 Modified Files: src/sys/arch/mips/rmi: rmixl_fmnvar.h Log Message: s/sation/station/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/rmi/rmixl_fmnvar.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/mips/rmi
Module Name:src
Committed By: andvar
Date: Thu Jun 6 21:18:41 UTC 2024
Modified Files:
src/sys/arch/mips/rmi: rmixl_fmnvar.h
Log Message:
s/sation/station/ in comment.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/rmi/rmixl_fmnvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/rmi/rmixl_fmnvar.h
diff -u src/sys/arch/mips/rmi/rmixl_fmnvar.h:1.4 src/sys/arch/mips/rmi/rmixl_fmnvar.h:1.5
--- src/sys/arch/mips/rmi/rmixl_fmnvar.h:1.4 Fri Apr 29 21:55:43 2011
+++ src/sys/arch/mips/rmi/rmixl_fmnvar.h Thu Jun 6 21:18:41 2024
@@ -1,4 +1,4 @@
-/* $Id: rmixl_fmnvar.h,v 1.4 2011/04/29 21:55:43 matt Exp $ */
+/* $Id: rmixl_fmnvar.h,v 1.5 2024/06/06 21:18:41 andvar Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -54,7 +54,7 @@ typedef struct rmixl_fmn_rxmsg {
/*
* compute FMN dest_id from MIPS cpuid
- * - each Core FMN sation has 8 buckets
+ * - each Core FMN station has 8 buckets
* - each Core has 4 threads
* - here we use 1 bucket per thread
* (the first four buckets)
CVS commit: src/sys/dev/mii
Module Name:src Committed By: andvar Date: Thu Jun 6 21:17:37 UTC 2024 Modified Files: src/sys/dev/mii: amhphyreg.h Log Message: s/chane/change/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/mii/amhphyreg.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/mii
Module Name:src Committed By: andvar Date: Thu Jun 6 21:17:37 UTC 2024 Modified Files: src/sys/dev/mii: amhphyreg.h Log Message: s/chane/change/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/mii/amhphyreg.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/mii/amhphyreg.h diff -u src/sys/dev/mii/amhphyreg.h:1.1 src/sys/dev/mii/amhphyreg.h:1.2 --- src/sys/dev/mii/amhphyreg.h:1.1 Sat Aug 25 04:06:26 2001 +++ src/sys/dev/mii/amhphyreg.h Thu Jun 6 21:17:37 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: amhphyreg.h,v 1.1 2001/08/25 04:06:26 thorpej Exp $ */ +/* $NetBSD: amhphyreg.h,v 1.2 2024/06/06 21:17:37 andvar Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -50,7 +50,7 @@ #define SER_SCE 0x0200 /* speed change enable */ #define SER_GE 0x0100 /* global enable */ #define SER_LSC 0x0010 /* link status change */ -#define SER_DMC 0x0008 /* duplex mode chane */ +#define SER_DMC 0x0008 /* duplex mode change */ #define SER_ANC 0x0004 /* auto-negotiation change */ #define SER_SC 0x0002 /* speed change */ #define SER_G 0x0001 /* global event pending */
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Thu Jun 6 20:50:49 UTC 2024 Modified Files: src/doc: 3RDPARTY Log Message: doc: new certdata out To generate a diff of this commit: cvs rdiff -u -r1.2006 -r1.2007 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.2006 src/doc/3RDPARTY:1.2007 --- src/doc/3RDPARTY:1.2006 Fri May 24 16:10:21 2024 +++ src/doc/3RDPARTY Thu Jun 6 20:50:49 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.2006 2024/05/24 16:10:21 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.2007 2024/06/06 20:50:49 wiz Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -2336,7 +2336,7 @@ Notes: Package: mozilla-certdata Version: 2024-02-12 (a6efd358880291357a62d58586f9a218d47ad98b) -Current Vers: 2024-02-12 (a6efd358880291357a62d58586f9a218d47ad98b) +Current Vers: 2024-05-30 (9c588d7b943831278f3350c74e79055b88357d9e) Maintainer: Mozilla Archive Site: https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt Home Page: https://wiki.mozilla.org/CA
CVS commit: src/doc
Module Name:src Committed By: wiz Date: Thu Jun 6 20:50:49 UTC 2024 Modified Files: src/doc: 3RDPARTY Log Message: doc: new certdata out To generate a diff of this commit: cvs rdiff -u -r1.2006 -r1.2007 src/doc/3RDPARTY 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
Module Name:src
Committed By: rillig
Date: Thu Jun 6 20:41:50 UTC 2024
Modified Files:
src/usr.bin/make/unit-tests: varmod.exp varmod.mk
Log Message:
tests/make: test unescaped '$' at the end of a modifier part
In ParseModifierPart, an unescaped '$' that occurs right before a
delimiter is handled differently from a '$' that occurs in the middle of
the modifier part.
In practice, this edge case is only used by the first part of the
':C,from,to,' modifier. Using it in most other modifier parts produces
an error message.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/varmod.exp
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/varmod.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/varmod.exp
diff -u src/usr.bin/make/unit-tests/varmod.exp:1.11 src/usr.bin/make/unit-tests/varmod.exp:1.12
--- src/usr.bin/make/unit-tests/varmod.exp:1.11 Sun Jun 2 11:25:03 2024
+++ src/usr.bin/make/unit-tests/varmod.exp Thu Jun 6 20:41:50 2024
@@ -11,6 +11,23 @@ make: "varmod.mk" line 135: while evalua
make: "varmod.mk" line 135: Malformed conditional (${word:L:range=99333000222000111000})
make: "varmod.mk" line 143: while evaluating "${:${:Ugmtime=\\}}": Invalid time value "\"
make: "varmod.mk" line 143: Malformed conditional (${:${:Ugmtime=\\}})
+make: "varmod.mk" line 158: while evaluating variable "VAR": Dollar followed by nothing
+make: "varmod.mk" line 164: while evaluating variable "VAR": Dollar followed by nothing
+make: "varmod.mk" line 164: while evaluating variable "VAR": Dollar followed by nothing
+make: "varmod.mk" line 174: while evaluating variable "word": Dollar followed by nothing
+make: Bad modifier ":[$]" for variable "word"
+make: "varmod.mk" line 179: Malformed conditional (${word:[$]})
+make: "varmod.mk" line 196: while evaluating variable "VAR": Dollar followed by nothing
+make: "varmod.mk" line 196: while evaluating variable "VAR": Invalid variable name '}', at "$} != "set""
+make: "varmod.mk" line 200: while evaluating "${:Ufallback$} != "fallback"": Invalid variable name '}', at "$} != "fallback""
+make: "varmod.mk" line 205: while evaluating variable "%y": Invalid time value "1000$"
+make: "varmod.mk" line 205: Malformed conditional (${%y:L:gmtime=1000$})
+make: "varmod.mk" line 212: while evaluating variable "%y": Invalid time value "1000$"
+make: "varmod.mk" line 212: Malformed conditional (${%y:L:localtime=1000$})
+make: "varmod.mk" line 218: while evaluating variable "word": Dollar followed by nothing
+make: "varmod.mk" line 222: while evaluating variable "word": Dollar followed by nothing
+make: "varmod.mk" line 227: while evaluating variable ".": Invalid argument 'fallback$' for modifier ':mtime'
+make: "varmod.mk" line 227: Malformed conditional (${.:L:mtime=fallback$})
make: Fatal errors encountered -- cannot continue
make: stopped in unit-tests
exit status 1
Index: src/usr.bin/make/unit-tests/varmod.mk
diff -u src/usr.bin/make/unit-tests/varmod.mk:1.14 src/usr.bin/make/unit-tests/varmod.mk:1.15
--- src/usr.bin/make/unit-tests/varmod.mk:1.14 Wed Jun 5 22:06:53 2024
+++ src/usr.bin/make/unit-tests/varmod.mk Thu Jun 6 20:41:50 2024
@@ -1,4 +1,4 @@
-# $NetBSD: varmod.mk,v 1.14 2024/06/05 22:06:53 rillig Exp $
+# $NetBSD: varmod.mk,v 1.15 2024/06/06 20:41:50 rillig Exp $
#
# Tests for variable modifiers, such as :Q, :S,from,to or :Ufallback.
#
@@ -143,3 +143,95 @@ VAR= STOP
.if ${:${:Ugmtime=\\}}
. error
.endif
+
+# Test a '$' at the end of a modifier part, for all modifiers in the order
+# listed in ApplyModifier.
+#
+# The only modifier parts where an unescaped '$' makes sense at the end are
+# the 'from' parts of the ':S' and ':C' modifiers. In all other modifier
+# parts, an unescaped '$' is an undocumented and discouraged edge case, as it
+# means the same as an escaped '$'.
+.if ${:U:!printf '%s\n' $!} != "\$"
+. error
+.endif
+# expect+1: while evaluating variable "VAR": Dollar followed by nothing
+.if ${VAR::=value$} != "" || ${VAR} != "value"
+. error
+.endif
+${:U }=
+# expect+2: while evaluating variable "VAR": Dollar followed by nothing
+# expect+1: while evaluating variable "VAR": Dollar followed by nothing
+.if ${VAR::+=appended$} != "" || ${VAR} != "valueappended"
+. error
+.endif
+.if ${1:?then$:else$} != "then\$"
+. error
+.endif
+.if ${0:?then$:else$} != "else\$"
+. error
+.endif
+# expect+1: while evaluating variable "word": Dollar followed by nothing
+.if ${word:L:@w@$w$@} != "word"
+. error
+.endif
+# expect: make: Bad modifier ":[$]" for variable "word"
+# expect+1: Malformed conditional (${word:[$]})
+.if ${word:[$]}
+. error
+.else
+. error
+.endif
+VAR_DOLLAR= VAR$$
+.if ${word:L:_=VAR$} != "word" || ${${VAR_DOLLAR}} != "word"
+. error
+.endif
+.if ${word:L:C,d$,m,} != "worm"
+. error
+.endif
+.if ${word:L:C,d,$,} != "wor\$"
+. error
+.endif
+#
CVS commit: src/usr.bin/make/unit-tests
Module Name:src Committed By: rillig Date: Thu Jun 6 20:41:50 UTC 2024 Modified Files: src/usr.bin/make/unit-tests: varmod.exp varmod.mk Log Message: tests/make: test unescaped '$' at the end of a modifier part In ParseModifierPart, an unescaped '$' that occurs right before a delimiter is handled differently from a '$' that occurs in the middle of the modifier part. In practice, this edge case is only used by the first part of the ':C,from,to,' modifier. Using it in most other modifier parts produces an error message. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/usr.bin/make/unit-tests/varmod.exp cvs rdiff -u -r1.14 -r1.15 src/usr.bin/make/unit-tests/varmod.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
