CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pgoyette Date: Sat Jun 4 03:32:04 UTC 2022 Modified Files: src/distrib/sets/lists/debug: module.mi src/distrib/sets/lists/modules: mi Log Message: Add sets-lists entries for the new combined midi_seq module To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/debug/module.mi cvs rdiff -u -r1.153 -r1.154 src/distrib/sets/lists/modules/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/module.mi diff -u src/distrib/sets/lists/debug/module.mi:1.19 src/distrib/sets/lists/debug/module.mi:1.20 --- src/distrib/sets/lists/debug/module.mi:1.19 Thu Apr 14 16:51:57 2022 +++ src/distrib/sets/lists/debug/module.mi Sat Jun 4 03:32:04 2022 @@ -1,4 +1,4 @@ -# $NetBSD: module.mi,v 1.19 2022/04/14 16:51:57 pgoyette Exp $ +# $NetBSD: module.mi,v 1.20 2022/06/04 03:32:04 pgoyette Exp $ ./usr/libdata/debug/@MODULEDIR@ modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/accf_dataready modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/accf_dataready/accf_dataready.kmod.debug modules-base-kernel kmod,debug @@ -258,6 +258,8 @@ ./usr/libdata/debug/@MODULEDIR@/mfs/mfs.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/midimodules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/midi/midi.kmod.debug modules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/midi_seqmodules-base-kernel kmod,debug +./usr/libdata/debug/@MODULEDIR@/midi_seq/midi_seq.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/miiverbose modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/miiverbose/miiverbose.kmod.debug modules-base-kernel kmod,debug ./usr/libdata/debug/@MODULEDIR@/minirootmodules-base-kernel kmod,debug Index: src/distrib/sets/lists/modules/mi diff -u src/distrib/sets/lists/modules/mi:1.153 src/distrib/sets/lists/modules/mi:1.154 --- src/distrib/sets/lists/modules/mi:1.153 Thu Apr 14 16:51:57 2022 +++ src/distrib/sets/lists/modules/mi Sat Jun 4 03:32:04 2022 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.153 2022/04/14 16:51:57 pgoyette Exp $ +# $NetBSD: mi,v 1.154 2022/06/04 03:32:04 pgoyette Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -311,6 +311,8 @@ ./@MODULEDIR@/mfs/mfs.kmod modules-base-kernel kmod ./@MODULEDIR@/midimodules-base-kernel kmod ./@MODULEDIR@/midi/midi.kmod modules-base-kernel kmod +./@MODULEDIR@/midi_seqmodules-base-kernel kmod +./@MODULEDIR@/midi_seq/midi_seq.kmod modules-base-kernel kmod ./@MODULEDIR@/miiverbose modules-base-kernel kmod ./@MODULEDIR@/miiverbose/miiverbose.kmod modules-base-kernel kmod ./@MODULEDIR@/minirootmodules-base-kernel kmod
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: pgoyette Date: Sat Jun 4 03:32:04 UTC 2022 Modified Files: src/distrib/sets/lists/debug: module.mi src/distrib/sets/lists/modules: mi Log Message: Add sets-lists entries for the new combined midi_seq module To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/debug/module.mi cvs rdiff -u -r1.153 -r1.154 src/distrib/sets/lists/modules/mi 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: pgoyette
Date: Sat Jun 4 03:31:10 UTC 2022
Modified Files:
src/sys/dev: files.audio files.dev midi.c sequencer.c
src/sys/modules: Makefile
src/sys/modules/midi: Makefile
src/sys/modules/sequencer: Makefile
Added Files:
src/sys/dev: midi_mod.c midi_seq_mod.c sequencer_mod.c
src/sys/modules/midi_seq: Makefile midi_seq.ioconf
Removed Files:
src/sys/modules/midi: midi.ioconf
src/sys/modules/sequencer: sequencer.ioconf
Log Message:
Combine the midi and sequencer modules into a single midi_seq module
to avoid a circular dependency as noted in kern/56772. Retain minimal
modules of the original names to accomodate auto-loading upon access
to the /dev/xxx nodes.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/files.audio
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/files.dev
cvs rdiff -u -r1.97 -r1.98 src/sys/dev/midi.c
cvs rdiff -u -r0 -r1.1 src/sys/dev/midi_mod.c src/sys/dev/midi_seq_mod.c \
src/sys/dev/sequencer_mod.c
cvs rdiff -u -r1.79 -r1.80 src/sys/dev/sequencer.c
cvs rdiff -u -r1.265 -r1.266 src/sys/modules/Makefile
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/midi/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/modules/midi/midi.ioconf
cvs rdiff -u -r0 -r1.1 src/sys/modules/midi_seq/Makefile \
src/sys/modules/midi_seq/midi_seq.ioconf
cvs rdiff -u -r1.2 -r1.3 src/sys/modules/sequencer/Makefile
cvs rdiff -u -r1.1 -r0 src/sys/modules/sequencer/sequencer.ioconf
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/files.audio
diff -u src/sys/dev/files.audio:1.14 src/sys/dev/files.audio:1.15
--- src/sys/dev/files.audio:1.14 Sat Jan 25 19:22:05 2020
+++ src/sys/dev/files.audio Sat Jun 4 03:31:10 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.audio,v 1.14 2020/01/25 19:22:05 jmcneill Exp $
+# $NetBSD: files.audio,v 1.15 2022/06/04 03:31:10 pgoyette Exp $
defparam opt_audio.h AUDIO_BLK_MS
@@ -23,7 +23,11 @@ file dev/audio/linear.c audio
file dev/audio/audio.c audio needs-flag
file dev/audio/audiobell.c spkr_audio needs-flag
file dev/audio/mulaw.c audio
-file dev/midi.c midi needs-flag
+file dev/midi.c midi | sequencer needs-flag
+file dev/midi_mod.c midi | sequencer needs-flag
+file dev/midi_seq_mod.c midi | sequencer needs-flag
file dev/midictl.c midisyn
file dev/midisyn.c midisyn
+file dev/sequencer.c midi | sequencer needs-flag
+file dev/sequencer_mod.c midi | sequencer needs-flag
file dev/spkr_audio.c spkr_audio needs-flag
Index: src/sys/dev/files.dev
diff -u src/sys/dev/files.dev:1.8 src/sys/dev/files.dev:1.9
--- src/sys/dev/files.dev:1.8 Sun Oct 10 13:03:09 2021
+++ src/sys/dev/files.dev Sat Jun 4 03:31:10 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.dev,v 1.8 2021/10/10 13:03:09 jmcneill Exp $
+# $NetBSD: files.dev,v 1.9 2022/06/04 03:31:10 pgoyette Exp $
file dev/bio.c bio needs-flag
file dev/ccd.c ccd
@@ -22,7 +22,6 @@ file dev/mm.c kern # XXX
file dev/nullcons_subr.c nullcons needs-flag
file dev/radio.c radio needs-flag
file dev/random.c rnd needs-flag
-file dev/sequencer.c sequencer needs-flag
file dev/video.c video needs-flag
file dev/vnd.c vnd
file dev/ipmi.c ipmi needs-flag
Index: src/sys/dev/midi.c
diff -u src/sys/dev/midi.c:1.97 src/sys/dev/midi.c:1.98
--- src/sys/dev/midi.c:1.97 Sun May 22 11:27:35 2022
+++ src/sys/dev/midi.c Sat Jun 4 03:31:10 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: midi.c,v 1.97 2022/05/22 11:27:35 andvar Exp $ */
+/* $NetBSD: midi.c,v 1.98 2022/06/04 03:31:10 pgoyette Exp $ */
/*
* Copyright (c) 1998, 2008 The NetBSD Foundation, Inc.
@@ -31,11 +31,10 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.97 2022/05/22 11:27:35 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midi.c,v 1.98 2022/06/04 03:31:10 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "midi.h"
-#include "sequencer.h"
#endif
#include
@@ -1900,45 +1899,3 @@ midi_attach_mi(const struct midi_hw_if *
}
#endif /* NMIDI > 0 || NMIDIBUS > 0 */
-
-#ifdef _MODULE
-#include "ioconf.c"
-
-devmajor_t midi_bmajor = -1, midi_cmajor = -1;
-#endif
-
-MODULE(MODULE_CLASS_DRIVER, midi, "audio");
-
-static int
-midi_modcmd(modcmd_t cmd, void *arg)
-{
- int error = 0;
-
-#ifdef _MODULE
- switch (cmd) {
- case MODULE_CMD_INIT:
- error = devsw_attach(midi_cd.cd_name, NULL, &midi_bmajor,
- &midi_cdevsw, &midi_cmajor);
- if (error)
- break;
-
- error = config_init_component(cfdriver_ioconf_midi,
- cfattach_ioconf_midi, cfdata_ioconf_midi);
- if (error) {
- devsw_detach(NULL, &midi_cdevsw);
- }
- break;
- case MODULE_CMD_FINI:
- error = config_fini_component(cfdriver_ioconf_midi,
- cfattach_ioconf_midi, cfdata_ioconf_midi);
- if (error == 0)
- devsw_detach(NULL, &midi_cdevsw);
- break;
- default:
- error = ENOTTY;
- break;
- }
-#endif
-
- return error;
-}
Index: src/sys/dev/sequencer.c
diff -u src/sys/
CVS commit: src/sys
Module Name:src Committed By: pgoyette Date: Sat Jun 4 03:31:10 UTC 2022 Modified Files: src/sys/dev: files.audio files.dev midi.c sequencer.c src/sys/modules: Makefile src/sys/modules/midi: Makefile src/sys/modules/sequencer: Makefile Added Files: src/sys/dev: midi_mod.c midi_seq_mod.c sequencer_mod.c src/sys/modules/midi_seq: Makefile midi_seq.ioconf Removed Files: src/sys/modules/midi: midi.ioconf src/sys/modules/sequencer: sequencer.ioconf Log Message: Combine the midi and sequencer modules into a single midi_seq module to avoid a circular dependency as noted in kern/56772. Retain minimal modules of the original names to accomodate auto-loading upon access to the /dev/xxx nodes. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/dev/files.audio cvs rdiff -u -r1.8 -r1.9 src/sys/dev/files.dev cvs rdiff -u -r1.97 -r1.98 src/sys/dev/midi.c cvs rdiff -u -r0 -r1.1 src/sys/dev/midi_mod.c src/sys/dev/midi_seq_mod.c \ src/sys/dev/sequencer_mod.c cvs rdiff -u -r1.79 -r1.80 src/sys/dev/sequencer.c cvs rdiff -u -r1.265 -r1.266 src/sys/modules/Makefile cvs rdiff -u -r1.2 -r1.3 src/sys/modules/midi/Makefile cvs rdiff -u -r1.1 -r0 src/sys/modules/midi/midi.ioconf cvs rdiff -u -r0 -r1.1 src/sys/modules/midi_seq/Makefile \ src/sys/modules/midi_seq/midi_seq.ioconf cvs rdiff -u -r1.2 -r1.3 src/sys/modules/sequencer/Makefile cvs rdiff -u -r1.1 -r0 src/sys/modules/sequencer/sequencer.ioconf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/bsd/ipf/dist
Module Name:src
Committed By: gutteridge
Date: Fri Jun 3 21:43:37 UTC 2022
Modified Files:
src/external/bsd/ipf/dist/man: ipf.8
src/external/bsd/ipf/dist/tools: ipf.c
Log Message:
ipf(8): document all -l options
References to "none", "state", and "nat" were missing in places.
Addresses PR bin/36763 from Wolfgang Stukenbrock.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ipf/dist/man/ipf.8
cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/tools/ipf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ipf/dist/man/ipf.8
diff -u src/external/bsd/ipf/dist/man/ipf.8:1.1.1.1 src/external/bsd/ipf/dist/man/ipf.8:1.2
--- src/external/bsd/ipf/dist/man/ipf.8:1.1.1.1 Fri Mar 23 21:20:11 2012
+++ src/external/bsd/ipf/dist/man/ipf.8 Fri Jun 3 21:43:37 2022
@@ -1,4 +1,4 @@
-.\" $NetBSD: ipf.8,v 1.1.1.1 2012/03/23 21:20:11 christos Exp $
+.\" $NetBSD: ipf.8,v 1.2 2022/06/03 21:43:37 gutteridge Exp $
.\"
.TH IPF 8
.SH NAME
@@ -94,9 +94,10 @@ lists.
.B \-I
Set the list to make changes to the inactive list.
.TP
-.B \-l \0
+.B \-l \0
Use of the \fB-l\fP flag toggles default logging of packets. Valid
-arguments to this option are \fBpass\fP, \fBblock\fP and \fBnomatch\fP.
+arguments to this option are \fBpass\fP, \fBblock\fP, \fBnomatch\fP,
+\fBnone\fP, \fBstate\fP, and \fBnat\fP.
When an option is set, any packet which exits filtering and matches the
set category is logged. This is most useful for causing all packets
which don't match any of the loaded rules to be logged.
Index: src/external/bsd/ipf/dist/tools/ipf.c
diff -u src/external/bsd/ipf/dist/tools/ipf.c:1.3 src/external/bsd/ipf/dist/tools/ipf.c:1.4
--- src/external/bsd/ipf/dist/tools/ipf.c:1.3 Sun Feb 4 08:19:42 2018
+++ src/external/bsd/ipf/dist/tools/ipf.c Fri Jun 3 21:43:37 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ipf.c,v 1.3 2018/02/04 08:19:42 mrg Exp $ */
+/* $NetBSD: ipf.c,v 1.4 2022/06/03 21:43:37 gutteridge Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -66,7 +66,7 @@ static ioctlfunc_t iocfunctions[IPL_LOGS
static void usage()
{
fprintf(stderr, "usage: ipf [-6AdDEInoPrRsvVyzZ] %s %s %s\n",
- "[-l block|pass|nomatch|state|nat]", "[-cc] [-F i|o|a|s|S|u]",
+ "[-l block|pass|nomatch|none|state|nat]", "[-cc] [-F i|o|a|s|S|u]",
"[-f filename] [-T ]");
exit(1);
}
CVS commit: src/external/bsd/ipf/dist
Module Name:src Committed By: gutteridge Date: Fri Jun 3 21:43:37 UTC 2022 Modified Files: src/external/bsd/ipf/dist/man: ipf.8 src/external/bsd/ipf/dist/tools: ipf.c Log Message: ipf(8): document all -l options References to "none", "state", and "nat" were missing in places. Addresses PR bin/36763 from Wolfgang Stukenbrock. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/ipf/dist/man/ipf.8 cvs rdiff -u -r1.3 -r1.4 src/external/bsd/ipf/dist/tools/ipf.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/aarch64/aarch64
Module Name:src Committed By: ryo Date: Fri Jun 3 19:59:59 UTC 2022 Modified Files: src/sys/arch/aarch64/aarch64: cpuswitch.S Log Message: optimize. reduce 2 instructions. To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/aarch64/aarch64/cpuswitch.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src
Committed By: ryo
Date: Fri Jun 3 19:59:59 UTC 2022
Modified Files:
src/sys/arch/aarch64/aarch64: cpuswitch.S
Log Message:
optimize. reduce 2 instructions.
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/aarch64/aarch64/cpuswitch.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/aarch64/aarch64/cpuswitch.S
diff -u src/sys/arch/aarch64/aarch64/cpuswitch.S:1.35 src/sys/arch/aarch64/aarch64/cpuswitch.S:1.36
--- src/sys/arch/aarch64/aarch64/cpuswitch.S:1.35 Tue May 31 07:40:25 2022
+++ src/sys/arch/aarch64/aarch64/cpuswitch.S Fri Jun 3 19:59:59 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.35 2022/05/31 07:40:25 ryo Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.36 2022/06/03 19:59:59 ryo Exp $ */
/*-
* Copyright (c) 2014, 2020 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include "opt_ddb.h"
#include "opt_kasan.h"
-RCSID("$NetBSD: cpuswitch.S,v 1.35 2022/05/31 07:40:25 ryo Exp $")
+RCSID("$NetBSD: cpuswitch.S,v 1.36 2022/06/03 19:59:59 ryo Exp $")
ARMV8_DEFINE_OPTIONS
@@ -156,9 +156,8 @@ ENTRY_NP(cpu_switchto_softint)
stp x19, x20, [sp, #-16]! /* save */
sub sp, sp, #TF_SIZE /* make switchframe */
adr x2, softint_cleanup /* return address for cpu_switchto() */
- mov x20, lr /* x20 := original lr */
mrs x19, daif /* x19 := original interrupt mask */
- stp x19, x20, [sp, #TF_X19]
+ stp x19, lr, [sp, #TF_X19] /* x20 := original lr */
stp x21, x22, [sp, #TF_X21]
stp x23, x24, [sp, #TF_X23]
stp x25, x26, [sp, #TF_X25]
@@ -241,9 +240,8 @@ ENTRY_NP(cpu_switchto_softint)
1:
#endif
- ldp x19, x20, [sp, #TF_X19]
+ ldp x19, lr, [sp, #TF_X19] /* restore pinned_lwp lr */
msr daif, x19 /* restore interrupt mask */
- mov lr, x20 /* restore pinned_lwp lr */
add sp, sp, #TF_SIZE /* unwind switchframe */
ldp x19, x20, [sp], #16 /* restore */
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: andvar Date: Fri Jun 3 17:04:54 UTC 2022 Modified Files: src/sys/arch/alpha/include: cfbreg.h Log Message: remove reference to gatekeeper.dec.com ftp. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/include/cfbreg.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/alpha/include/cfbreg.h diff -u src/sys/arch/alpha/include/cfbreg.h:1.3 src/sys/arch/alpha/include/cfbreg.h:1.4 --- src/sys/arch/alpha/include/cfbreg.h:1.3 Thu Jun 22 16:46:52 2017 +++ src/sys/arch/alpha/include/cfbreg.h Fri Jun 3 17:04:54 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: cfbreg.h,v 1.3 2017/06/22 16:46:52 flxd Exp $ */ +/* $NetBSD: cfbreg.h,v 1.4 2022/06/03 17:04:54 andvar Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -30,7 +30,7 @@ /* * Color Frame Buffer definitions, from: * ``PMAG-BA TURBOchannel Color Frame Buffer Functional Specification - * (Revision 1.2)'', availalable via anonymous FTP from gatekeeper.dec.com. + * (Revision 1.2)''. * * All definitions are in "dense" TURBOchannel space. */
CVS commit: src/sys/arch/alpha/include
Module Name:src Committed By: andvar Date: Fri Jun 3 17:04:54 UTC 2022 Modified Files: src/sys/arch/alpha/include: cfbreg.h Log Message: remove reference to gatekeeper.dec.com ftp. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/alpha/include/cfbreg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/alpha
Module Name:src Committed By: andvar Date: Fri Jun 3 15:36:36 UTC 2022 Modified Files: src/distrib/notes/alpha: hardware Log Message: some srm firmware (including legacy platforms) still available at hp ftp. not sure if HPE selling firmware CDs, but it is definitely not Compaq anymore. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/notes/alpha/hardware 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/alpha/hardware diff -u src/distrib/notes/alpha/hardware:1.19 src/distrib/notes/alpha/hardware:1.20 --- src/distrib/notes/alpha/hardware:1.19 Thu Jun 22 16:46:52 2017 +++ src/distrib/notes/alpha/hardware Fri Jun 3 15:36:36 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.19 2017/06/22 16:46:52 flxd Exp $ +.\" $NetBSD: hardware,v 1.20 2022/06/03 15:36:36 andvar Exp $ . .Nx*M \*V runs on most of the @@ -23,8 +23,8 @@ only one type of console loaded at any o If your system comes up with the ARC firmware, it may be possible to switch it to SRM with a menu or to download SRM from -.Lk ftp://gatekeeper.dec.com/pub/Digital/Alpha/firmware/index.html -You may want to buy a firmware update CD from Compaq Computer Corporation. +.Lk ftp://ftp.hp.com/pub/alphaserver/firmware +You may want to buy a firmware update CD from Hewlett Packard Enterprise. .Pp More information on supported platforms and devices can be found on the \*M port web pages at
CVS commit: src/distrib/notes/alpha
Module Name:src Committed By: andvar Date: Fri Jun 3 15:36:36 UTC 2022 Modified Files: src/distrib/notes/alpha: hardware Log Message: some srm firmware (including legacy platforms) still available at hp ftp. not sure if HPE selling firmware CDs, but it is definitely not Compaq anymore. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/distrib/notes/alpha/hardware Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: andvar Date: Fri Jun 3 14:02:48 UTC 2022 Modified Files: src/distrib/notes/common: postinstall Log Message: fix link to pkgsrc.tar.gz file in postinstall section. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/distrib/notes/common/postinstall 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/common/postinstall diff -u src/distrib/notes/common/postinstall:1.89 src/distrib/notes/common/postinstall:1.90 --- src/distrib/notes/common/postinstall:1.89 Thu May 27 15:47:42 2021 +++ src/distrib/notes/common/postinstall Fri Jun 3 14:02:48 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: postinstall,v 1.89 2021/05/27 15:47:42 martin Exp $ +.\" $NetBSD: postinstall,v 1.90 2022/06/03 14:02:48 andvar Exp $ .\" .\" Copyright (c) 1999-2020 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -371,7 +371,7 @@ framework for compiling packages and did .Xr sysinst 8 post-installation configuration menu, you can obtain it by retrieving the file -.Lk https://cdn.NetBSD.org/pub/pkgsrc/pkgsrc.tar.gz . +.Lk https://cdn.NetBSD.org/pub/pkgsrc/stable/pkgsrc.tar.gz . It is typically extracted into .Pa /usr/pkgsrc (though other locations work fine) with the commands:
CVS commit: src/distrib/notes/common
Module Name:src Committed By: andvar Date: Fri Jun 3 14:02:48 UTC 2022 Modified Files: src/distrib/notes/common: postinstall Log Message: fix link to pkgsrc.tar.gz file in postinstall section. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/distrib/notes/common/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes
Module Name:src Committed By: andvar Date: Fri Jun 3 13:50:32 UTC 2022 Modified Files: src/distrib/notes/mvme68k: install src/distrib/notes/sun3: install Log Message: fix the title of the boot tape creation section. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/notes/mvme68k/install cvs rdiff -u -r1.16 -r1.17 src/distrib/notes/sun3/install Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes
Module Name:src Committed By: andvar Date: Fri Jun 3 13:50:32 UTC 2022 Modified Files: src/distrib/notes/mvme68k: install src/distrib/notes/sun3: install Log Message: fix the title of the boot tape creation section. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/distrib/notes/mvme68k/install cvs rdiff -u -r1.16 -r1.17 src/distrib/notes/sun3/install 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/mvme68k/install diff -u src/distrib/notes/mvme68k/install:1.23 src/distrib/notes/mvme68k/install:1.24 --- src/distrib/notes/mvme68k/install:1.23 Mon May 30 06:19:53 2011 +++ src/distrib/notes/mvme68k/install Fri Jun 3 13:50:32 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: install,v 1.23 2011/05/30 06:19:53 wiz Exp $ +.\" $NetBSD: install,v 1.24 2022/06/03 13:50:32 andvar Exp $ .\" .\" Copyright (c) 1999-2002 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -53,7 +53,7 @@ Create the .Nx*M \*V boot tape as described in the section entitled -.Sx "Preparing a boot tape" . +.Sx "Creating boot/install tapes" . Then, with the tape in the drive, type the following at the Bug prompt: .Pp .Dl 147-Bug\*[Gt] Ic "bo 5" @@ -89,7 +89,7 @@ Loading: Operating System Volume: NBSD IPL loaded at: $003F -\*[Gt]\*[Gt] BSD MVME147 tapeboot [$Revision: 1.23 $] +\*[Gt]\*[Gt] BSD MVME147 tapeboot [$Revision: 1.24 $] 578616+422344+55540+[46032+51284]=0x11a6e4 Start @ 0x8000 ... Copyright (c) 1996, 1997, 1998, 1999, 2000 @@ -435,7 +435,7 @@ For all board types, the boot messages a .Pp .(disp Start @ 0x8000 ... -\*[Gt]\*[Gt] BSD MVME147 netboot (via sboot) [$Revision: 1.23 $] +\*[Gt]\*[Gt] BSD MVME147 netboot (via sboot) [$Revision: 1.24 $] device: le0 attached to 08:00:3e:20:cb:87 boot: client IP address: 192.168.1.4 boot: client name: soapy Index: src/distrib/notes/sun3/install diff -u src/distrib/notes/sun3/install:1.16 src/distrib/notes/sun3/install:1.17 --- src/distrib/notes/sun3/install:1.16 Sat Sep 6 22:31:53 2008 +++ src/distrib/notes/sun3/install Fri Jun 3 13:50:32 2022 @@ -1,4 +1,4 @@ -.\" $NetBSD: install,v 1.16 2008/09/06 22:31:53 tsutsui Exp $ +.\" $NetBSD: install,v 1.17 2022/06/03 13:50:32 andvar Exp $ .\" .\" Copyright (c) 1999-2001 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -54,7 +54,7 @@ Create the .Nx*M \*V boot tape as described in the section entitled -.Sx "Preparing a boot tape" +.Sx "Creating boot/install tapes" and boot the tape. At the PROM monitor prompt, use one of the commands: .Pp
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Jun 3 12:33:11 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1746 To generate a diff of this commit: cvs rdiff -u -r1.1.2.132 -r1.1.2.133 src/doc/CHANGES-8.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Fri Jun 3 12:33:11 UTC 2022 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1746 To generate a diff of this commit: cvs rdiff -u -r1.1.2.132 -r1.1.2.133 src/doc/CHANGES-8.3 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-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.132 src/doc/CHANGES-8.3:1.1.2.133 --- src/doc/CHANGES-8.3:1.1.2.132 Tue May 31 14:08:47 2022 +++ src/doc/CHANGES-8.3 Fri Jun 3 12:33:11 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.132 2022/05/31 14:08:47 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.133 2022/06/03 12:33:11 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -2643,3 +2643,34 @@ sys/dev/pci/ixgbe/ixv.c1.181 allocation failed. [msaitoh, ticket #1745] +sys/dev/pci/ixgbe/ix_txrx.c 1.95 +sys/dev/pci/ixgbe/ixgbe.c 1.261,1.263,1.265-1.268,1.273, + 1.275-1.277,1.305,1.312, + 1.316-1.321 via patch +sys/dev/pci/ixgbe/ixgbe.h 1.85 via patch +sys/dev/pci/ixgbe/ixgbe_mbx.c 1.19 +sys/dev/pci/ixgbe/ixgbe_netbsd.h 1.15-1.16 +sys/dev/pci/ixgbe/ixgbe_type.h 1.46-1.47 +sys/dev/pci/ixgbe/ixgbe_x550.c 1.26 +sys/dev/pci/ixgbe/ixv.c 1.178,1.182 via patch + + - Reduce code duplication between ixgbe_msix_admin() and + ixgbe_legacy_irq(). + - Add missing code which was not in ixgbe_msix_admin() from + ixgbe_legacy_irq() and vice versa. + - Reorder code. + - Disable/enable the OTHER interrupts correctly. + - Don't return in the middle of ixgbe_msix_admin() when an flow + director reinit failed. NetBSD currently doesn't support flow + director, so this is not a real bug. + - Print ECC, PHY and temp error log using with ratecheck(). + - Correctly re-enable queue interrupt in ixgbe_legacy_irq(). + - Correctly enter the recovery mode. + - No functional change: + - Add some debug printf()s. + - Don't use "more" flag for simplify. + - Use macro. + - Fix typos in comment. + - KNF. + [msaitoh, ticket #1746] +
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Fri Jun 3 12:31:10 UTC 2022
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-8]: ix_txrx.c ixgbe.c ixgbe.h ixgbe_mbx.c
ixgbe_netbsd.h ixgbe_type.h ixgbe_x550.c ixv.c
Log Message:
Pull up the following revisions, requestes by msaitoh in ticket #1746:
sys/dev/pci/ixgbe/ix_txrx.c 1.95
sys/dev/pci/ixgbe/ixgbe.c 1.261,1.263,
1.265-1.268,1.273,
1.275-1.277,1.305,
1.312,
1.316-1.321 via patch
sys/dev/pci/ixgbe/ixgbe.h 1.85 via patch
sys/dev/pci/ixgbe/ixgbe_mbx.c 1.19
sys/dev/pci/ixgbe/ixgbe_netbsd.h1.15-1.16
sys/dev/pci/ixgbe/ixgbe_type.h 1.46-1.47
sys/dev/pci/ixgbe/ixgbe_x550.c 1.26
sys/dev/pci/ixgbe/ixv.c 1.178,1.182 via patch
- Reduce code duplication between ixgbe_msix_admin() and
ixgbe_legacy_irq().
- Add missing code which was not in ixgbe_msix_admin() from
ixgbe_legacy_irq() and vice versa.
- Reorder code.
- Disable/enable the OTHER interrupts correctly.
- Don't return in the middle of ixgbe_msix_admin() when an flow
director reinit failed. NetBSD currently doesn't support flow
director, so this is not a real bug.
- Print ECC, PHY and temp error log using with ratecheck().
- Correctly re-enable queue interrupt in ixgbe_legacy_irq().
- Correctly enter the recovery mode.
- No functional change:
- Add some debug printf()s.
- Don't use "more" flag for simplify.
- Use macro.
- Fix typos in comment.
- KNF.
To generate a diff of this commit:
cvs rdiff -u -r1.24.2.25 -r1.24.2.26 src/sys/dev/pci/ixgbe/ix_txrx.c
cvs rdiff -u -r1.88.2.51 -r1.88.2.52 src/sys/dev/pci/ixgbe/ixgbe.c
cvs rdiff -u -r1.24.6.25 -r1.24.6.26 src/sys/dev/pci/ixgbe/ixgbe.h
cvs rdiff -u -r1.6.8.6 -r1.6.8.7 src/sys/dev/pci/ixgbe/ixgbe_mbx.c
cvs rdiff -u -r1.7.6.4 -r1.7.6.5 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h
cvs rdiff -u -r1.22.2.16 -r1.22.2.17 src/sys/dev/pci/ixgbe/ixgbe_type.h
cvs rdiff -u -r1.5.6.11 -r1.5.6.12 src/sys/dev/pci/ixgbe/ixgbe_x550.c
cvs rdiff -u -r1.56.2.38 -r1.56.2.39 src/sys/dev/pci/ixgbe/ixv.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/ixgbe/ix_txrx.c
diff -u src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.25 src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.26
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.24.2.25 Tue May 31 14:07:51 2022
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Fri Jun 3 12:31:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.24.2.25 2022/05/31 14:07:51 martin Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.24.2.26 2022/06/03 12:31:09 martin Exp $ */
/**
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.24.2.25 2022/05/31 14:07:51 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ix_txrx.c,v 1.24.2.26 2022/06/03 12:31:09 martin Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -247,7 +247,7 @@ ixgbe_mq_start(struct ifnet *ifp, struct
if (__predict_false(!pcq_put(txr->txr_interq, m))) {
m_freem(m);
- txr->pcq_drops.ev_count++;
+ IXGBE_EVC_ADD(&txr->pcq_drops, 1);
return ENOBUFS;
}
if (IXGBE_TX_TRYLOCK(txr)) {
@@ -475,7 +475,7 @@ retry:
/* Make certain there are enough descriptors */
if (txr->tx_avail < (map->dm_nsegs + 2)) {
txr->txr_no_space = true;
- txr->no_desc_avail.ev_count++;
+ IXGBE_EVC_ADD(&txr->no_desc_avail, 1);
ixgbe_dmamap_unload(txr->txtag, txbuf->map);
return EAGAIN;
}
@@ -546,7 +546,7 @@ retry:
* Advance the Transmit Descriptor Tail (Tdt), this tells the
* hardware that this frame is available to transmit.
*/
- ++txr->total_packets.ev_count;
+ IXGBE_EVC_ADD(&txr->total_packets, 1);
IXGBE_WRITE_REG(&adapter->hw, txr->tail, i);
/*
@@ -583,7 +583,7 @@ ixgbe_drain(struct ifnet *ifp, struct tx
while ((m = pcq_get(txr->txr_interq)) != NULL) {
m_freem(m);
- txr->pcq_drops.ev_count++;
+ IXGBE_EVC_ADD(&txr->pcq_drops, 1);
}
}
@@ -846,7 +846,7 @@ ixgbe_tx_ctx_setup(struct tx_ring *txr,
int rv = ixgbe_tso_setup(txr, mp, cmd_type_len, olinfo_status);
if (rv != 0)
- ++adapter->tso_err.ev_count;
+ IXGBE_EVC_ADD(&adapter->tso_err, 1);
return rv;
}
@@ -1088,7 +1088,7 @@ ixgbe_tso_setup(struct tx_ring *txr, str
*cmd_type_len |= IXGBE_ADVTXD_DCMD_TSE;
*olinfo_status |= IXGBE_TXD_POPTS_TXSM << 8;
*olinfo_status |= paylen << IXGBE_ADVTXD_PAYLEN_SHIFT;
- ++txr->tso_tx.ev_count;
+ IXGBE_EVC_ADD(&txr->tso_tx, 1);
return (0);
} /* ixgbe_tso_setup */
@@ -1360,7 +1360,7 @@ ixgbe_refresh_mbufs(struct rx_ring *rx
CVS commit: [netbsd-8] src/sys/dev/pci/ixgbe
Module Name:src Committed By: martin Date: Fri Jun 3 12:31:10 UTC 2022 Modified Files: src/sys/dev/pci/ixgbe [netbsd-8]: ix_txrx.c ixgbe.c ixgbe.h ixgbe_mbx.c ixgbe_netbsd.h ixgbe_type.h ixgbe_x550.c ixv.c Log Message: Pull up the following revisions, requestes by msaitoh in ticket #1746: sys/dev/pci/ixgbe/ix_txrx.c 1.95 sys/dev/pci/ixgbe/ixgbe.c 1.261,1.263, 1.265-1.268,1.273, 1.275-1.277,1.305, 1.312, 1.316-1.321 via patch sys/dev/pci/ixgbe/ixgbe.h 1.85 via patch sys/dev/pci/ixgbe/ixgbe_mbx.c 1.19 sys/dev/pci/ixgbe/ixgbe_netbsd.h1.15-1.16 sys/dev/pci/ixgbe/ixgbe_type.h 1.46-1.47 sys/dev/pci/ixgbe/ixgbe_x550.c 1.26 sys/dev/pci/ixgbe/ixv.c 1.178,1.182 via patch - Reduce code duplication between ixgbe_msix_admin() and ixgbe_legacy_irq(). - Add missing code which was not in ixgbe_msix_admin() from ixgbe_legacy_irq() and vice versa. - Reorder code. - Disable/enable the OTHER interrupts correctly. - Don't return in the middle of ixgbe_msix_admin() when an flow director reinit failed. NetBSD currently doesn't support flow director, so this is not a real bug. - Print ECC, PHY and temp error log using with ratecheck(). - Correctly re-enable queue interrupt in ixgbe_legacy_irq(). - Correctly enter the recovery mode. - No functional change: - Add some debug printf()s. - Don't use "more" flag for simplify. - Use macro. - Fix typos in comment. - KNF. To generate a diff of this commit: cvs rdiff -u -r1.24.2.25 -r1.24.2.26 src/sys/dev/pci/ixgbe/ix_txrx.c cvs rdiff -u -r1.88.2.51 -r1.88.2.52 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.24.6.25 -r1.24.6.26 src/sys/dev/pci/ixgbe/ixgbe.h cvs rdiff -u -r1.6.8.6 -r1.6.8.7 src/sys/dev/pci/ixgbe/ixgbe_mbx.c cvs rdiff -u -r1.7.6.4 -r1.7.6.5 src/sys/dev/pci/ixgbe/ixgbe_netbsd.h cvs rdiff -u -r1.22.2.16 -r1.22.2.17 src/sys/dev/pci/ixgbe/ixgbe_type.h cvs rdiff -u -r1.5.6.11 -r1.5.6.12 src/sys/dev/pci/ixgbe/ixgbe_x550.c cvs rdiff -u -r1.56.2.38 -r1.56.2.39 src/sys/dev/pci/ixgbe/ixv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Jun 3 12:26:17 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Ticket 1461 To generate a diff of this commit: cvs rdiff -u -r1.1.2.100 -r1.1.2.101 src/doc/CHANGES-9.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Fri Jun 3 12:26:17 UTC 2022 Modified Files: src/doc [netbsd-9]: CHANGES-9.3 Log Message: Ticket 1461 To generate a diff of this commit: cvs rdiff -u -r1.1.2.100 -r1.1.2.101 src/doc/CHANGES-9.3 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-9.3 diff -u src/doc/CHANGES-9.3:1.1.2.100 src/doc/CHANGES-9.3:1.1.2.101 --- src/doc/CHANGES-9.3:1.1.2.100 Fri Jun 3 04:01:38 2022 +++ src/doc/CHANGES-9.3 Fri Jun 3 12:26:17 2022 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.3,v 1.1.2.100 2022/06/03 04:01:38 snj Exp $ +# $NetBSD: CHANGES-9.3,v 1.1.2.101 2022/06/03 12:26:17 martin Exp $ A complete list of changes from the NetBSD 9.2 release to the NetBSD 9.3 release: @@ -1737,3 +1737,16 @@ sys/dev/pci/ixgbe/ixgbe.c patch ixgbe.c rev. 1.273. [msaitoh, ticket #1460] +usr.sbin/makemandb/apropos-utils.c 1.46,1.47,1.49 +usr.sbin/makemandb/apropos.1 1.19-1.23 +usr.sbin/makemandb/apropos.c 1.25,1.26 + + apropos(1) fixes: + - PR 54343: prevent crashes when man pages are missing certain + mandatory fields. + - Make pager use functional. + - Handle some error cases properly. + - Document the PAGER environment variable. + - Other minor description and formatting adjustments to the man page. + [gutteridge, ticket #1461] +
CVS commit: [netbsd-9] src/usr.sbin/makemandb
Module Name:src
Committed By: martin
Date: Fri Jun 3 12:25:14 UTC 2022
Modified Files:
src/usr.sbin/makemandb [netbsd-9]: apropos-utils.c apropos.1 apropos.c
Log Message:
Pull up following revision(s) (requested by gutteridge in ticket #1461):
usr.sbin/makemandb/apropos.1: revision 1.19
usr.sbin/makemandb/apropos.c: revision 1.25
usr.sbin/makemandb/apropos.c: revision 1.26
usr.sbin/makemandb/apropos.1: revision 1.20
usr.sbin/makemandb/apropos.1: revision 1.21
usr.sbin/makemandb/apropos.1: revision 1.22
usr.sbin/makemandb/apropos.1: revision 1.23
usr.sbin/makemandb/apropos-utils.c: revision 1.46
usr.sbin/makemandb/apropos-utils.c: revision 1.47
usr.sbin/makemandb/apropos-utils.c: revision 1.49
PR/54343: Prevent NULL pointers in callback strings; use "*?*" for now to
identify them.
PR bin/54343: We want the callback_args.machine to be NULL if it is not
present in the DB.
The previous commit fixed the problem of allowing apropos to not crash and
produce output even if the database is missing values for certain mandatory
fields, such as name, section etc. Normally we don't expect those values
to be missing in the database but in case of parsing errors it can happen.
However, the machine architecture is an optional field since not all man pages
are hardware specific so that should be allowed to be set to NULL if not
present in the database.
apropos.c: fix pager functionality
Issue reported by Rocky Hotas on NetBSD-Users, patch input from RVP on
same, adjustments by me.
apropos.1: document the PAGER environment variable
apropos(1): use proper -width
apropos(1): use proper -width for the list of options too
apropos(1): Tweak the description of -1, ... -9, and -s
-s is not for compatibility only, because section names can be
anything. E.g. we have 3lua and 9lua in base. We have rudiments of
3f (for FORTRAN libs). Some packages in pkgsrc also use suffixed 1
and 3 sections.
apropos(1): Use the official spelling for "SQLite".
While here, use .Bx to refer to 3BSD.
apropos(1): improve error handling in edge cases
Patch from RVP on NetBSD-Users, with an additional comment tweak by me.
Summary from RVP:
1. Ignore SIGPIPE so that we're not killed in the middle of some
DB operation by a botched $PAGER:
$ env PAGER=3D/non-existent apropos -p ...
2. Return proper exit status in case of write errors:
$ apropos ... >/dev/full || echo fail
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.45.2.1 src/usr.sbin/makemandb/apropos-utils.c
cvs rdiff -u -r1.18 -r1.18.18.1 src/usr.sbin/makemandb/apropos.1
cvs rdiff -u -r1.24 -r1.24.6.1 src/usr.sbin/makemandb/apropos.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.sbin/makemandb/apropos-utils.c
diff -u src/usr.sbin/makemandb/apropos-utils.c:1.45 src/usr.sbin/makemandb/apropos-utils.c:1.45.2.1
--- src/usr.sbin/makemandb/apropos-utils.c:1.45 Fri Jun 7 16:43:58 2019
+++ src/usr.sbin/makemandb/apropos-utils.c Fri Jun 3 12:25:14 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: apropos-utils.c,v 1.45 2019/06/07 16:43:58 leot Exp $ */
+/* $NetBSD: apropos-utils.c,v 1.45.2.1 2022/06/03 12:25:14 martin Exp $ */
/*-
* Copyright (c) 2011 Abhinav Upadhyay
* All rights reserved.
@@ -31,7 +31,7 @@
*/
#include
-__RCSID("$NetBSD: apropos-utils.c,v 1.45 2019/06/07 16:43:58 leot Exp $");
+__RCSID("$NetBSD: apropos-utils.c,v 1.45.2.1 2022/06/03 12:25:14 martin Exp $");
#include
#include
@@ -654,11 +654,18 @@ RETURN:
return query;
}
+static const char *
+get_stmt_col_text(sqlite3_stmt *stmt, int col)
+{
+ const char *t = (const char *) sqlite3_column_text(stmt, col);
+ return t == NULL ? "*?*" : t;
+}
+
/*
* Execute the full text search query and return the number of results
* obtained.
*/
-static unsigned int
+static int
execute_search_query(sqlite3 *db, char *query, query_args *args)
{
sqlite3_stmt *stmt;
@@ -692,16 +699,17 @@ execute_search_query(sqlite3 *db, char *
return -1;
}
- unsigned int nresults = 0;
- while (sqlite3_step(stmt) == SQLITE_ROW) {
+ int nresults = rc = 0;
+ while (rc == 0 && sqlite3_step(stmt) == SQLITE_ROW) {
nresults++;
- callback_args.section = (const char *) sqlite3_column_text(stmt, 0);
- name_temp = (const char *) sqlite3_column_text(stmt, 1);
- callback_args.name_desc = (const char *) sqlite3_column_text(stmt, 2);
+ callback_args.section = get_stmt_col_text(stmt, 0);
+ name_temp = get_stmt_col_text(stmt, 1);
+ callback_args.name_desc = get_stmt_col_text(stmt, 2);
callback_args.machine = (const char *) sqlite3_column_text(stmt, 3);
if (!args->legacy) {
- callback_args.snippet = (const char *) sqlite3_column_text(stmt, 4);
- callback_args.snippet_length = strlen(callback_args.snippet);
+ callback_args.snippet = get_stmt_col_text(stmt, 4);
+ callback_args.snippet_length =
+ strlen(callbac
CVS commit: [netbsd-9] src/usr.sbin/makemandb
Module Name:src Committed By: martin Date: Fri Jun 3 12:25:14 UTC 2022 Modified Files: src/usr.sbin/makemandb [netbsd-9]: apropos-utils.c apropos.1 apropos.c Log Message: Pull up following revision(s) (requested by gutteridge in ticket #1461): usr.sbin/makemandb/apropos.1: revision 1.19 usr.sbin/makemandb/apropos.c: revision 1.25 usr.sbin/makemandb/apropos.c: revision 1.26 usr.sbin/makemandb/apropos.1: revision 1.20 usr.sbin/makemandb/apropos.1: revision 1.21 usr.sbin/makemandb/apropos.1: revision 1.22 usr.sbin/makemandb/apropos.1: revision 1.23 usr.sbin/makemandb/apropos-utils.c: revision 1.46 usr.sbin/makemandb/apropos-utils.c: revision 1.47 usr.sbin/makemandb/apropos-utils.c: revision 1.49 PR/54343: Prevent NULL pointers in callback strings; use "*?*" for now to identify them. PR bin/54343: We want the callback_args.machine to be NULL if it is not present in the DB. The previous commit fixed the problem of allowing apropos to not crash and produce output even if the database is missing values for certain mandatory fields, such as name, section etc. Normally we don't expect those values to be missing in the database but in case of parsing errors it can happen. However, the machine architecture is an optional field since not all man pages are hardware specific so that should be allowed to be set to NULL if not present in the database. apropos.c: fix pager functionality Issue reported by Rocky Hotas on NetBSD-Users, patch input from RVP on same, adjustments by me. apropos.1: document the PAGER environment variable apropos(1): use proper -width apropos(1): use proper -width for the list of options too apropos(1): Tweak the description of -1, ... -9, and -s -s is not for compatibility only, because section names can be anything. E.g. we have 3lua and 9lua in base. We have rudiments of 3f (for FORTRAN libs). Some packages in pkgsrc also use suffixed 1 and 3 sections. apropos(1): Use the official spelling for "SQLite". While here, use .Bx to refer to 3BSD. apropos(1): improve error handling in edge cases Patch from RVP on NetBSD-Users, with an additional comment tweak by me. Summary from RVP: 1. Ignore SIGPIPE so that we're not killed in the middle of some DB operation by a botched $PAGER: $ env PAGER=3D/non-existent apropos -p ... 2. Return proper exit status in case of write errors: $ apropos ... >/dev/full || echo fail To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.45.2.1 src/usr.sbin/makemandb/apropos-utils.c cvs rdiff -u -r1.18 -r1.18.18.1 src/usr.sbin/makemandb/apropos.1 cvs rdiff -u -r1.24 -r1.24.6.1 src/usr.sbin/makemandb/apropos.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: andvar
Date: Fri Jun 3 12:10:51 UTC 2022
Modified Files:
src/sys/arch/bebox/stand/boot: siop.c
src/sys/arch/mips/cavium/dev: octeon_gmx.c
src/sys/arch/prep/stand/boot: siop.c
src/sys/dev/ic: siop_common.c
src/sys/dev/nand: onfi.h
Log Message:
fix folloing->following typos in more files.
also s/begginning/beginning/.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/bebox/stand/boot/siop.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mips/cavium/dev/octeon_gmx.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/prep/stand/boot/siop.c
cvs rdiff -u -r1.57 -r1.58 src/sys/dev/ic/siop_common.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/nand/onfi.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/bebox/stand/boot/siop.c
diff -u src/sys/arch/bebox/stand/boot/siop.c:1.10 src/sys/arch/bebox/stand/boot/siop.c:1.11
--- src/sys/arch/bebox/stand/boot/siop.c:1.10 Mon May 23 19:21:30 2022
+++ src/sys/arch/bebox/stand/boot/siop.c Fri Jun 3 12:10:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: siop.c,v 1.10 2022/05/23 19:21:30 andvar Exp $ */
+/* $NetBSD: siop.c,v 1.11 2022/06/03 12:10:50 andvar Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -183,7 +183,7 @@ siop_sdp(struct siop_adapter *adp, struc
return;
/*
* Save data pointer. We do this by adjusting the tables to point
- * at the begginning of the data not yet transferred.
+ * at the beginning of the data not yet transferred.
* offset points to the first table with untransferred data.
*/
@@ -238,7 +238,7 @@ siop_update_resid(struct siop_adapter *a
#if 0
/*
* if CMDFL_RESID is set, the last table (pointed by offset) is a
- * partial transfers. If not, offset points to the entry folloing
+ * partial transfers. If not, offset points to the entry following
* the last full transfer.
*/
if (siop_cmd->flags & CMDFL_RESID) {
Index: src/sys/arch/mips/cavium/dev/octeon_gmx.c
diff -u src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.21 src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.22
--- src/sys/arch/mips/cavium/dev/octeon_gmx.c:1.21 Wed May 4 07:32:50 2022
+++ src/sys/arch/mips/cavium/dev/octeon_gmx.c Fri Jun 3 12:10:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: octeon_gmx.c,v 1.21 2022/05/04 07:32:50 andvar Exp $ */
+/* $NetBSD: octeon_gmx.c,v 1.22 2022/06/03 12:10:50 andvar Exp $ */
/*
* Copyright (c) 2007 Internet Initiative Japan, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.21 2022/05/04 07:32:50 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: octeon_gmx.c,v 1.22 2022/06/03 12:10:50 andvar Exp $");
#include
#include
@@ -337,7 +337,7 @@ octgmx_init(struct octgmx_softc *sc)
sc->sc_port_types[2] = GMX_RGMII_PORT;
} else {
/* port 1: GMII/MII, port 2: disabled */
- /* GMII or MII port is slected by GMX_PRT1_CFG[SPEED] */
+ /* GMII or MII port is selected by GMX_PRT1_CFG[SPEED] */
sc->sc_nports = 2;
sc->sc_port_types[1] = GMX_GMII_PORT;
}
@@ -1160,7 +1160,7 @@ octgmx_stats(struct octgmx_port_softc *s
/*
* GMX0_RX0_STATS_PKTS is not count.
- * input packet is counted when recepted packet in if_cnmac.
+ * input packet is counted when received packet in if_cnmac.
*/
/*
* GMX0_RX0_STATS_PKTS_BAD count is included
Index: src/sys/arch/prep/stand/boot/siop.c
diff -u src/sys/arch/prep/stand/boot/siop.c:1.5 src/sys/arch/prep/stand/boot/siop.c:1.6
--- src/sys/arch/prep/stand/boot/siop.c:1.5 Sat Aug 21 23:00:31 2021
+++ src/sys/arch/prep/stand/boot/siop.c Fri Jun 3 12:10:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: siop.c,v 1.5 2021/08/21 23:00:31 andvar Exp $ */
+/* $NetBSD: siop.c,v 1.6 2022/06/03 12:10:50 andvar Exp $ */
/*
* Copyright (c) 2010 KIYOHARA Takashi
* All rights reserved.
@@ -215,7 +215,7 @@ siop_update_resid(struct siop_adapter *a
#if 0
/*
* if CMDFL_RESID is set, the last table (pointed by offset) is a
- * partial transfers. If not, offset points to the entry folloing
+ * partial transfers. If not, offset points to the entry following
* the last full transfer.
*/
if (siop_cmd->flags & CMDFL_RESID) {
Index: src/sys/dev/ic/siop_common.c
diff -u src/sys/dev/ic/siop_common.c:1.57 src/sys/dev/ic/siop_common.c:1.58
--- src/sys/dev/ic/siop_common.c:1.57 Mon May 23 19:21:30 2022
+++ src/sys/dev/ic/siop_common.c Fri Jun 3 12:10:51 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: siop_common.c,v 1.57 2022/05/23 19:21:30 andvar Exp $ */
+/* $NetBSD: siop_common.c,v 1.58 2022/06/03 12:10:51 andvar Exp $ */
/*
* Copyright (c) 2000, 2002 Manuel Bouyer.
@@ -28,7 +28,7 @@
/* SYM53c7/8xx PCI-SCSI I/O Processors driver */
#include
-__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.57 2022/05/23 19:21:30 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siop_common.c,v 1.58 2022/06/03 12:10:51 andvar Exp $");
#include
#include
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Fri Jun 3 12:10:51 UTC 2022 Modified Files: src/sys/arch/bebox/stand/boot: siop.c src/sys/arch/mips/cavium/dev: octeon_gmx.c src/sys/arch/prep/stand/boot: siop.c src/sys/dev/ic: siop_common.c src/sys/dev/nand: onfi.h Log Message: fix folloing->following typos in more files. also s/begginning/beginning/. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/bebox/stand/boot/siop.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/mips/cavium/dev/octeon_gmx.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/prep/stand/boot/siop.c cvs rdiff -u -r1.57 -r1.58 src/sys/dev/ic/siop_common.c cvs rdiff -u -r1.3 -r1.4 src/sys/dev/nand/onfi.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/xen/xen
Module Name:src
Committed By: bouyer
Date: Fri Jun 3 10:42:17 UTC 2022
Modified Files:
src/sys/arch/xen/xen: xengnt.c
Log Message:
Restore (again) support for grant tables v1: pvshim doesn't support
v2 (it doesn't even support GNTTABOP_set_version) some setups will
likely require pvshim in the future.
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/xen/xen/xengnt.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/xen/xen/xengnt.c
diff -u src/sys/arch/xen/xen/xengnt.c:1.38 src/sys/arch/xen/xen/xengnt.c:1.39
--- src/sys/arch/xen/xen/xengnt.c:1.38 Wed May 13 16:13:14 2020
+++ src/sys/arch/xen/xen/xengnt.c Fri Jun 3 10:42:17 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: xengnt.c,v 1.38 2020/05/13 16:13:14 jdolecek Exp $ */
+/* $NetBSD: xengnt.c,v 1.39 2022/06/03 10:42:17 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xengnt.c,v 1.38 2020/05/13 16:13:14 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xengnt.c,v 1.39 2022/06/03 10:42:17 bouyer Exp $");
#include
#include
@@ -54,6 +54,10 @@ __KERNEL_RCSID(0, "$NetBSD: xengnt.c,v 1
/* External tools reserve first few grant table entries. */
#define NR_RESERVED_ENTRIES 8
+/* current supported version */
+int gnt_v = 0;
+#define GNT_ISV1 (gnt_v == 1)
+#define GNT_ISV2 (gnt_v == 2)
/* Current number of frames making up the grant table */
int gnt_nr_grant_frames;
/* Maximum number of frames that can make up the grant table */
@@ -67,11 +71,19 @@ int last_gnt_entry;
#define XENGNT_NO_ENTRY 0x
/* VM address of the grant table */
-#define NR_GRANT_ENTRIES_PER_PAGE (PAGE_SIZE / sizeof(grant_entry_v2_t))
+#define NR_GRANT_ENTRIES_PER_PAGE_V1 (PAGE_SIZE / sizeof(grant_entry_v1_t))
+#define NR_GRANT_ENTRIES_PER_PAGE_V2 (PAGE_SIZE / sizeof(grant_entry_v2_t))
+#define NR_GRANT_ENTRIES_PER_PAGE \
+((gnt_v == 1) ? NR_GRANT_ENTRIES_PER_PAGE_V1 : NR_GRANT_ENTRIES_PER_PAGE_V2)
#define NR_GRANT_STATUS_PER_PAGE (PAGE_SIZE / sizeof(grant_status_t))
-grant_entry_v2_t *grant_table;
-/* Number of grant status frames */
+union {
+ grant_entry_v1_t *gntt_v1;
+ grant_entry_v2_t *gntt_v2;
+ void *gntt;
+} grant_table;
+
+/* Number of grant status frames (v2 only)*/
int gnt_status_frames;
grant_status_t *grant_status;
@@ -81,6 +93,7 @@ static grant_ref_t xengnt_get_entry(void
static void xengnt_free_entry(grant_ref_t);
static int xengnt_more_entries(void);
static int xengnt_map_status(void);
+static bool xengnt_finish_init(void);
void
xengnt_init(void)
@@ -90,6 +103,16 @@ xengnt_init(void)
int nr_grant_entries;
int i;
+ /* first try to see which version we support */
+ struct gnttab_set_version gntversion;
+ gnt_v = gntversion.version = 2;
+ rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gntversion, 1);
+ if (rc < 0 || gntversion.version != 2) {
+ aprint_debug("GNTTABOP_set_version 2 failed (%d), "
+ "fall back to version 1\n", rc);
+ gnt_v = 1;
+ }
+
query.dom = DOMID_SELF;
rc = HYPERVISOR_grant_table_op(GNTTABOP_query_size, &query, 1);
if ((rc < 0) || (query.status != GNTST_okay))
@@ -105,9 +128,9 @@ xengnt_init(void)
nr_grant_entries =
gnt_max_grant_frames * NR_GRANT_ENTRIES_PER_PAGE;
- grant_table = (void *)uvm_km_alloc(kernel_map,
+ grant_table.gntt = (void *)uvm_km_alloc(kernel_map,
gnt_max_grant_frames * PAGE_SIZE, 0, UVM_KMF_VAONLY);
- if (grant_table == NULL)
+ if (grant_table.gntt == NULL)
panic("xengnt_init() table no VM space");
gnt_entries = kmem_alloc((nr_grant_entries + 1) * sizeof(grant_ref_t),
@@ -115,16 +138,18 @@ xengnt_init(void)
for (i = 0; i <= nr_grant_entries; i++)
gnt_entries[i] = XENGNT_NO_ENTRY;
- gnt_status_frames =
- round_page(nr_grant_entries * sizeof(grant_status_t)) / PAGE_SIZE;
- grant_status = (void *)uvm_km_alloc(kernel_map,
- gnt_status_frames * PAGE_SIZE, 0, UVM_KMF_VAONLY);
- if (grant_status == NULL)
- panic("xengnt_init() status no VM space");
+ if (GNT_ISV2) {
+ gnt_status_frames =
+ round_page(nr_grant_entries * sizeof(grant_status_t)) / PAGE_SIZE;
+ grant_status = (void *)uvm_km_alloc(kernel_map,
+ gnt_status_frames * PAGE_SIZE, 0, UVM_KMF_VAONLY);
+ if (grant_status == NULL)
+ panic("xengnt_init() status no VM space");
+ }
mutex_init(&grant_lock, MUTEX_DEFAULT, IPL_VM);
- xengnt_resume();
+ xengnt_finish_init();
}
/*
@@ -134,13 +159,29 @@ bool
xengnt_resume(void)
{
int rc;
- int previous_nr_grant_frames = gnt_nr_grant_frames;
struct gnttab_set_version gntversion;
- gntversion.version = 2;
+ KASSERT(gnt_v == 1 || gnt_v == 2);
+ gntversion.version = gnt_v;
rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gntversion, 1);
- if (rc < 0 || gntversion.version != 2)
- panic("GNTTABOP_set_version 2 failed %d", rc);
+
+ if (GNT_ISV2) {
+ if (rc < 0 || gntversion.version !=
CVS commit: src/sys/arch/xen/xen
Module Name:src Committed By: bouyer Date: Fri Jun 3 10:42:17 UTC 2022 Modified Files: src/sys/arch/xen/xen: xengnt.c Log Message: Restore (again) support for grant tables v1: pvshim doesn't support v2 (it doesn't even support GNTTABOP_set_version) some setups will likely require pvshim in the future. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/xen/xen/xengnt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
