CVS commit: src
Module Name:src
Committed By: rillig
Date: Wed Feb 7 07:42:50 UTC 2024
Modified Files:
src/tests/usr.bin/xlint/lint1: platform_lp64_trad.c
src/usr.bin/xlint/lint1: lex.c
Log Message:
lint: unify rules for determining the type of an integer constant
Previously, in traditional C mode, large decimal numbers were treated as
unsigned, which disagreed with the book from 1978.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/platform_lp64_trad.c
cvs rdiff -u -r1.213 -r1.214 src/usr.bin/xlint/lint1/lex.c
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/xlint/lint1/platform_lp64_trad.c
diff -u src/tests/usr.bin/xlint/lint1/platform_lp64_trad.c:1.3 src/tests/usr.bin/xlint/lint1/platform_lp64_trad.c:1.4
--- src/tests/usr.bin/xlint/lint1/platform_lp64_trad.c:1.3 Sun Jan 28 08:17:27 2024
+++ src/tests/usr.bin/xlint/lint1/platform_lp64_trad.c Wed Feb 7 07:42:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: platform_lp64_trad.c,v 1.3 2024/01/28 08:17:27 rillig Exp $ */
+/* $NetBSD: platform_lp64_trad.c,v 1.4 2024/02/07 07:42:50 rillig Exp $ */
# 3 "platform_lp64_trad.c"
/*
@@ -29,10 +29,12 @@ void *lex_integer[] = {
9223372036854775807,
/* expect+1: ... integer 'long' ... */
0x7fff,
+ /* expect+2: warning: integer constant out of range [252] */
/* expect+1: ... integer 'long' ... */
9223372036854775808,
/* expect+1: ... integer 'long' ... */
0x8000,
+ /* expect+2: warning: integer constant out of range [252] */
/* expect+1: ... integer 'long' ... */
18446744073709551615,
/* expect+1: ... integer 'long' ... */
Index: src/usr.bin/xlint/lint1/lex.c
diff -u src/usr.bin/xlint/lint1/lex.c:1.213 src/usr.bin/xlint/lint1/lex.c:1.214
--- src/usr.bin/xlint/lint1/lex.c:1.213 Sat Feb 3 20:10:10 2024
+++ src/usr.bin/xlint/lint1/lex.c Wed Feb 7 07:42:50 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: lex.c,v 1.213 2024/02/03 20:10:10 rillig Exp $ */
+/* $NetBSD: lex.c,v 1.214 2024/02/07 07:42:50 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: lex.c,v 1.213 2024/02/03 20:10:10 rillig Exp $");
+__RCSID("$NetBSD: lex.c,v 1.214 2024/02/07 07:42:50 rillig Exp $");
#endif
#include
@@ -508,41 +508,7 @@ integer_constant_type(tspec_t t, uint64_
return UINT;
if (ui <= TARG_LONG_MAX)
return LONG;
- if (ui <= TARG_ULONG_MAX && base != 10 && allow_c90)
- return ULONG;
- if (ui <= TARG_ULONG_MAX && !allow_c90)
- return LONG;
- if (!allow_c99) {
- if (!warned)
-/* integer constant out of range */
-warning(252);
- return allow_c90 ? ULONG : LONG;
- }
- if (ui <= TARG_LLONG_MAX)
- return LLONG;
- if (ui <= TARG_ULLONG_MAX && base != 10)
- return ULLONG;
- if (!warned)
- /* integer constant out of range */
- warning(252);
- return ULLONG;
- case UINT:
- if (ui <= TARG_UINT_MAX)
- return UINT;
- if (ui <= TARG_ULONG_MAX)
- return ULONG;
- if (!allow_c99) {
- if (!warned)
-/* integer constant out of range */
-warning(252);
- return ULONG;
- }
- if (ui <= TARG_ULLONG_MAX)
- return ULLONG;
- if (!warned)
- /* integer constant out of range */
- warning(252);
- return ULLONG;
+ /* FALLTHROUGH */
case LONG:
if (ui <= TARG_LONG_MAX)
return LONG;
@@ -554,14 +520,20 @@ integer_constant_type(tspec_t t, uint64_
warning(252);
return allow_c90 ? ULONG : LONG;
}
+ /* FALLTHROUGH */
+ case LLONG:
if (ui <= TARG_LLONG_MAX)
return LLONG;
if (ui <= TARG_ULLONG_MAX && base != 10)
- return ULLONG;
+ return allow_c90 ? ULLONG : LLONG;
if (!warned)
/* integer constant out of range */
warning(252);
- return ULLONG;
+ return allow_c90 ? ULLONG : LLONG;
+ case UINT:
+ if (ui <= TARG_UINT_MAX)
+ return UINT;
+ /* FALLTHROUGH */
case ULONG:
if (ui <= TARG_ULONG_MAX)
return ULONG;
@@ -571,21 +543,7 @@ integer_constant_type(tspec_t t, uint64_
warning(252);
return ULONG;
}
- if (ui <= TARG_ULLONG_MAX)
- return ULLONG;
- if (!warned)
- /* integer constant out of range */
- warning(252);
- return ULLONG;
- case LLONG:
- if (ui <= TARG_LLONG_MAX)
- return LLONG;
- if (ui <= TARG_ULLONG_MAX && base != 10)
- return allow_c90 ? ULLONG : LLONG;
- if (!warned)
- /* integer constant out of range */
- warning(252);
- return allow_c90 ? ULLONG : LLONG;
+ /* FALLTHROUGH */
default:
if (ui <= TARG_ULLONG_MAX)
return ULLONG;
CVS commit: src
Module Name:src Committed By: rillig Date: Wed Feb 7 07:42:50 UTC 2024 Modified Files: src/tests/usr.bin/xlint/lint1: platform_lp64_trad.c src/usr.bin/xlint/lint1: lex.c Log Message: lint: unify rules for determining the type of an integer constant Previously, in traditional C mode, large decimal numbers were treated as unsigned, which disagreed with the book from 1978. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/platform_lp64_trad.c cvs rdiff -u -r1.213 -r1.214 src/usr.bin/xlint/lint1/lex.c 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
Module Name:src
Committed By: rillig
Date: Wed Feb 7 07:21:22 UTC 2024
Modified Files:
src/usr.bin/make: cond.c
Log Message:
make: remove redundant comments
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.361 -r1.362 src/usr.bin/make/cond.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/cond.c
diff -u src/usr.bin/make/cond.c:1.361 src/usr.bin/make/cond.c:1.362
--- src/usr.bin/make/cond.c:1.361 Sun Jan 21 16:32:41 2024
+++ src/usr.bin/make/cond.c Wed Feb 7 07:21:22 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cond.c,v 1.361 2024/01/21 16:32:41 rillig Exp $ */
+/* $NetBSD: cond.c,v 1.362 2024/02/07 07:21:22 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -91,7 +91,7 @@
#include "dir.h"
/* "@(#)cond.c 8.2 (Berkeley) 1/2/94" */
-MAKE_RCSID("$NetBSD: cond.c,v 1.361 2024/01/21 16:32:41 rillig Exp $");
+MAKE_RCSID("$NetBSD: cond.c,v 1.362 2024/02/07 07:21:22 rillig Exp $");
/*
* Conditional expressions conform to this grammar:
@@ -394,7 +394,7 @@ CondParser_StringExpr(CondParser *par, c
{
VarEvalMode emode;
const char *p;
- bool atStart;
+ bool atStart; /* true means an expression outside quotes */
emode = doEval && quoted ? VARE_WANTRES
: doEval ? VARE_UNDEFERR
@@ -411,11 +411,6 @@ CondParser_StringExpr(CondParser *par, c
}
par->p = p;
- /*
- * If the '$' started the string literal (which means no quotes), and
- * the expression is followed by a space, a comparison operator or
- * the end of the expression, we are done.
- */
if (atStart && is_separator(par->p[0]))
return false;
@@ -509,26 +504,12 @@ EvalTruthy(CondParser *par, const char *
{
double num;
- /* For .ifxxx "...", check for non-empty string. */
if (quoted)
return value[0] != '\0';
-
- /* For .ifxxx , compare against zero */
if (TryParseNumber(value, ))
return num != 0.0;
-
- /*
- * For .if ${...}, check for non-empty string. This is different
- * from the evaluation function from that .if variant, which would
- * test whether a variable of the given name were defined.
- */
- /*
- * XXX: Whitespace should count as empty, just as in
- * CondParser_FuncCallEmpty.
- */
if (par->plain)
return value[0] != '\0';
-
return par->evalBare(value) != par->negateEvalBare;
}
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Wed Feb 7 07:21:22 UTC 2024 Modified Files: src/usr.bin/make: cond.c Log Message: make: remove redundant comments No functional change. To generate a diff of this commit: cvs rdiff -u -r1.361 -r1.362 src/usr.bin/make/cond.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/lgpl3/gmp/dist
Module Name:src Committed By: mrg Date: Wed Feb 7 07:12:17 UTC 2024 Modified Files: src/external/lgpl3/gmp/dist: config.sub Log Message: add turbosparc to the list of known sparc machines. reported by Ken Wellsch on port-sparc. config.guess knows that this CPU is a turbosparc, and that's what passes "turbosparc" not "sparc" further down. XXX: pullup-10. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/dist/config.sub Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/lgpl3/gmp/dist
Module Name:src Committed By: mrg Date: Wed Feb 7 07:12:17 UTC 2024 Modified Files: src/external/lgpl3/gmp/dist: config.sub Log Message: add turbosparc to the list of known sparc machines. reported by Ken Wellsch on port-sparc. config.guess knows that this CPU is a turbosparc, and that's what passes "turbosparc" not "sparc" further down. XXX: pullup-10. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/lgpl3/gmp/dist/config.sub Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/lgpl3/gmp/dist/config.sub diff -u src/external/lgpl3/gmp/dist/config.sub:1.4 src/external/lgpl3/gmp/dist/config.sub:1.5 --- src/external/lgpl3/gmp/dist/config.sub:1.4 Sat Oct 31 21:48:06 2020 +++ src/external/lgpl3/gmp/dist/config.sub Wed Feb 7 07:12:17 2024 @@ -116,7 +116,7 @@ powerpc740 | powerpc7400 | powerpc74[4-5 powerpc801 | powerpc821 | powerpc823 | powerpc860 | \ powerpc64) test_cpu=powerpc ;; -sparcv8 | supersparc | microsparc | \ +sparcv8 | supersparc | microsparc | turbosparc | \ ultrasparc | ultrasparc2 | ultrasparc2i | ultrasparc3 | ultrasparct[12345]) test_cpu=sparc ;; sh2)
CVS commit: src/usr.bin/make
Module Name:src
Committed By: rillig
Date: Wed Feb 7 06:43:02 UTC 2024
Modified Files:
src/usr.bin/make: arch.c config.h main.c parse.c suff.c var.c
Log Message:
make: remove unneeded conditional-compilation toggles
The toggles INCLUDES, LIBRARIES, POSIX, SYSVINCLUDE, SYSVVARSUB,
GMAKEEXPORT and SUNSHCMD are no longer needed, they were unconditionally
set.
The toggle NO_REGEX was configurable from the command line, but
disabling it would result in various error messages about the unknown
':C' modifier.
OK sjg@.
To generate a diff of this commit:
cvs rdiff -u -r1.214 -r1.215 src/usr.bin/make/arch.c
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/make/config.h
cvs rdiff -u -r1.609 -r1.610 src/usr.bin/make/main.c
cvs rdiff -u -r1.716 -r1.717 src/usr.bin/make/parse.c
cvs rdiff -u -r1.377 -r1.378 src/usr.bin/make/suff.c
cvs rdiff -u -r1.1098 -r1.1099 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/arch.c
diff -u src/usr.bin/make/arch.c:1.214 src/usr.bin/make/arch.c:1.215
--- src/usr.bin/make/arch.c:1.214 Sun Nov 19 22:50:11 2023
+++ src/usr.bin/make/arch.c Wed Feb 7 06:43:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: arch.c,v 1.214 2023/11/19 22:50:11 rillig Exp $ */
+/* $NetBSD: arch.c,v 1.215 2024/02/07 06:43:02 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.214 2023/11/19 22:50:11 rillig Exp $");
+MAKE_RCSID("$NetBSD: arch.c,v 1.215 2024/02/07 06:43:02 rillig Exp $");
typedef struct List ArchList;
typedef struct ListNode ArchListNode;
@@ -978,11 +978,7 @@ Arch_FindLib(GNode *gn, SearchPath *path
gn->path = Dir_FindFile(libName, path);
free(libName);
-#ifdef LIBRARIES
Var_Set(gn, TARGET, gn->name);
-#else
- Var_Set(gn, TARGET, GNode_Path(gn));
-#endif
}
/* ARGSUSED */
Index: src/usr.bin/make/config.h
diff -u src/usr.bin/make/config.h:1.28 src/usr.bin/make/config.h:1.29
--- src/usr.bin/make/config.h:1.28 Fri Dec 11 22:53:08 2020
+++ src/usr.bin/make/config.h Wed Feb 7 06:43:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: config.h,v 1.28 2020/12/11 22:53:08 rillig Exp $ */
+/* $NetBSD: config.h,v 1.29 2024/02/07 06:43:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -73,20 +73,6 @@
*/
/*
- * INCLUDES
- * LIBRARIES
- * These control the handling of the .INCLUDES and .LIBS variables.
- *
- * If INCLUDES is defined, the .INCLUDES variable will be filled
- * from the search paths of those suffixes which are marked by
- * .INCLUDES dependency lines. Similarly for LIBRARIES and .LIBS.
- *
- * See varname-dot-include.mk and varname-dot-libs.mk for more details.
- */
-#define INCLUDES
-#define LIBRARIES
-
-/*
* LIBSUFF
* Is the suffix used to denote libraries and is used by the Suff module
* to find the search path on which to seek any -l targets.
@@ -108,40 +94,6 @@
*/
#define RECHECK
-/*
- * POSIX
- * Adhere to the POSIX 1003.2 draft for the make(1) program.
- * - Use MAKEFLAGS instead of MAKE to pick arguments from the
- * environment.
- */
-#define POSIX
-
-/*
- * SYSVINCLUDE
- * Recognize system V like include directives [include "filename"]
- * (required by POSIX 2018)
- * SYSVVARSUB
- * Recognize system V like ${VAR:x=y} variable substitutions
- * (required by POSIX 2018)
- */
-#define SYSVINCLUDE
-#define SYSVVARSUB
-
-/*
- * GMAKEEXPORT
- * Recognize gmake like variable export directives [export =]
- */
-#define GMAKEEXPORT
-
-/*
- * SUNSHCMD
- * Recognize SunOS and Solaris:
- * VAR :sh= CMD # Assign VAR to the command substitution of CMD
- * ${VAR:sh} # Return the command substitution of the value
- *# of ${VAR}
- */
-#define SUNSHCMD
-
#if defined(MAKE_NATIVE) && !defined(__ELF__)
# ifndef RANLIBMAG
# define RANLIBMAG "__.SYMDEF"
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.609 src/usr.bin/make/main.c:1.610
--- src/usr.bin/make/main.c:1.609 Sun Jan 7 01:33:57 2024
+++ src/usr.bin/make/main.c Wed Feb 7 06:43:02 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.609 2024/01/07 01:33:57 sjg Exp $ */
+/* $NetBSD: main.c,v 1.610 2024/02/07 06:43:02 rillig Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -111,7 +111,7 @@
#include "trace.h"
/* "@(#)main.c 8.3 (Berkeley) 3/19/94" */
-MAKE_RCSID("$NetBSD: main.c,v 1.609 2024/01/07 01:33:57 sjg Exp $");
+MAKE_RCSID("$NetBSD: main.c,v 1.610 2024/02/07 06:43:02 rillig Exp $");
#if defined(MAKE_NATIVE)
__COPYRIGHT("@(#) Copyright (c) 1988, 1989, 1990, 1993 "
"The Regents of the University of California. "
@@ -1418,20 +1418,11 @@ main_Init(int argc, char **argv)
#endif
Dir_Init();
-#ifdef POSIX
{
char *makeflags = explode(getenv("MAKEFLAGS"));
Main_ParseArgLine(makeflags);
free(makeflags);
}
-#else
- /*
- * First snag any flags out of the MAKE
CVS commit: src/usr.bin/make
Module Name:src Committed By: rillig Date: Wed Feb 7 06:43:02 UTC 2024 Modified Files: src/usr.bin/make: arch.c config.h main.c parse.c suff.c var.c Log Message: make: remove unneeded conditional-compilation toggles The toggles INCLUDES, LIBRARIES, POSIX, SYSVINCLUDE, SYSVVARSUB, GMAKEEXPORT and SUNSHCMD are no longer needed, they were unconditionally set. The toggle NO_REGEX was configurable from the command line, but disabling it would result in various error messages about the unknown ':C' modifier. OK sjg@. To generate a diff of this commit: cvs rdiff -u -r1.214 -r1.215 src/usr.bin/make/arch.c cvs rdiff -u -r1.28 -r1.29 src/usr.bin/make/config.h cvs rdiff -u -r1.609 -r1.610 src/usr.bin/make/main.c cvs rdiff -u -r1.716 -r1.717 src/usr.bin/make/parse.c cvs rdiff -u -r1.377 -r1.378 src/usr.bin/make/suff.c cvs rdiff -u -r1.1098 -r1.1099 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/share/man/man4
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:25:58 UTC 2024 Modified Files: src/share/man/man4: gcscaudio.4 Log Message: Fix date. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/gcscaudio.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/gcscaudio.4 diff -u src/share/man/man4/gcscaudio.4:1.4 src/share/man/man4/gcscaudio.4:1.5 --- src/share/man/man4/gcscaudio.4:1.4 Wed Feb 7 04:20:26 2024 +++ src/share/man/man4/gcscaudio.4 Wed Feb 7 04:25:58 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: gcscaudio.4,v 1.4 2024/02/07 04:20:26 msaitoh Exp $ +.\" $NetBSD: gcscaudio.4,v 1.5 2024/02/07 04:25:58 msaitoh Exp $ .\" .\" Copyright (c) 2009 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 February 27, 2024 +.Dd February 7, 2024 .Dt GCSCAUDIO 4 .Os .Sh NAME
CVS commit: src/share/man/man4
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:25:58 UTC 2024 Modified Files: src/share/man/man4: gcscaudio.4 Log Message: Fix date. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/share/man/man4/gcscaudio.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:20:29 UTC 2024 Modified Files: src/common/lib/libc/arch/aarch64/string: bcopy.S src/common/lib/libc/arch/sh3/string: memcpy.S src/share/man/man4: aq.4 gcscaudio.4 src/sys/arch/aarch64/aarch64: aarch32_syscall.c bus_space.c bus_space_asm_generic.S bus_space_notimpl.S cpu.c cpufunc.c db_disasm.c db_interface.c db_trace.c disasm.c disasm.h fault.c kobj_machdep.c linux_syscall.c locore.S netbsd32_machdep.c netbsd32_syscall.c pmap.c pmapboot.c procfs_machdep.c start.S src/sys/arch/aarch64/include: cpufunc.h machdep.h src/sys/arch/arm/amlogic: meson_pwm.c meson_thermal.c meson_usbctrl.c mesong12_aoclkc.c mesong12_aoclkc.h mesong12_clkc.h mesong12_usb2phy.c mesong12_usb3pciephy.c src/sys/arch/arm/imx: if_enet.c if_enetreg.h if_enetvar.h imx51_axi.c imx51_intr.h imx51_tzic.c imxpciereg.h imxsnvs.c imxsnvsreg.h src/sys/arch/arm/nxp: imx6_ccmreg.h imx6_iomuxreg.h imx6_ocotp.c imx6_ocotpreg.h imx6_ocotpvar.h imx6_srcreg.h imx6_usbreg.h imx6var.h imx_ahcisatareg.h imx_snvs.c src/sys/arch/arm/rockchip: rk3588_cru.c rk3588_cru.h rk3588_iomux.c rk3588_platform.h rk_eqos.c src/sys/arch/dreamcast/dev/g2: aica.c aicavar.h src/sys/arch/dreamcast/dev/microcode: aica_arm.c aica_arm_locore.S src/sys/arch/riscv/riscv: bus_space_notimpl.S src/sys/arch/sh3/sh3: cpu_in_cksum.S src/sys/compat/linux/arch/aarch64: linux_machdep.c src/sys/compat/linux32/arch/aarch64: linux32_machdep.c linux32_sigcode.S src/sys/dev/fdt: pwmregulator.c vmt_fdt.c src/sys/dev/pci: gcscaudio.c gcscaudioreg.h if_aq.c src/sys/net: toeplitz.c src/usr.sbin/cpuctl/arch: aarch64.c src/usr.sbin/tprof: tprof_top.c Log Message: Remove ryo@'s mail addresses. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/aarch64/string/bcopy.S cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/sh3/string/memcpy.S cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/aq.4 cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/gcscaudio.4 cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/aarch64/aarch32_syscall.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/aarch64/aarch64/bus_space.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/aarch64/bus_space_asm_generic.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/aarch64/bus_space_notimpl.S \ src/sys/arch/aarch64/aarch64/disasm.h \ src/sys/arch/aarch64/aarch64/netbsd32_syscall.c cvs rdiff -u -r1.73 -r1.74 src/sys/arch/aarch64/aarch64/cpu.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/aarch64/aarch64/cpufunc.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/aarch64/aarch64/db_disasm.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/aarch64/aarch64/db_interface.c \ src/sys/arch/aarch64/aarch64/db_trace.c \ src/sys/arch/aarch64/aarch64/netbsd32_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/aarch64/disasm.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/aarch64/aarch64/fault.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/aarch64/aarch64/kobj_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/aarch64/linux_syscall.c cvs rdiff -u -r1.92 -r1.93 src/sys/arch/aarch64/aarch64/locore.S cvs rdiff -u -r1.149 -r1.150 src/sys/arch/aarch64/aarch64/pmap.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/aarch64/pmapboot.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/aarch64/aarch64/procfs_machdep.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/aarch64/aarch64/start.S cvs rdiff -u -r1.26 -r1.27 src/sys/arch/aarch64/include/cpufunc.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/include/machdep.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/amlogic/meson_pwm.c \ src/sys/arch/arm/amlogic/meson_usbctrl.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/amlogic/meson_thermal.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/mesong12_aoclkc.c \ src/sys/arch/arm/amlogic/mesong12_usb2phy.c \ src/sys/arch/arm/amlogic/mesong12_usb3pciephy.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/mesong12_aoclkc.h \ src/sys/arch/arm/amlogic/mesong12_clkc.h cvs rdiff -u -r1.36 -r1.37 src/sys/arch/arm/imx/if_enet.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/if_enetreg.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/if_enetvar.h \ src/sys/arch/arm/imx/imx51_tzic.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/imx/imx51_axi.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx51_intr.h \ src/sys/arch/arm/imx/imxpciereg.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imxsnvs.c \ src/sys/arch/arm/imx/imxsnvsreg.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nxp/imx6_ccmreg.h \ src/sys/arch/arm/nxp/imx6_ocotp.c src/sys/arch/arm/nxp/imx_snvs.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nxp/imx6_iomuxreg.h \ src/sys/arch/arm/nxp/imx6_ocotpreg.h src/sys/arch/arm/nxp/imx6_ocotpvar.h \
CVS commit: src
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:20:29 UTC 2024 Modified Files: src/common/lib/libc/arch/aarch64/string: bcopy.S src/common/lib/libc/arch/sh3/string: memcpy.S src/share/man/man4: aq.4 gcscaudio.4 src/sys/arch/aarch64/aarch64: aarch32_syscall.c bus_space.c bus_space_asm_generic.S bus_space_notimpl.S cpu.c cpufunc.c db_disasm.c db_interface.c db_trace.c disasm.c disasm.h fault.c kobj_machdep.c linux_syscall.c locore.S netbsd32_machdep.c netbsd32_syscall.c pmap.c pmapboot.c procfs_machdep.c start.S src/sys/arch/aarch64/include: cpufunc.h machdep.h src/sys/arch/arm/amlogic: meson_pwm.c meson_thermal.c meson_usbctrl.c mesong12_aoclkc.c mesong12_aoclkc.h mesong12_clkc.h mesong12_usb2phy.c mesong12_usb3pciephy.c src/sys/arch/arm/imx: if_enet.c if_enetreg.h if_enetvar.h imx51_axi.c imx51_intr.h imx51_tzic.c imxpciereg.h imxsnvs.c imxsnvsreg.h src/sys/arch/arm/nxp: imx6_ccmreg.h imx6_iomuxreg.h imx6_ocotp.c imx6_ocotpreg.h imx6_ocotpvar.h imx6_srcreg.h imx6_usbreg.h imx6var.h imx_ahcisatareg.h imx_snvs.c src/sys/arch/arm/rockchip: rk3588_cru.c rk3588_cru.h rk3588_iomux.c rk3588_platform.h rk_eqos.c src/sys/arch/dreamcast/dev/g2: aica.c aicavar.h src/sys/arch/dreamcast/dev/microcode: aica_arm.c aica_arm_locore.S src/sys/arch/riscv/riscv: bus_space_notimpl.S src/sys/arch/sh3/sh3: cpu_in_cksum.S src/sys/compat/linux/arch/aarch64: linux_machdep.c src/sys/compat/linux32/arch/aarch64: linux32_machdep.c linux32_sigcode.S src/sys/dev/fdt: pwmregulator.c vmt_fdt.c src/sys/dev/pci: gcscaudio.c gcscaudioreg.h if_aq.c src/sys/net: toeplitz.c src/usr.sbin/cpuctl/arch: aarch64.c src/usr.sbin/tprof: tprof_top.c Log Message: Remove ryo@'s mail addresses. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/common/lib/libc/arch/aarch64/string/bcopy.S cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/sh3/string/memcpy.S cvs rdiff -u -r1.5 -r1.6 src/share/man/man4/aq.4 cvs rdiff -u -r1.3 -r1.4 src/share/man/man4/gcscaudio.4 cvs rdiff -u -r1.8 -r1.9 src/sys/arch/aarch64/aarch64/aarch32_syscall.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/aarch64/aarch64/bus_space.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/aarch64/aarch64/bus_space_asm_generic.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/aarch64/aarch64/bus_space_notimpl.S \ src/sys/arch/aarch64/aarch64/disasm.h \ src/sys/arch/aarch64/aarch64/netbsd32_syscall.c cvs rdiff -u -r1.73 -r1.74 src/sys/arch/aarch64/aarch64/cpu.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/aarch64/aarch64/cpufunc.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/aarch64/aarch64/db_disasm.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/aarch64/aarch64/db_interface.c \ src/sys/arch/aarch64/aarch64/db_trace.c \ src/sys/arch/aarch64/aarch64/netbsd32_machdep.c cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/aarch64/disasm.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/aarch64/aarch64/fault.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/aarch64/aarch64/kobj_machdep.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/aarch64/aarch64/linux_syscall.c cvs rdiff -u -r1.92 -r1.93 src/sys/arch/aarch64/aarch64/locore.S cvs rdiff -u -r1.149 -r1.150 src/sys/arch/aarch64/aarch64/pmap.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/aarch64/pmapboot.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/aarch64/aarch64/procfs_machdep.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/aarch64/aarch64/start.S cvs rdiff -u -r1.26 -r1.27 src/sys/arch/aarch64/include/cpufunc.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/aarch64/include/machdep.h cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/amlogic/meson_pwm.c \ src/sys/arch/arm/amlogic/meson_usbctrl.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/amlogic/meson_thermal.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/mesong12_aoclkc.c \ src/sys/arch/arm/amlogic/mesong12_usb2phy.c \ src/sys/arch/arm/amlogic/mesong12_usb3pciephy.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/mesong12_aoclkc.h \ src/sys/arch/arm/amlogic/mesong12_clkc.h cvs rdiff -u -r1.36 -r1.37 src/sys/arch/arm/imx/if_enet.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/imx/if_enetreg.h cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/if_enetvar.h \ src/sys/arch/arm/imx/imx51_tzic.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/imx/imx51_axi.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imx51_intr.h \ src/sys/arch/arm/imx/imxpciereg.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/imx/imxsnvs.c \ src/sys/arch/arm/imx/imxsnvsreg.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/nxp/imx6_ccmreg.h \ src/sys/arch/arm/nxp/imx6_ocotp.c src/sys/arch/arm/nxp/imx_snvs.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nxp/imx6_iomuxreg.h \ src/sys/arch/arm/nxp/imx6_ocotpreg.h src/sys/arch/arm/nxp/imx6_ocotpvar.h \
CVS commit: src
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:02:36 UTC 2024 Modified Files: src/doc: CHANGES.prev src/sys/arch/sparc/stand/bootxx: promlib.c src/sys/dev/pcmcia: pcmciareg.h Log Message: Fix typo of "following" in comment. To generate a diff of this commit: cvs rdiff -u -r1.181 -r1.182 src/doc/CHANGES.prev cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/stand/bootxx/promlib.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pcmcia/pcmciareg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES.prev diff -u src/doc/CHANGES.prev:1.181 src/doc/CHANGES.prev:1.182 --- src/doc/CHANGES.prev:1.181 Sat Feb 3 21:25:02 2024 +++ src/doc/CHANGES.prev Wed Feb 7 04:02:36 2024 @@ -1,4 +1,4 @@ -LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.181 $> +LIST OF CHANGES FROM PREVIOUS RELEASES: <$Revision: 1.182 $> Changes from 386bsd 0.1 + patchkit 0.2.2 to NetBSD 0.8: @@ -11753,7 +11753,7 @@ Changes from NetBSD 7.0 to NetBSD 8.0: rtsold(8): Removed in favour of dhcpcd. [roy 20140911] dhcpcd(8): Import dhcpcd-6.4.5. [roy 20140918] arm: Add support for i.MX6 SoC. [ryo 20140925] - gpt(8): Completed overhaul, including adding follwing subcommands: + gpt(8): Completed overhaul, including adding following subcommands: resize, set, unset, backup, restore, and resizedisk. [jnemeth 20140926] dhcpcd(8): Import dhcpcd-6.4.7. [roy 20140927] Index: src/sys/arch/sparc/stand/bootxx/promlib.c diff -u src/sys/arch/sparc/stand/bootxx/promlib.c:1.11 src/sys/arch/sparc/stand/bootxx/promlib.c:1.12 --- src/sys/arch/sparc/stand/bootxx/promlib.c:1.11 Sun Jul 17 20:54:47 2011 +++ src/sys/arch/sparc/stand/bootxx/promlib.c Wed Feb 7 04:02:36 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: promlib.c,v 1.11 2011/07/17 20:54:47 joerg Exp $ */ +/* $NetBSD: promlib.c,v 1.12 2024/02/07 04:02:36 msaitoh Exp $ */ /*- * Copyright (c) 1999 The NetBSD Foundation, Inc. @@ -33,7 +33,7 @@ * Specially crafted scaled-down version of promlib for the first-stage * boot program. * - * bootxx needs the follwoing PROM functions: + * bootxx needs the following PROM functions: * prom_version() * prom_getbootpath() * prom_putchar() Index: src/sys/dev/pcmcia/pcmciareg.h diff -u src/sys/dev/pcmcia/pcmciareg.h:1.11 src/sys/dev/pcmcia/pcmciareg.h:1.12 --- src/sys/dev/pcmcia/pcmciareg.h:1.11 Sun Sep 1 00:36:52 2019 +++ src/sys/dev/pcmcia/pcmciareg.h Wed Feb 7 04:02:36 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: pcmciareg.h,v 1.11 2019/09/01 00:36:52 mlelstv Exp $ */ +/* $NetBSD: pcmciareg.h,v 1.12 2024/02/07 04:02:36 msaitoh Exp $ */ /* * Copyright (c) 1997 Marc Horowitz. All rights reserved. @@ -61,7 +61,7 @@ /* * the 2.1 docs have 0x02-0x07 as reserved, but the linux drivers list the - * follwing tuple code values. I have at least one card (3com 3c562 + * following tuple code values. I have at least one card (3com 3c562 * lan+modem) which has a code 0x06 tuple, so I'm going to assume that these * are for real */
CVS commit: src
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:02:36 UTC 2024 Modified Files: src/doc: CHANGES.prev src/sys/arch/sparc/stand/bootxx: promlib.c src/sys/dev/pcmcia: pcmciareg.h Log Message: Fix typo of "following" in comment. To generate a diff of this commit: cvs rdiff -u -r1.181 -r1.182 src/doc/CHANGES.prev cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc/stand/bootxx/promlib.c cvs rdiff -u -r1.11 -r1.12 src/sys/dev/pcmcia/pcmciareg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:00:11 UTC 2024 Modified Files: src/sys/arch/ia64/include: pmap.h src/usr.sbin/makefs: README Log Message: s/strucutre/structure/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/include/pmap.h cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/makefs/README 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/ia64/include/pmap.h diff -u src/sys/arch/ia64/include/pmap.h:1.9 src/sys/arch/ia64/include/pmap.h:1.10 --- src/sys/arch/ia64/include/pmap.h:1.9 Fri Oct 6 11:45:37 2023 +++ src/sys/arch/ia64/include/pmap.h Wed Feb 7 04:00:11 2024 @@ -163,7 +163,7 @@ void pmap_procwr(struct proc *, vaddr_t, * Note that we if we access the kernel pmap in interrupt context, it * is only to update statistics. Since stats are updated using atomic * operations, locking the kernel pmap is not necessary. Therefore, - * it is not necessary to block interrupts when locking pmap strucutres. + * it is not necessary to block interrupts when locking pmap structures. */ /* XXX #define PMAP_LOCK(pmap) mutex_enter(&(pmap)->pm_slock) Index: src/usr.sbin/makefs/README diff -u src/usr.sbin/makefs/README:1.8 src/usr.sbin/makefs/README:1.9 --- src/usr.sbin/makefs/README:1.8 Wed Oct 26 21:56:19 2022 +++ src/usr.sbin/makefs/README Wed Feb 7 04:00:10 2024 @@ -1,4 +1,4 @@ -$NetBSD: README,v 1.8 2022/10/26 21:56:19 andvar Exp $ +$NetBSD: README,v 1.9 2024/02/07 04:00:10 msaitoh Exp $ makefs - build a file system image from a directory tree @@ -102,7 +102,7 @@ Each fs-specific module should have the prepare_options and cleanup_options are optional and can be NULL. NOTE: All file system specific options are referenced via the fs_specific -pointer from the fsinfo_t strucutre. It is up to the filesystem to allocate +pointer from the fsinfo_t structure. It is up to the filesystem to allocate and free any data needed for this via the prepare and cleanup callbacks. Each fs-specific module will need to add its routines to the dispatch array
CVS commit: src
Module Name:src Committed By: msaitoh Date: Wed Feb 7 04:00:11 UTC 2024 Modified Files: src/sys/arch/ia64/include: pmap.h src/usr.sbin/makefs: README Log Message: s/strucutre/structure/ in comment. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/ia64/include/pmap.h cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/makefs/README 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: mrg
Date: Tue Feb 6 23:57:41 UTC 2024
Modified Files:
src/sys/dev/usb: ehci.c ehcireg.h
Log Message:
avoid different struct type problem.
To generate a diff of this commit:
cvs rdiff -u -r1.321 -r1.322 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.38 -r1.39 src/sys/dev/usb/ehcireg.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.321 src/sys/dev/usb/ehci.c:1.322
--- src/sys/dev/usb/ehci.c:1.321 Mon Feb 5 23:04:18 2024
+++ src/sys/dev/usb/ehci.c Tue Feb 6 23:57:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.321 2024/02/05 23:04:18 jmcneill Exp $ */
+/* $NetBSD: ehci.c,v 1.322 2024/02/06 23:57:41 mrg Exp $ */
/*
* Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.321 2024/02/05 23:04:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.322 2024/02/06 23:57:41 mrg Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -294,6 +294,7 @@ void ehci_dump(void);
Static void ehci_dump_regs(ehci_softc_t *);
Static void ehci_dump_sqtds(ehci_soft_qtd_t *);
Static void ehci_dump_sqtd(ehci_soft_qtd_t *);
+Static void ehci_dump_qh_qtd(struct ehci_qh_qtd_t *);
Static void ehci_dump_qtd(ehci_qtd_t *);
Static void ehci_dump_sqh(ehci_soft_qh_t *);
Static void ehci_dump_sitd(struct ehci_soft_itd *);
@@ -1755,6 +1756,24 @@ ehci_dump_sqtd(ehci_soft_qtd_t *sqtd)
}
Static void
+ehci_dump_qh_qtd(struct ehci_qh_qtd_t *qh_qtd)
+{
+ ehci_qtd_t qtd = {
+ .qtd_next = qh_qtd->qtd_next,
+ .qtd_altnext = qh_qtd->qtd_altnext,
+ .qtd_status = qh_qtd->qtd_status,
+ };
+
+ /* Manually memcpy(), because of volatile. */
+ for (unsigned i = 0; i < EHCI_QTD_NBUFFERS; i++) {
+ qtd.qtd_buffer[i] = qh_qtd->qtd_buffer[i];
+ qtd.qtd_buffer_hi[i] = qh_qtd->qtd_buffer_hi[i];
+ }
+
+ ehci_dump_qtd();
+}
+
+Static void
ehci_dump_qtd(ehci_qtd_t *qtd)
{
EHCIHIST_FUNC(); EHCIHIST_CALLED();
@@ -1830,7 +1849,7 @@ ehci_dump_sqh(ehci_soft_qh_t *sqh)
link = le32toh(qh->qh_curqtd);
ehci_dump_link(link, false);
DPRINTFN(10, "Overlay qTD:", 0, 0, 0, 0);
- ehci_dump_qtd(>qh_qtd);
+ ehci_dump_qh_qtd(>qh_qtd);
usb_syncmem(>dma, sqh->offs, sizeof(sqh->qh),
BUS_DMASYNC_PREREAD);
Index: src/sys/dev/usb/ehcireg.h
diff -u src/sys/dev/usb/ehcireg.h:1.38 src/sys/dev/usb/ehcireg.h:1.39
--- src/sys/dev/usb/ehcireg.h:1.38 Mon Feb 5 23:07:42 2024
+++ src/sys/dev/usb/ehcireg.h Tue Feb 6 23:57:41 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ehcireg.h,v 1.38 2024/02/05 23:07:42 jmcneill Exp $ */
+/* $NetBSD: ehcireg.h,v 1.39 2024/02/06 23:57:41 mrg Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -394,7 +394,7 @@ typedef struct {
* 32-byte aligned, so declare the fields instead of embedding
* a ehci_qtd_t directly.
*/
- struct {
+ struct ehci_qh_qtd_t {
volatile ehci_link_t qtd_next;
volatile ehci_link_t qtd_altnext;
volatile uint32_t qtd_status;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: mrg Date: Tue Feb 6 23:57:41 UTC 2024 Modified Files: src/sys/dev/usb: ehci.c ehcireg.h Log Message: avoid different struct type problem. To generate a diff of this commit: cvs rdiff -u -r1.321 -r1.322 src/sys/dev/usb/ehci.c cvs rdiff -u -r1.38 -r1.39 src/sys/dev/usb/ehcireg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Tue Feb 6 22:47:21 UTC 2024
Modified Files:
src/usr.bin/xlint/lint1: Makefile check-msgs.lua err.c makeman
Log Message:
lint: tab-align message numbers in err.c
By replacing block comments with end-of-line comments, the comments take
up less space and thus no longer require to be indented by 6 spaces.
The messages and their comments are used in 3 places: the manual page
lint.7, the err-msgs.h header for debug mode, and check-msgs.lua to
verify that the comments above the message IDs correspond to the actual
messages.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/xlint/lint1/check-msgs.lua
cvs rdiff -u -r1.224 -r1.225 src/usr.bin/xlint/lint1/err.c
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/xlint/lint1/makeman
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/xlint/lint1/Makefile
diff -u src/usr.bin/xlint/lint1/Makefile:1.102 src/usr.bin/xlint/lint1/Makefile:1.103
--- src/usr.bin/xlint/lint1/Makefile:1.102 Sat Jul 29 10:45:00 2023
+++ src/usr.bin/xlint/lint1/Makefile Tue Feb 6 22:47:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.102 2023/07/29 10:45:00 rillig Exp $
+# $NetBSD: Makefile,v 1.103 2024/02/06 22:47:21 rillig Exp $
.include
@@ -78,7 +78,7 @@ DPADD+= ${LIBL}
err-msgs.h: err.c
${_MKTARGET_CREATE}
sp='[[:space:]]*'; \
- from="^$$sp\(\"[^\"].*\"\)\,$$sp/\*$$sp\(Q*[0-9][0-9]*\)$$sp\*/\$$"; \
+ from="^$$sp\(\"[^\"].*\"\)\,$$sp// \(Q*[0-9][0-9]*\)\$$"; \
${TOOL_SED} -n -e "s,$$from,#define MSG_\2 \1,p" < ${.ALLSRC:M*err.c} > ${.TARGET}.tmp
mv -f ${.TARGET}.tmp ${.TARGET}
Index: src/usr.bin/xlint/lint1/check-msgs.lua
diff -u src/usr.bin/xlint/lint1/check-msgs.lua:1.20 src/usr.bin/xlint/lint1/check-msgs.lua:1.21
--- src/usr.bin/xlint/lint1/check-msgs.lua:1.20 Sat Aug 12 18:05:51 2023
+++ src/usr.bin/xlint/lint1/check-msgs.lua Tue Feb 6 22:47:21 2024
@@ -1,5 +1,5 @@
#! /usr/bin/lua
--- $NetBSD: check-msgs.lua,v 1.20 2023/08/12 18:05:51 rillig Exp $
+-- $NetBSD: check-msgs.lua,v 1.21 2024/02/06 22:47:21 rillig Exp $
--[[
@@ -16,7 +16,7 @@ local function load_messages()
local f = assert(io.open("err.c"))
for line in f:lines() do
-local msg, id = line:match("%s*\"(.+)\",%s*/%*%s*(Q?%d+)%s*%*/$")
+local msg, id = line:match("%s*\"(.+)\",%s*// (Q?%d+)$")
if msg ~= nil then
msgs[id] = msg
end
Index: src/usr.bin/xlint/lint1/err.c
diff -u src/usr.bin/xlint/lint1/err.c:1.224 src/usr.bin/xlint/lint1/err.c:1.225
--- src/usr.bin/xlint/lint1/err.c:1.224 Sat Feb 3 20:10:10 2024
+++ src/usr.bin/xlint/lint1/err.c Tue Feb 6 22:47:21 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: err.c,v 1.224 2024/02/03 20:10:10 rillig Exp $ */
+/* $NetBSD: err.c,v 1.225 2024/02/06 22:47:21 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include
#if defined(__RCSID)
-__RCSID("$NetBSD: err.c,v 1.224 2024/02/03 20:10:10 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.225 2024/02/06 22:47:21 rillig Exp $");
#endif
#include
@@ -55,363 +55,363 @@ int sytxerr;
static const char *const msgs[] = {
- "empty declaration", /* 0 */
- "old-style declaration; add 'int'", /* 1 */
- "empty declaration", /* 2 */
- "'%s' declared in parameter declaration list", /* 3 */
- "illegal type combination", /* 4 */
- "modifying typedef with '%s'; only qualifiers allowed", /* 5 */
- "use 'double' instead of 'long float'", /* 6 */
- "only one storage class allowed", /* 7 */
- "illegal storage class", /* 8 */
- "only 'register' is valid as storage class in parameter", /* 9 */
- "duplicate '%s'", /* 10 */
- "bit-field initializer out of range", /* 11 */
- "compiler takes size of function", /* 12 */
- "incomplete enum type '%s'", /* 13 */
- "", /* 14 */
- "function returns illegal type '%s'", /* 15 */
- "array of function is illegal", /* 16 */
- "null dimension", /* 17 */
- "illegal use of 'void'", /* 18 */
- "void type for '%s'", /* 19 */
- "negative array dimension (%d)", /* 20 */
- "redeclaration of formal parameter '%s'", /* 21 */
- "incomplete or misplaced function definition", /* 22 */
- "undefined label '%s'", /* 23 */
- "cannot initialize function '%s'", /* 24 */
- "cannot initialize typedef '%s'", /* 25 */
- "cannot initialize extern declaration '%s'", /* 26 */
- "redeclaration of '%s'", /* 27 */
- "redefinition of '%s'", /* 28 */
- "'%s' was previously declared extern, becomes static", /* 29 */
- "redeclaration of '%s'; C90 or later require static", /* 30 */
- "'%s' has incomplete type '%s'", /* 31 */
- "type of parameter '%s'
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Tue Feb 6 22:47:21 UTC 2024 Modified Files: src/usr.bin/xlint/lint1: Makefile check-msgs.lua err.c makeman Log Message: lint: tab-align message numbers in err.c By replacing block comments with end-of-line comments, the comments take up less space and thus no longer require to be indented by 6 spaces. The messages and their comments are used in 3 places: the manual page lint.7, the err-msgs.h header for debug mode, and check-msgs.lua to verify that the comments above the message IDs correspond to the actual messages. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.102 -r1.103 src/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r1.20 -r1.21 src/usr.bin/xlint/lint1/check-msgs.lua cvs rdiff -u -r1.224 -r1.225 src/usr.bin/xlint/lint1/err.c cvs rdiff -u -r1.8 -r1.9 src/usr.bin/xlint/lint1/makeman Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/xlint/lint1
Module Name:src
Committed By: rillig
Date: Tue Feb 6 21:28:16 UTC 2024
Modified Files:
src/usr.bin/xlint/lint1: makeman
Log Message:
lint.7: remove implementation details from message list
>From a user's perspective, it's irrelevant whether a lint message is
generated using '%s' or '%.*s'; same for the integer widths, as they are
platform-dependent.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/xlint/lint1/makeman
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/xlint/lint1/makeman
diff -u src/usr.bin/xlint/lint1/makeman:1.7 src/usr.bin/xlint/lint1/makeman:1.8
--- src/usr.bin/xlint/lint1/makeman:1.7 Fri Jul 21 15:00:32 2023
+++ src/usr.bin/xlint/lint1/makeman Tue Feb 6 21:28:15 2024
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: makeman,v 1.7 2023/07/21 15:00:32 lukem Exp $
+# $NetBSD: makeman,v 1.8 2024/02/06 21:28:15 rillig Exp $
#
# Copyright (c) 2000 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -38,6 +38,10 @@ list_messages() {
-e 's|^'"$tab"'"",.*/\* '"$2"'[0-9]+ \*/$|---'"$tab"'(no longer used)|p' \
"$1" \
| ${SED} -E \
+ -e 's,%ld,%d,g' \
+ -e 's,%lu,%u,g' \
+ -e 's,%llu,%u,g' \
+ -e 's|%.\*s|%s|g' \
-e 's|\\"|"|g' \
-e 's||\\e|g' \
-e "s|'|\\'|g" \
@@ -45,7 +49,7 @@ list_messages() {
}
# shellcheck disable=SC2016
-cvsid='$NetBSD: makeman,v 1.7 2023/07/21 15:00:32 lukem Exp $'
+cvsid='$NetBSD: makeman,v 1.8 2024/02/06 21:28:15 rillig Exp $'
date="$1"
year="${date##* }"
messages="$(list_messages "$2" "")"
CVS commit: src/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Tue Feb 6 21:28:16 UTC 2024 Modified Files: src/usr.bin/xlint/lint1: makeman Log Message: lint.7: remove implementation details from message list >From a user's perspective, it's irrelevant whether a lint message is generated using '%s' or '%.*s'; same for the integer widths, as they are platform-dependent. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/usr.bin/xlint/lint1/makeman Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/gpt
Module Name:src
Committed By: christos
Date: Tue Feb 6 20:25:11 UTC 2024
Modified Files:
src/sbin/gpt: resizedisk.c
Log Message:
check the right variable
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sbin/gpt/resizedisk.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/gpt/resizedisk.c
diff -u src/sbin/gpt/resizedisk.c:1.20 src/sbin/gpt/resizedisk.c:1.21
--- src/sbin/gpt/resizedisk.c:1.20 Mon Nov 21 19:25:52 2022
+++ src/sbin/gpt/resizedisk.c Tue Feb 6 15:25:11 2024
@@ -33,7 +33,7 @@
__FBSDID("$FreeBSD: src/sbin/gpt/add.c,v 1.14 2006/06/22 22:05:28 marcel Exp $");
#endif
#ifdef __RCSID
-__RCSID("$NetBSD: resizedisk.c,v 1.20 2022/11/22 00:25:52 mlelstv Exp $");
+__RCSID("$NetBSD: resizedisk.c,v 1.21 2024/02/06 20:25:11 christos Exp $");
#endif
#include
@@ -107,7 +107,7 @@ resizedisk(gpt_t gpt, off_t sector, off_
mbr = mbrmap->map_data;
gpt->gpt = map_find(gpt, MAP_TYPE_PRI_GPT_HDR);
- if (gpt == NULL) {
+ if (gpt->gpt == NULL) {
gpt_warnx(gpt, "No primary GPT header; run create or recover");
return -1;
}
CVS commit: src/sbin/gpt
Module Name:src Committed By: christos Date: Tue Feb 6 20:25:11 UTC 2024 Modified Files: src/sbin/gpt: resizedisk.c Log Message: check the right variable To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sbin/gpt/resizedisk.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Tue Feb 6 12:38:53 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 src/external/gpl2/groff/tmac [netbsd-10]: mdoc.local src/sys/sys [netbsd-10]: param.h Log Message: Welcome to 10.0_RC4 To generate a diff of this commit: cvs rdiff -u -r1.1.2.194 -r1.1.2.195 src/doc/CHANGES-10.0 cvs rdiff -u -r1.7.6.4 -r1.7.6.5 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.722.2.4 -r1.722.2.5 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.194 src/doc/CHANGES-10.0:1.1.2.195 --- src/doc/CHANGES-10.0:1.1.2.194 Tue Feb 6 12:37:08 2024 +++ src/doc/CHANGES-10.0 Tue Feb 6 12:38:53 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.194 2024/02/06 12:37:08 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.195 2024/02/06 12:38:53 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -15516,3 +15516,7 @@ sys/dev/pci/ppb.c1.75 ppb(4): print out PCIe Gen5 link speed correctly [rin, ticket #588] +external/gpl2/groff/tmac/mdoc.local (manually edited) +sys/sys/param.h (manually edited) + + Welcome to 10.0_RC4 Index: src/external/gpl2/groff/tmac/mdoc.local diff -u src/external/gpl2/groff/tmac/mdoc.local:1.7.6.4 src/external/gpl2/groff/tmac/mdoc.local:1.7.6.5 --- src/external/gpl2/groff/tmac/mdoc.local:1.7.6.4 Tue Jan 16 08:28:51 2024 +++ src/external/gpl2/groff/tmac/mdoc.local Tue Feb 6 12:38:52 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.7.6.4 2024/01/16 08:28:51 martin Exp $ +.\" $NetBSD: mdoc.local,v 1.7.6.5 2024/02/06 12:38:52 martin Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -46,7 +46,7 @@ .\" Default .Os value .ds doc-operating-system NetBSD\~10.0_BETA .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~10.0_RC3 +.ds doc-default-operating-system NetBSD\~10.0_RC4 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.722.2.4 src/sys/sys/param.h:1.722.2.5 --- src/sys/sys/param.h:1.722.2.4 Tue Jan 16 08:28:51 2024 +++ src/sys/sys/param.h Tue Feb 6 12:38:53 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.722.2.4 2024/01/16 08:28:51 martin Exp $ */ +/* $NetBSD: param.h,v 1.722.2.5 2024/02/06 12:38:53 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 10 /* NetBSD 10.0_RC3 */ +#define __NetBSD_Version__ 10 /* NetBSD 10.0_RC4 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Tue Feb 6 12:38:53 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 src/external/gpl2/groff/tmac [netbsd-10]: mdoc.local src/sys/sys [netbsd-10]: param.h Log Message: Welcome to 10.0_RC4 To generate a diff of this commit: cvs rdiff -u -r1.1.2.194 -r1.1.2.195 src/doc/CHANGES-10.0 cvs rdiff -u -r1.7.6.4 -r1.7.6.5 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.722.2.4 -r1.722.2.5 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Feb 6 12:37:08 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #584 - #588 To generate a diff of this commit: cvs rdiff -u -r1.1.2.193 -r1.1.2.194 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-10.0 diff -u src/doc/CHANGES-10.0:1.1.2.193 src/doc/CHANGES-10.0:1.1.2.194 --- src/doc/CHANGES-10.0:1.1.2.193 Sun Feb 4 11:29:46 2024 +++ src/doc/CHANGES-10.0 Tue Feb 6 12:37:08 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.0,v 1.1.2.193 2024/02/04 11:29:46 martin Exp $ +# $NetBSD: CHANGES-10.0,v 1.1.2.194 2024/02/06 12:37:08 martin Exp $ A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16 until the 10.0 release: @@ -15470,3 +15470,49 @@ sys/sys/socketvar.h1.168 options PIPE_SOCKETPAIR. [jdolecek, ticket #583] +usr.bin/rpcinfo/rpcinfo.c 1.38 + + rpcinfo(8): use IANA registerd service name "sunrpc" instead + of "rpcbind". + [mlelstv, ticket #584] + +sys/dev/usb/ehci.c1.321 +sys/dev/usb/ehcireg.h1.38 + + ehci(4): fix DMA sync flags and ensure proper alignment of + hardware descriptors. + [jmcneill, ticket #585] + +external/public-domain/tz/dist/Makefile up to 1.1.1.38 +external/public-domain/tz/dist/NEWS up to 1.1.1.45 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.37 +external/public-domain/tz/dist/africa up to 1.1.1.33 +external/public-domain/tz/dist/asia up to 1.12 +external/public-domain/tz/dist/australasia up to 1.9 +external/public-domain/tz/dist/checknow.awk up to 1.1.1.2 +external/public-domain/tz/dist/etcetera up to 1.1.1.8 +external/public-domain/tz/dist/europe up to 1.1.1.39 +external/public-domain/tz/dist/leap-seconds.list up to 1.7 +external/public-domain/tz/dist/leapseconds up to 1.7 +external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.14 +external/public-domain/tz/dist/northamerica up to 1.1.1.35 +external/public-domain/tz/dist/southamerica up to 1.1.1.25 +external/public-domain/tz/dist/theory.html up to 1.1.1.19 +external/public-domain/tz/dist/version up to 1.12 +external/public-domain/tz/dist/zishrink.awk up to 1.1.1.9 +external/public-domain/tz/dist/zonenow.tab up to 1.1.1.2 +doc/3RDPARTY (manual edit) + + Updated tzdata to 2024a. + [kre, ticket #586] + +sys/arch/evbppc/wii/dev/wiifb.c 1.6 + + wiifb(4): various fixes. + [jmcneill, ticket #587] + +sys/dev/pci/ppb.c1.75 + + ppb(4): print out PCIe Gen5 link speed correctly + [rin, ticket #588] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Feb 6 12:37:08 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.0 Log Message: Tickets #584 - #588 To generate a diff of this commit: cvs rdiff -u -r1.1.2.193 -r1.1.2.194 src/doc/CHANGES-10.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Feb 6 12:34:48 UTC 2024
Modified Files:
src/sys/dev/pci [netbsd-10]: ppb.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #588):
sys/dev/pci/ppb.c: revision 1.75
ppb(4): Print out PCIe Gen5 link speed correctly
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.74.4.1 src/sys/dev/pci/ppb.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/pci/ppb.c
diff -u src/sys/dev/pci/ppb.c:1.74 src/sys/dev/pci/ppb.c:1.74.4.1
--- src/sys/dev/pci/ppb.c:1.74 Sun Oct 10 23:28:36 2021
+++ src/sys/dev/pci/ppb.c Tue Feb 6 12:34:47 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ppb.c,v 1.74 2021/10/10 23:28:36 msaitoh Exp $ */
+/* $NetBSD: ppb.c,v 1.74.4.1 2024/02/06 12:34:47 martin Exp $ */
/*
* Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.74 2021/10/10 23:28:36 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.74.4.1 2024/02/06 12:34:47 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ppb.h"
@@ -58,8 +58,8 @@ __KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.74
(PCIE_SLCSR_ABP | PCIE_SLCSR_PFD | PCIE_SLCSR_MSC | \
PCIE_SLCSR_PDC | PCIE_SLCSR_CC | PCIE_SLCSR_LACS)
-static const char pcie_linkspeed_strings[5][5] = {
- "1.25", "2.5", "5.0", "8.0", "16.0"
+static const char pcie_linkspeed_strings[6][5] = {
+ "1.25", "2.5", "5.0", "8.0", "16.0", "32.0",
};
int ppb_printevent = 0; /* Print event type if the value is not 0 */
CVS commit: [netbsd-10] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Feb 6 12:34:48 UTC 2024 Modified Files: src/sys/dev/pci [netbsd-10]: ppb.c Log Message: Pull up following revision(s) (requested by rin in ticket #588): sys/dev/pci/ppb.c: revision 1.75 ppb(4): Print out PCIe Gen5 link speed correctly To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.74.4.1 src/sys/dev/pci/ppb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/arch/evbppc/wii/dev
Module Name:src
Committed By: martin
Date: Tue Feb 6 12:33:18 UTC 2024
Modified Files:
src/sys/arch/evbppc/wii/dev [netbsd-10]: wiifb.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #587):
sys/arch/evbppc/wii/dev/wiifb.c: revision 1.6
wiifb: Misc fixes.
Add a 16-pixel border on the top and bottom of the FB, and fix an error
path to properly blink the slot LED when the current video mode is not
supported.
To generate a diff of this commit:
cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/sys/arch/evbppc/wii/dev/wiifb.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/evbppc/wii/dev/wiifb.c
diff -u src/sys/arch/evbppc/wii/dev/wiifb.c:1.5.2.2 src/sys/arch/evbppc/wii/dev/wiifb.c:1.5.2.3
--- src/sys/arch/evbppc/wii/dev/wiifb.c:1.5.2.2 Sat Feb 3 11:47:04 2024
+++ src/sys/arch/evbppc/wii/dev/wiifb.c Tue Feb 6 12:33:17 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: wiifb.c,v 1.5.2.2 2024/02/03 11:47:04 martin Exp $ */
+/* $NetBSD: wiifb.c,v 1.5.2.3 2024/02/06 12:33:17 martin Exp $ */
/*-
* Copyright (c) 2024 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wiifb.c,v 1.5.2.2 2024/02/03 11:47:04 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wiifb.c,v 1.5.2.3 2024/02/06 12:33:17 martin Exp $");
#include
#include
@@ -43,7 +43,14 @@ __KERNEL_RCSID(0, "$NetBSD: wiifb.c,v 1.
#include "vireg.h"
#include "viio.h"
-#define WIIFB_ERROR_BLINK_INTERVAL 100
+#define WIIFB_ERROR_BLINK_INTERVAL 100
+
+#define WIIFB_TOP_BOTTOM_BORDER 16
+#define WIIFB_EFFECTIVE_START(p, w) \
+ ((uintptr_t)(p) + WIIFB_TOP_BOTTOM_BORDER * (w) * 2)
+#define WIIFB_EFFECTIVE_HEIGHT(h) \
+ ((h) - WIIFB_TOP_BOTTOM_BORDER * 2)
+
struct wiifb_mode {
const char * name;
@@ -151,6 +158,8 @@ wiifb_attach(device_t parent, device_t s
struct wiifb_softc *sc = device_private(self);
prop_dictionary_t dict = device_properties(self);
struct mainbus_attach_args *maa = aux;
+ u_int offset;
+ uint32_t *p;
int error;
sc->sc_gen.sc_dev = self;
@@ -162,15 +171,26 @@ wiifb_attach(device_t parent, device_t s
}
sc->sc_bits = mapiodev(XFB_START, XFB_SIZE, true);
+ /*
+ * Paint the entire FB black. Use 4-byte accesses as the Wii will
+ * ignore 1- and 2- byte writes to uncached memory.
+ */
+ for (p = sc->sc_bits, offset = 0;
+ offset < XFB_SIZE;
+ offset += 4, p++) {
+ *p = 0x00800080;
+ }
+
wiifb_init(sc);
wiifb_set_mode(sc, sc->sc_format, sc->sc_interlaced);
prop_dictionary_set_uint32(dict, "width", sc->sc_curmode->width);
- prop_dictionary_set_uint32(dict, "height", sc->sc_curmode->height);
+ prop_dictionary_set_uint32(dict, "height",
+ WIIFB_EFFECTIVE_HEIGHT(sc->sc_curmode->height));
prop_dictionary_set_uint8(dict, "depth", 16);
prop_dictionary_set_uint32(dict, "address", XFB_START);
prop_dictionary_set_uint32(dict, "virtual_address",
- (uintptr_t)sc->sc_bits);
+ WIIFB_EFFECTIVE_START(sc->sc_bits, sc->sc_curmode->width));
prop_dictionary_set_uint64(dict, "devcmap", (uintptr_t)wiifb_devcmap);
genfb_init(>sc_gen);
@@ -212,12 +232,6 @@ wiifb_set_mode(struct wiifb_softc *sc, u
u_int strides, reads;
modeidx = WIIFB_MODE_INDEX(format, interlaced);
- if (modeidx >= WIIFB_NMODES || wiifb_modes[modeidx].name == NULL) {
- panic("Unsupported format (0x%x) / interlaced (%d) settings",
- sc->sc_format, sc->sc_interlaced);
- }
- sc->sc_curmode = _modes[modeidx];
-
if (modeidx == WIIFB_MODE_INDEX(VI_DCR_FMT_NTSC, 1)) {
/* NTSC 480i Magic numbers from YAGCD. */
WR2(sc, VI_VTR, 0x0f06);
@@ -253,6 +267,12 @@ wiifb_set_mode(struct wiifb_softc *sc, u
wii_slot_led_blink(WIIFB_ERROR_BLINK_INTERVAL);
}
+ if (modeidx >= WIIFB_NMODES || wiifb_modes[modeidx].name == NULL) {
+ panic("Unsupported format (0x%x) / interlaced (%d) settings",
+ sc->sc_format, sc->sc_interlaced);
+ }
+ sc->sc_curmode = _modes[modeidx];
+
/* Picture configuration */
strides = (sc->sc_curmode->width * 2) / (interlaced ? 16 : 32);
reads = (sc->sc_curmode->width * 2) / 32;
@@ -322,11 +342,12 @@ wiifb_ioctl(void *v, void *vs, u_long cm
* devcmap, so fill out fbinfo manually instead of relying
* on wsdisplayio_get_fbinfo.
*/
- fbi->fbi_fbsize = XFB_SIZE;
fbi->fbi_fboffset = 0;
fbi->fbi_width = sc->sc_curmode->width;
- fbi->fbi_height = sc->sc_curmode->height;
+ fbi->fbi_height =
+ WIIFB_EFFECTIVE_HEIGHT(sc->sc_curmode->height);
fbi->fbi_stride = fbi->fbi_width * 2;
+ fbi->fbi_fbsize = fbi->fbi_height * fbi->fbi_stride;
fbi->fbi_bitsperpixel = 16;
fbi->fbi_pixeltype = WSFB_YUY2;
fbi->fbi_flags = WSFB_VRAM_IS_RAM;
@@ -384,11 +405,17 @@ static paddr_t
wiifb_mmap(void *v, void *vs, off_t off, int prot)
{
struct wiifb_softc *sc = v;
+ bus_addr_t start;
+ bus_size_t size;
+
+ start = WIIFB_EFFECTIVE_START(XFB_START, sc->sc_curmode->width);
+ size =
CVS commit: [netbsd-10] src/sys/arch/evbppc/wii/dev
Module Name:src Committed By: martin Date: Tue Feb 6 12:33:18 UTC 2024 Modified Files: src/sys/arch/evbppc/wii/dev [netbsd-10]: wiifb.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #587): sys/arch/evbppc/wii/dev/wiifb.c: revision 1.6 wiifb: Misc fixes. Add a 16-pixel border on the top and bottom of the FB, and fix an error path to properly blink the slot LED when the current video mode is not supported. To generate a diff of this commit: cvs rdiff -u -r1.5.2.2 -r1.5.2.3 src/sys/arch/evbppc/wii/dev/wiifb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Feb 6 12:30:23 UTC 2024 Modified Files: src/doc [netbsd-10]: 3RDPARTY Log Message: Note changes, requested by kre in ticket #586: doc/3RDPARTY(manual edit) Note tzdata update to 2024a To generate a diff of this commit: cvs rdiff -u -r1.1905.2.10 -r1.1905.2.11 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.1905.2.10 src/doc/3RDPARTY:1.1905.2.11 --- src/doc/3RDPARTY:1.1905.2.10 Fri Dec 29 20:41:11 2023 +++ src/doc/3RDPARTY Tue Feb 6 12:30:23 2024 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1905.2.10 2023/12/29 20:41:11 martin Exp $ +# $NetBSD: 3RDPARTY,v 1.1905.2.11 2024/02/06 12:30:23 martin Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -1424,8 +1424,8 @@ Location: external/bsd/tradcpp Notes: Package: tz -Version: tzcode2022g / tzdata2023dgtz -Current Vers: tzcode2023d / tzdata2023d +Version: tzcode2022g / tzdata2024agtz +Current Vers: tzcode2024a / tzdata2024a Maintainer: Paul Eggert Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Tue Feb 6 12:30:23 UTC 2024 Modified Files: src/doc [netbsd-10]: 3RDPARTY Log Message: Note changes, requested by kre in ticket #586: doc/3RDPARTY(manual edit) Note tzdata update to 2024a To generate a diff of this commit: cvs rdiff -u -r1.1905.2.10 -r1.1905.2.11 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/external/public-domain/tz/dist
Module Name:src Committed By: martin Date: Tue Feb 6 12:22:42 UTC 2024 Modified Files: src/external/public-domain/tz/dist [netbsd-10]: Makefile NEWS TZDATA_VERSION africa asia australasia checknow.awk etcetera europe leap-seconds.list leapseconds leapseconds.awk northamerica southamerica theory.html version zishrink.awk zonenow.tab Log Message: Pull up the following, requested by kre in ticket #586: external/public-domain/tz/dist/Makefile up to 1.1.1.38 external/public-domain/tz/dist/NEWS up to 1.1.1.45 external/public-domain/tz/dist/TZDATA_VERSION up to 1.37 external/public-domain/tz/dist/africa up to 1.1.1.33 external/public-domain/tz/dist/asia up to 1.12 external/public-domain/tz/dist/australasia up to 1.9 external/public-domain/tz/dist/checknow.awk up to 1.1.1.2 external/public-domain/tz/dist/etcetera up to 1.1.1.8 external/public-domain/tz/dist/europe up to 1.1.1.39 external/public-domain/tz/dist/leap-seconds.list up to 1.7 external/public-domain/tz/dist/leapseconds up to 1.7 external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.14 external/public-domain/tz/dist/northamerica up to 1.1.1.35 external/public-domain/tz/dist/southamerica up to 1.1.1.25 external/public-domain/tz/dist/theory.html up to 1.1.1.19 external/public-domain/tz/dist/version up to 1.12 external/public-domain/tz/dist/zishrink.awk up to 1.1.1.9 external/public-domain/tz/dist/zonenow.tab up to 1.1.1.2 Updated tzdata to 2024a To generate a diff of this commit: cvs rdiff -u -r1.1.1.35.2.2 -r1.1.1.35.2.3 \ src/external/public-domain/tz/dist/Makefile cvs rdiff -u -r1.1.1.40.2.2 -r1.1.1.40.2.3 \ src/external/public-domain/tz/dist/NEWS cvs rdiff -u -r1.32.2.2 -r1.32.2.3 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.30.2.2 -r1.1.1.30.2.3 \ src/external/public-domain/tz/dist/africa cvs rdiff -u -r1.7.2.2 -r1.7.2.3 src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/version cvs rdiff -u -r1.6.2.2 -r1.6.2.3 \ src/external/public-domain/tz/dist/australasia cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \ src/external/public-domain/tz/dist/checknow.awk \ src/external/public-domain/tz/dist/zonenow.tab cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 \ src/external/public-domain/tz/dist/etcetera cvs rdiff -u -r1.1.1.36.2.2 -r1.1.1.36.2.3 \ src/external/public-domain/tz/dist/europe cvs rdiff -u -r1.4.2.2 -r1.4.2.3 \ src/external/public-domain/tz/dist/leap-seconds.list \ src/external/public-domain/tz/dist/leapseconds cvs rdiff -u -r1.1.1.12.6.1 -r1.1.1.12.6.2 \ src/external/public-domain/tz/dist/leapseconds.awk cvs rdiff -u -r1.1.1.32.2.2 -r1.1.1.32.2.3 \ src/external/public-domain/tz/dist/northamerica cvs rdiff -u -r1.1.1.22.2.2 -r1.1.1.22.2.3 \ src/external/public-domain/tz/dist/southamerica cvs rdiff -u -r1.1.1.17.2.1 -r1.1.1.17.2.2 \ src/external/public-domain/tz/dist/theory.html cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 \ src/external/public-domain/tz/dist/zishrink.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/public-domain/tz/dist/Makefile diff -u src/external/public-domain/tz/dist/Makefile:1.1.1.35.2.2 src/external/public-domain/tz/dist/Makefile:1.1.1.35.2.3 --- src/external/public-domain/tz/dist/Makefile:1.1.1.35.2.2 Fri Dec 29 20:41:11 2023 +++ src/external/public-domain/tz/dist/Makefile Tue Feb 6 12:22:41 2024 @@ -53,7 +53,7 @@ DATAFORM= main LOCALTIME= Factory -# The POSIXRULES macro controls interpretation of POSIX-like TZ +# The POSIXRULES macro controls interpretation of POSIX-2017.1-like TZ # settings like TZ='EET-2EEST' that lack DST transition rules. # If POSIXRULES is '-', no template is installed; this is the default. # Any other value for POSIXRULES is obsolete and should not be relied on, as: @@ -274,7 +274,7 @@ LDLIBS= # -DTZ_DOMAINDIR=\"/path\" to use "/path" for gettext directory; # the default is system-supplied, typically "/usr/lib/locale" # -DTZDEFRULESTRING=\",date/time,date/time\" to default to the specified -# DST transitions for POSIX-style TZ strings lacking them, +# DST transitions for POSIX.1-2017-style TZ strings lacking them, # in the usual case where POSIXRULES is '-'. If not specified, # TZDEFRULESTRING defaults to US rules for future DST transitions. # This mishandles some past timestamps, as US DST rules have changed. @@ -340,9 +340,10 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn # guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this. # Similarly, if your system has a "zone abbreviation" field, define # -DTM_ZONE=tm_zone -# and define NO_TM_ZONE to
CVS commit: [netbsd-10] src/external/public-domain/tz/dist
Module Name:src Committed By: martin Date: Tue Feb 6 12:22:42 UTC 2024 Modified Files: src/external/public-domain/tz/dist [netbsd-10]: Makefile NEWS TZDATA_VERSION africa asia australasia checknow.awk etcetera europe leap-seconds.list leapseconds leapseconds.awk northamerica southamerica theory.html version zishrink.awk zonenow.tab Log Message: Pull up the following, requested by kre in ticket #586: external/public-domain/tz/dist/Makefile up to 1.1.1.38 external/public-domain/tz/dist/NEWS up to 1.1.1.45 external/public-domain/tz/dist/TZDATA_VERSION up to 1.37 external/public-domain/tz/dist/africa up to 1.1.1.33 external/public-domain/tz/dist/asia up to 1.12 external/public-domain/tz/dist/australasia up to 1.9 external/public-domain/tz/dist/checknow.awk up to 1.1.1.2 external/public-domain/tz/dist/etcetera up to 1.1.1.8 external/public-domain/tz/dist/europe up to 1.1.1.39 external/public-domain/tz/dist/leap-seconds.list up to 1.7 external/public-domain/tz/dist/leapseconds up to 1.7 external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.14 external/public-domain/tz/dist/northamerica up to 1.1.1.35 external/public-domain/tz/dist/southamerica up to 1.1.1.25 external/public-domain/tz/dist/theory.html up to 1.1.1.19 external/public-domain/tz/dist/version up to 1.12 external/public-domain/tz/dist/zishrink.awk up to 1.1.1.9 external/public-domain/tz/dist/zonenow.tab up to 1.1.1.2 Updated tzdata to 2024a To generate a diff of this commit: cvs rdiff -u -r1.1.1.35.2.2 -r1.1.1.35.2.3 \ src/external/public-domain/tz/dist/Makefile cvs rdiff -u -r1.1.1.40.2.2 -r1.1.1.40.2.3 \ src/external/public-domain/tz/dist/NEWS cvs rdiff -u -r1.32.2.2 -r1.32.2.3 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.30.2.2 -r1.1.1.30.2.3 \ src/external/public-domain/tz/dist/africa cvs rdiff -u -r1.7.2.2 -r1.7.2.3 src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/version cvs rdiff -u -r1.6.2.2 -r1.6.2.3 \ src/external/public-domain/tz/dist/australasia cvs rdiff -u -r1.1.1.1.2.2 -r1.1.1.1.2.3 \ src/external/public-domain/tz/dist/checknow.awk \ src/external/public-domain/tz/dist/zonenow.tab cvs rdiff -u -r1.1.1.7 -r1.1.1.7.2.1 \ src/external/public-domain/tz/dist/etcetera cvs rdiff -u -r1.1.1.36.2.2 -r1.1.1.36.2.3 \ src/external/public-domain/tz/dist/europe cvs rdiff -u -r1.4.2.2 -r1.4.2.3 \ src/external/public-domain/tz/dist/leap-seconds.list \ src/external/public-domain/tz/dist/leapseconds cvs rdiff -u -r1.1.1.12.6.1 -r1.1.1.12.6.2 \ src/external/public-domain/tz/dist/leapseconds.awk cvs rdiff -u -r1.1.1.32.2.2 -r1.1.1.32.2.3 \ src/external/public-domain/tz/dist/northamerica cvs rdiff -u -r1.1.1.22.2.2 -r1.1.1.22.2.3 \ src/external/public-domain/tz/dist/southamerica cvs rdiff -u -r1.1.1.17.2.1 -r1.1.1.17.2.2 \ src/external/public-domain/tz/dist/theory.html cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 \ src/external/public-domain/tz/dist/zishrink.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Tue Feb 6 12:18:56 UTC 2024
Modified Files:
src/sys/dev/usb [netbsd-10]: ehci.c ehcireg.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #585):
sys/dev/usb/ehcireg.h: revision 1.38
sys/dev/usb/ehci.c: revision 1.321
Fix DMA sync flags in ehci_append_sqtd
Ensure proper alignment/padding of EHCI hardware descriptors.
These descriptor structs are embedded in structs that contain additional
context for software. With a non cache coherent device and non-padded
descriptors, the device may issue a read/modify/write past the end of
the descriptor, clobbering software state in the process. This was the
root cause of multiple crashes on evbppc with a non cache coherent EHCI.
To generate a diff of this commit:
cvs rdiff -u -r1.315.2.2 -r1.315.2.3 src/sys/dev/usb/ehci.c
cvs rdiff -u -r1.37 -r1.37.50.1 src/sys/dev/usb/ehcireg.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.315.2.2 src/sys/dev/usb/ehci.c:1.315.2.3
--- src/sys/dev/usb/ehci.c:1.315.2.2 Mon Oct 30 17:45:10 2023
+++ src/sys/dev/usb/ehci.c Tue Feb 6 12:18:55 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.315.2.2 2023/10/30 17:45:10 martin Exp $ */
+/* $NetBSD: ehci.c,v 1.315.2.3 2024/02/06 12:18:55 martin Exp $ */
/*
* Copyright (c) 2004-2012,2016,2020 The NetBSD Foundation, Inc.
@@ -54,7 +54,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.315.2.2 2023/10/30 17:45:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ehci.c,v 1.315.2.3 2024/02/06 12:18:55 martin Exp $");
#include "ohci.h"
#include "uhci.h"
@@ -3060,7 +3060,7 @@ ehci_append_sqtd(ehci_soft_qtd_t *sqtd,
prev->qtd.qtd_next = htole32(sqtd->physaddr);
prev->qtd.qtd_altnext = prev->qtd.qtd_next;
usb_syncmem(>dma, prev->offs, sizeof(prev->qtd),
- BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
+ BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
}
}
Index: src/sys/dev/usb/ehcireg.h
diff -u src/sys/dev/usb/ehcireg.h:1.37 src/sys/dev/usb/ehcireg.h:1.37.50.1
--- src/sys/dev/usb/ehcireg.h:1.37 Sat Apr 23 10:15:31 2016
+++ src/sys/dev/usb/ehcireg.h Tue Feb 6 12:18:55 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ehcireg.h,v 1.37 2016/04/23 10:15:31 skrll Exp $ */
+/* $NetBSD: ehcireg.h,v 1.37.50.1 2024/02/06 12:18:55 martin Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -203,6 +203,7 @@ typedef uint32_t ehci_isoc_trans_t;
typedef uint32_t ehci_isoc_bufr_ptr_t;
/* Isochronous Transfer Descriptor */
+#define EHCI_ITD_ALIGN 32
#define EHCI_ITD_NUFRAMES USB_UFRAMES_PER_FRAME
#define EHCI_ITD_NBUFFERS 7
typedef struct {
@@ -247,10 +248,10 @@ typedef struct {
#define EHCI_ITD_GET_MULTI(x) __SHIFTOUT((x), EHCI_ITD_MULTI_MASK)
#define EHCI_ITD_SET_MULTI(x) __SHIFTIN((x), EHCI_ITD_MULTI_MASK)
volatile ehci_isoc_bufr_ptr_t itd_bufr_hi[EHCI_ITD_NBUFFERS];
-} ehci_itd_t;
-#define EHCI_ITD_ALIGN 32
+} __aligned(EHCI_ITD_ALIGN) ehci_itd_t;
/* Split Transaction Isochronous Transfer Descriptor */
+#define EHCI_SITD_ALIGN 32
typedef struct {
volatile ehci_link_t sitd_next;
volatile uint32_t sitd_endp;
@@ -294,12 +295,12 @@ typedef struct {
volatile ehci_link_t sitd_back;
volatile uint32_t sitd_buffer_hi[EHCI_SITD_BUFFERS];
-} ehci_sitd_t;
-#define EHCI_SITD_ALIGN 32
+} __aligned(EHCI_SITD_ALIGN) ehci_sitd_t;
/* Queue Element Transfer Descriptor */
#define EHCI_QTD_NBUFFERS 5
#define EHCI_QTD_MAXTRANSFER (EHCI_QTD_NBUFFERS * EHCI_PAGE_SIZE)
+#define EHCI_QTD_ALIGN 32
typedef struct {
volatile ehci_link_t qtd_next;
volatile ehci_link_t qtd_altnext;
@@ -338,10 +339,10 @@ typedef struct {
#define EHCI_QTD_SET_TOGGLE(x) __SHIFTIN((x), EHCI_QTD_TOGGLE_MASK)
volatile ehci_physaddr_t qtd_buffer[EHCI_QTD_NBUFFERS];
volatile ehci_physaddr_t qtd_buffer_hi[EHCI_QTD_NBUFFERS];
-} ehci_qtd_t;
-#define EHCI_QTD_ALIGN 32
+} __aligned(EHCI_QTD_ALIGN) ehci_qtd_t;
/* Queue Head */
+#define EHCI_QH_ALIGN 32
typedef struct {
volatile ehci_link_t qh_link;
volatile uint32_t qh_endp;
@@ -388,16 +389,26 @@ typedef struct {
#define EHCI_QH_GET_MULT(x) __SHIFTOUT((x), EHCI_QH_MULTI_MASK)
#define EHCI_QH_SET_MULT(x) __SHIFTIN((x), EHCI_QH_MULTI_MASK)
volatile ehci_link_t qh_curqtd;
- ehci_qtd_t qh_qtd;
-} ehci_qh_t;
-#define EHCI_QH_ALIGN 32
+ /*
+ * The QH descriptor contains a TD overlay, but it is not
+ * 32-byte aligned, so declare the fields instead of embedding
+ * a ehci_qtd_t directly.
+ */
+ struct {
+ volatile ehci_link_t qtd_next;
+ volatile ehci_link_t qtd_altnext;
+ volatile uint32_t qtd_status;
+ volatile ehci_physaddr_t qtd_buffer[EHCI_QTD_NBUFFERS];
+ volatile ehci_physaddr_t qtd_buffer_hi[EHCI_QTD_NBUFFERS];
+ } qh_qtd;
+} __aligned(EHCI_QH_ALIGN) ehci_qh_t;
/* Periodic Frame Span Traversal Node */
+#define EHCI_FSTN_ALIGN 32
typedef struct {
CVS commit: [netbsd-10] src/sys/dev/usb
Module Name:src Committed By: martin Date: Tue Feb 6 12:18:56 UTC 2024 Modified Files: src/sys/dev/usb [netbsd-10]: ehci.c ehcireg.h Log Message: Pull up following revision(s) (requested by jmcneill in ticket #585): sys/dev/usb/ehcireg.h: revision 1.38 sys/dev/usb/ehci.c: revision 1.321 Fix DMA sync flags in ehci_append_sqtd Ensure proper alignment/padding of EHCI hardware descriptors. These descriptor structs are embedded in structs that contain additional context for software. With a non cache coherent device and non-padded descriptors, the device may issue a read/modify/write past the end of the descriptor, clobbering software state in the process. This was the root cause of multiple crashes on evbppc with a non cache coherent EHCI. To generate a diff of this commit: cvs rdiff -u -r1.315.2.2 -r1.315.2.3 src/sys/dev/usb/ehci.c cvs rdiff -u -r1.37 -r1.37.50.1 src/sys/dev/usb/ehcireg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.bin/rpcinfo
Module Name:src Committed By: martin Date: Tue Feb 6 12:16:26 UTC 2024 Modified Files: src/usr.bin/rpcinfo [netbsd-10]: rpcinfo.c Log Message: Pull up following revision(s) (requested by mlelstv in ticket #584): usr.bin/rpcinfo/rpcinfo.c: revision 1.38 Use IANA registerd service name "sunrpc" instead of "rpcbind". To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.37.38.1 src/usr.bin/rpcinfo/rpcinfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-10] src/usr.bin/rpcinfo
Module Name:src
Committed By: martin
Date: Tue Feb 6 12:16:26 UTC 2024
Modified Files:
src/usr.bin/rpcinfo [netbsd-10]: rpcinfo.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #584):
usr.bin/rpcinfo/rpcinfo.c: revision 1.38
Use IANA registerd service name "sunrpc" instead of "rpcbind".
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.37.38.1 src/usr.bin/rpcinfo/rpcinfo.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/rpcinfo/rpcinfo.c
diff -u src/usr.bin/rpcinfo/rpcinfo.c:1.37 src/usr.bin/rpcinfo/rpcinfo.c:1.37.38.1
--- src/usr.bin/rpcinfo/rpcinfo.c:1.37 Fri May 24 23:09:45 2013
+++ src/usr.bin/rpcinfo/rpcinfo.c Tue Feb 6 12:16:26 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: rpcinfo.c,v 1.37 2013/05/24 23:09:45 christos Exp $ */
+/* $NetBSD: rpcinfo.c,v 1.37.38.1 2024/02/06 12:16:26 martin Exp $ */
/*
* Sun RPC is a product of Sun Microsystems, Inc. and is provided for
@@ -569,7 +569,7 @@ get_inet_address(struct sockaddr_in *add
} else {
(void)memset(, 0, sizeof hints);
hints.ai_family = AF_INET;
- if ((error = getaddrinfo(host, "rpcbind", , ))
+ if ((error = getaddrinfo(host, "sunrpc", , ))
!= 0) {
errx(1, "%s: %s", host, gai_strerror(error));
} else {
@@ -1628,7 +1628,7 @@ getclnthandle(const char *host, const st
/* Get the address of the rpcbind */
(void)memset(, 0, sizeof hints);
- if (getaddrinfo(host, "rpcbind", , ) != 0) {
+ if (getaddrinfo(host, "sunrpc", , ) != 0) {
rpc_createerr.cf_stat = RPC_N2AXLATEFAILURE;
return NULL;
}
