CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Fri May 17 02:59:09 UTC 2024
Modified Files:
src/lib/libedit: el.h eln.c
Log Message:
When calling el_line make sure that we call the resizing function
callback because el_line updates the legacy LineInfo structure and
we need to notify that the cached copy of the the buffer has changed.
Of course the resizing function can call el_line itself to update
the buffer, so prevent recursion. Bug found by Peter Rufer at Arista.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/lib/libedit/el.h
cvs rdiff -u -r1.37 -r1.38 src/lib/libedit/eln.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/el.h
diff -u src/lib/libedit/el.h:1.46 src/lib/libedit/el.h:1.47
--- src/lib/libedit/el.h:1.46 Sun Aug 15 06:08:41 2021
+++ src/lib/libedit/el.h Thu May 16 22:59:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: el.h,v 1.46 2021/08/15 10:08:41 christos Exp $ */
+/* $NetBSD: el.h,v 1.47 2024/05/17 02:59:08 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -58,6 +58,7 @@
#define NARROW_HISTORY 0x040
#define NO_RESET 0x080
#define FIXIO 0x100
+#define FROM_ELLINE 0x200
typedef unsigned char el_action_t; /* Index to command array */
Index: src/lib/libedit/eln.c
diff -u src/lib/libedit/eln.c:1.37 src/lib/libedit/eln.c:1.38
--- src/lib/libedit/eln.c:1.37 Tue Jan 11 13:30:15 2022
+++ src/lib/libedit/eln.c Thu May 16 22:59:08 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: eln.c,v 1.37 2022/01/11 18:30:15 christos Exp $ */
+/* $NetBSD: eln.c,v 1.38 2024/05/17 02:59:08 christos Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include "config.h"
#if !defined(lint) && !defined(SCCSID)
-__RCSID("$NetBSD: eln.c,v 1.37 2022/01/11 18:30:15 christos Exp $");
+__RCSID("$NetBSD: eln.c,v 1.38 2024/05/17 02:59:08 christos Exp $");
#endif /* not lint && not SCCSID */
#include
@@ -365,6 +365,10 @@ el_line(EditLine *el)
size_t offset;
const wchar_t *p;
+ if (el->el_flags & FROM_ELLINE)
+ return info;
+
+ el->el_flags |= FROM_ELLINE;
info->buffer = ct_encode_string(winfo->buffer, >el_lgcyconv);
offset = 0;
@@ -377,6 +381,10 @@ el_line(EditLine *el)
offset += ct_enc_width(*p);
info->lastchar = info->buffer + offset;
+ if (el->el_chared.c_resizefun)
+ (*el->el_chared.c_resizefun)(el, el->el_chared.c_resizearg);
+ el->el_flags &= ~FROM_ELLINE;
+
return info;
}
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Fri May 17 02:59:09 UTC 2024 Modified Files: src/lib/libedit: el.h eln.c Log Message: When calling el_line make sure that we call the resizing function callback because el_line updates the legacy LineInfo structure and we need to notify that the cached copy of the the buffer has changed. Of course the resizing function can call el_line itself to update the buffer, so prevent recursion. Bug found by Peter Rufer at Arista. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/lib/libedit/el.h cvs rdiff -u -r1.37 -r1.38 src/lib/libedit/eln.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libm/arch/riscv
Module Name:src
Committed By: riastradh
Date: Fri May 17 02:11:07 UTC 2024
Modified Files:
src/lib/libm/arch/riscv: fenv.c
Log Message:
riscv: Make feraiseexcept actually raise the given exceptions.
Doing
fexcept_t ex = 0;
fesetexceptflag(, excepts);
has the effect of _clearing_ all the exceptions in excepts. Using
fesetexceptflag doesn't make this easier, because we would have to
record which exceptions were already raised. So just set the fflags
bits in the fcsr register directly.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/lib/libm/arch/riscv/fenv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libm/arch/riscv/fenv.c
diff -u src/lib/libm/arch/riscv/fenv.c:1.4 src/lib/libm/arch/riscv/fenv.c:1.5
--- src/lib/libm/arch/riscv/fenv.c:1.4 Sun May 7 12:41:47 2023
+++ src/lib/libm/arch/riscv/fenv.c Fri May 17 02:11:07 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fenv.c,v 1.4 2023/05/07 12:41:47 skrll Exp $ */
+/* $NetBSD: fenv.c,v 1.5 2024/05/17 02:11:07 riastradh Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: fenv.c,v 1.4 2023/05/07 12:41:47 skrll Exp $");
+__RCSID("$NetBSD: fenv.c,v 1.5 2024/05/17 02:11:07 riastradh Exp $");
#include "namespace.h"
@@ -114,19 +114,15 @@ fegetexceptflag(fexcept_t *flagp, int ex
* The standard explicitly allows us to execute an instruction that has the
* exception as a side effect, but we choose to manipulate the status register
* directly.
- *
- * The validation of input is being deferred to fesetexceptflag().
*/
int
feraiseexcept(int excepts)
{
- fexcept_t ex = 0;
_DIAGASSERT((excepts & ~FE_ALL_EXCEPT) == 0);
excepts &= FE_ALL_EXCEPT;
- fesetexceptflag(, excepts);
- /* XXX exception magic XXX */
+ fcsr_fflags_write(fcsr_fflags_read() | excepts);
/* Success */
return 0;
CVS commit: src/lib/libm/arch/riscv
Module Name:src Committed By: riastradh Date: Fri May 17 02:11:07 UTC 2024 Modified Files: src/lib/libm/arch/riscv: fenv.c Log Message: riscv: Make feraiseexcept actually raise the given exceptions. Doing fexcept_t ex = 0; fesetexceptflag(, excepts); has the effect of _clearing_ all the exceptions in excepts. Using fesetexceptflag doesn't make this easier, because we would have to record which exceptions were already raised. So just set the fflags bits in the fcsr register directly. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/lib/libm/arch/riscv/fenv.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/x86/x86
Module Name:src
Committed By: manu
Date: Fri May 17 00:37:14 UTC 2024
Modified Files:
src/sys/arch/x86/x86: fpu.c
Log Message:
iWorkaround panic: fpudna from userland
i386 Xen PV domU get spurious fpudna traps from userland. Older eager FPU
contact switching code took care of ignoring them. When transitioning
from eager switching to awlays switching, this special handling was
removed, causing "fpudna from userland" panics.
This change restores the previosu behavior where fpudna traps from
userland are ignored on Xen PV domU.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/x86/x86/fpu.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/x86/x86/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.87 src/sys/arch/x86/x86/fpu.c:1.88
--- src/sys/arch/x86/x86/fpu.c:1.87 Tue Jul 18 12:34:25 2023
+++ src/sys/arch/x86/x86/fpu.c Fri May 17 00:37:14 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.87 2023/07/18 12:34:25 riastradh Exp $ */
+/* $NetBSD: fpu.c,v 1.88 2024/05/17 00:37:14 manu Exp $ */
/*
* Copyright (c) 2008, 2019 The NetBSD Foundation, Inc. All
@@ -96,7 +96,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.87 2023/07/18 12:34:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.88 2024/05/17 00:37:14 manu Exp $");
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
@@ -617,6 +617,15 @@ fputrap(struct trapframe *frame)
void
fpudna(struct trapframe *frame)
{
+#ifdef XENPV
+ /*
+ * Xen produes spurious fpudna traps, just do nothing.
+ */
+ if (USERMODE(frame->tf_cs)) {
+ clts();
+ return;
+ }
+#endif
panic("fpudna from %s, ip %p, trapframe %p",
USERMODE(frame->tf_cs) ? "userland" : "kernel",
(void *)X86_TF_RIP(frame), frame);
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: manu Date: Fri May 17 00:37:14 UTC 2024 Modified Files: src/sys/arch/x86/x86: fpu.c Log Message: iWorkaround panic: fpudna from userland i386 Xen PV domU get spurious fpudna traps from userland. Older eager FPU contact switching code took care of ignoring them. When transitioning from eager switching to awlays switching, this special handling was removed, causing "fpudna from userland" panics. This change restores the previosu behavior where fpudna traps from userland are ignored on Xen PV domU. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/arch/x86/x86/fpu.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/common
Module Name:src
Committed By: christos
Date: Thu May 16 17:55:48 UTC 2024
Modified Files:
src/distrib/common: Makefile.bootcd
Log Message:
Add more extra stuff on the cds
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/distrib/common/Makefile.bootcd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.54 src/distrib/common/Makefile.bootcd:1.55
--- src/distrib/common/Makefile.bootcd:1.54 Tue May 14 13:17:13 2024
+++ src/distrib/common/Makefile.bootcd Thu May 16 13:55:48 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.54 2024/05/14 17:17:13 christos Exp $
+# $NetBSD: Makefile.bootcd,v 1.55 2024/05/16 17:55:48 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -324,8 +324,12 @@ image:
.endif
if [ ! -s ${WORKSPEC} ]; then \
${MAKESPEC} -d cdrom . > ${WORKSPEC}; \
- elif [ -d cdrom/${MACHINE} ]; then \
- ${MAKESPEC} -d cdrom ${MACHINE} >> ${WORKSPEC}; \
+ else \
+ for i in ${RELEASEMACHINEDIR} source ${CDEXTRA} ${CDBUILDEXTRA}; do\
+ if [ -n "$$i" ] && [ -e cdrom/$$i ]; then \
+ ${MAKESPEC} -d cdrom $$i >> ${WORKSPEC}; \
+ fi; \
+ done; \
fi
${TOOL_MAKEFS} -N ${NETBSDSRCDIR}/etc -t cd9660 -F ${WORKSPEC} -xx \
${MAKEFS_TIMESTAMP} ${CDMAKEFSEXTRAOPTS} -o ${_CDMAKEFSOPTIONS:Q} \
CVS commit: src/distrib/common
Module Name:src Committed By: christos Date: Thu May 16 17:55:48 UTC 2024 Modified Files: src/distrib/common: Makefile.bootcd Log Message: Add more extra stuff on the cds To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/distrib/common/Makefile.bootcd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/share/man/man4
On Thu, May 16, 2024 at 05:48:05PM +0300, Valery Ushakov wrote: > On Thu, May 16, 2024 at 11:54:20 +, Nia Alarie wrote: > > > Modified Files: > > src/share/man/man4: eap.4 > > > > Log Message: > > Note that EAP_USE_BOTH_DACS is deprecated in the eap(4) manual page. > > Please, can you restore the part that explains what this option > is/does? It might be on its way out, but since we document it's > there, it's a good idea to actually document it, IMHO. > > I don't know much about audio, but the kernel mixer is software, isn't > it. I would imagine the type of systems that might have this device > may actually benefit from the hardware acceleration that this option > seems to imply. > > I.e. if anything, I'd rather this option is documented even better > than it was. Let me know if the new version of the text leaves any doubts.
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Thu May 16 17:00:32 UTC 2024 Modified Files: src/share/man/man4: eap.4 Log Message: add additional details about how EAP_USE_BOTH_DACS works and is used requested by uwe To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man4/eap.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/eap.4 diff -u src/share/man/man4/eap.4:1.19 src/share/man/man4/eap.4:1.20 --- src/share/man/man4/eap.4:1.19 Thu May 16 14:41:03 2024 +++ src/share/man/man4/eap.4 Thu May 16 17:00:31 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: eap.4,v 1.19 2024/05/16 14:41:03 uwe Exp $ +.\" $NetBSD: eap.4,v 1.20 2024/05/16 17:00:31 nia Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -52,7 +52,10 @@ By specifying: .D1 Cd options EAP_USE_BOTH_DACS .Pp a second audio device is attached. -You can use it simply by directing audio output to it. +This can be used for audio output simultaneously with the primary DAC. +You can use it simply by directing audio output to the additional +.Pa /dev/audioX +device associated with it. .Sh SEE ALSO .Xr ac97 4 , .Xr audio 4 , @@ -79,3 +82,13 @@ The .Dv EAP_USE_BOTH_DACS option is rather redundant after the introduction of the in-kernel audio mixer, and may be removed in a future release. +It is possible that it could be used to accelerate mixing streams by +taking advantage of the hardware's features, but currently the +additional (small) overhead of the kernel mixer is impossible to bypass, +since +.Nx +no longer allows userspace software to write directly to audio hardware. +The +.Nm +hardware only features one clock, so generally the second audio device +must be configured in the same way as the first.
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Thu May 16 17:00:32 UTC 2024 Modified Files: src/share/man/man4: eap.4 Log Message: add additional details about how EAP_USE_BOTH_DACS works and is used requested by uwe To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/share/man/man4/eap.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/common
Module Name:src
Committed By: christos
Date: Thu May 16 15:46:42 UTC 2024
Modified Files:
src/distrib/common: Makefile.image
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
Apply the -xx treatment to the rest of the ffs makefs invocations.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/distrib/common/Makefile.image
cvs rdiff -u -r1.35 -r1.36 src/distrib/common/bootimage/Makefile.bootimage
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/common/Makefile.image
diff -u src/distrib/common/Makefile.image:1.41 src/distrib/common/Makefile.image:1.42
--- src/distrib/common/Makefile.image:1.41 Tue Mar 19 20:31:54 2024
+++ src/distrib/common/Makefile.image Thu May 16 11:46:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.image,v 1.41 2024/03/20 00:31:54 christos Exp $
+# $NetBSD: Makefile.image,v 1.42 2024/05/16 15:46:42 christos Exp $
#
# Makefile snippet to build a tree from the provided lists,
# and make an ffs file system image from that tree
@@ -99,7 +99,7 @@ ${IMAGE}: ${WORKBUILT}
${_MKSHMSG_CREATE} ${.CURDIR:T}/${.TARGET}; \
rm -f ${.TARGET} ${.TARGET}.tmp; \
${TOOL_MAKEFS} -t ffs -B ${IMAGEENDIAN} -s ${IMAGESIZE} -F ${WORKSPEC} \
- ${MAKEFS_TIMESTAMP} -N ${NETBSDSRCDIR}/etc ${IMGMAKEFSOPTIONS} \
+ -xx ${MAKEFS_TIMESTAMP} -N ${NETBSDSRCDIR}/etc ${IMGMAKEFSOPTIONS} \
-o optimization=space,minfree=0 \
${MAKEFS_FLAGS} ${.TARGET}.tmp ${WORKDIR} \
&& mv -f ${.TARGET}.tmp ${.TARGET}; \
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.35 src/distrib/common/bootimage/Makefile.bootimage:1.36
--- src/distrib/common/bootimage/Makefile.bootimage:1.35 Mon Apr 22 10:41:24 2024
+++ src/distrib/common/bootimage/Makefile.bootimage Thu May 16 11:46:42 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.35 2024/04/22 14:41:24 nia Exp $
+# $NetBSD: Makefile.bootimage,v 1.36 2024/05/16 15:46:42 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -171,6 +171,8 @@ DD?= dd
MKDIR?= mkdir -p
RM?= rm
+MAKESPEC= ${HOST_SH} ${NETBSDSRCDIR}/etc/makespec
+
#
# common definitions for image
#
@@ -351,6 +353,7 @@ ${WORKFSTAB}:
# create root file system for the image
#
${TARGETFS}: prepare_md_post ${WORKFSTAB}
+ @${RM} -f ${WORKSPEC}
@if [ ! -d ${RELEASEDIR}/${RELEASEMACHINEDIR} ]; then \
echo "Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting"; \
false; \
@@ -413,11 +416,11 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB
@if [ -f ${_SRC} ]; then \
echo ${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
+ echo "./${_TARGET} type=file uname=root gname=wheel mode=0555" >> ${WORKSPEC}; \
fi
.endfor
.endif
@echo Preparing spec files for makefs...
- ${RM} -f ${WORKSPEC}
cat ${WORKDIR}/etc/mtree/* | \
${TOOL_SED} -e 's/ size=[0-9]*//' > ${WORKSPEC}
${HOST_SH} ${WORKDIR}/dev/MAKEDEV -s all ipty | \
@@ -430,12 +433,19 @@ ${TARGETFS}: prepare_md_post ${WORKFSTAB
.if defined(SPEC_EXTRA)
cat ${SPEC_EXTRA} >> ${WORKSPEC}
.endif
+ if [ -f ${WORKDIR}/netbsd.gdb ]; then \
+ echo "./netbsd.gdb type=file uname=root gname=wheel mode=0444" \
+ >> ${WORKSPEC}; \
+ fi
+ if [ -d ${WORKDIR}/${MACHINE} ]; then \
+ ${MAKESPEC} -d ${WORKDIR} ${MACHINE} >> ${WORKSPEC}; \
+ fi
@echo Creating rootfs...
# XXX /var/spool/ftp/hidden is unreadable
${CHMOD} +r ${WORKDIR}/var/spool/ftp/hidden
${TOOL_MAKEFS} -M ${FSSIZE} -m ${FSSIZE} \
-B ${TARGET_ENDIANNESS} \
- -F ${WORKSPEC} -N ${WORKDIR}/etc\
+ -xx -F ${WORKSPEC} -N ${WORKDIR}/etc \
${MAKEFS_TIMESTAMP} \
${IMGMAKEFSOPTIONS} \
${WORKFS} ${WORKDIR}
CVS commit: src/distrib/common
Module Name:src Committed By: christos Date: Thu May 16 15:46:42 UTC 2024 Modified Files: src/distrib/common: Makefile.image src/distrib/common/bootimage: Makefile.bootimage Log Message: Apply the -xx treatment to the rest of the ffs makefs invocations. To generate a diff of this commit: cvs rdiff -u -r1.41 -r1.42 src/distrib/common/Makefile.image cvs rdiff -u -r1.35 -r1.36 src/distrib/common/bootimage/Makefile.bootimage Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/share/man/man4
On Thu, May 16, 2024 at 11:54:20 +, Nia Alarie wrote: > Modified Files: > src/share/man/man4: eap.4 > > Log Message: > Note that EAP_USE_BOTH_DACS is deprecated in the eap(4) manual page. Please, can you restore the part that explains what this option is/does? It might be on its way out, but since we document it's there, it's a good idea to actually document it, IMHO. I don't know much about audio, but the kernel mixer is software, isn't it. I would imagine the type of systems that might have this device may actually benefit from the hardware acceleration that this option seems to imply. I.e. if anything, I'd rather this option is documented even better than it was. -uwe
CVS commit: src/share/man/man4
Module Name:src Committed By: uwe Date: Thu May 16 14:41:03 UTC 2024 Modified Files: src/share/man/man4: eap.4 Log Message: eap(4): touch up markup a bit To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man4/eap.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/eap.4 diff -u src/share/man/man4/eap.4:1.18 src/share/man/man4/eap.4:1.19 --- src/share/man/man4/eap.4:1.18 Thu May 16 11:54:19 2024 +++ src/share/man/man4/eap.4 Thu May 16 14:41:03 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: eap.4,v 1.18 2024/05/16 11:54:19 nia Exp $ +.\" $NetBSD: eap.4,v 1.19 2024/05/16 14:41:03 uwe Exp $ .\" .\" Copyright (c) 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -34,11 +34,12 @@ .Nm eap .Nd AudioPCI audio device driver .Sh SYNOPSIS -.Cd "eap* at pci? dev ? function ?" -.Cd "audio* at audiobus?" -.Cd "joy* at eap?" -.Cd "midi* at eap?" +.Cd "eap*at pci? dev ? function ?" .Cd "options EAP_USE_BOTH_DACS" +.Pp +.Cd "audio* at audiobus?" +.Cd "joy*at eap?" +.Cd "midi* at eap?" .Sh DESCRIPTION The .Nm @@ -47,9 +48,8 @@ SoundBlaster PCI series of audio cards. All models based on the ES1370, ES1371, and ES1373 chips are supported. .Pp By specifying: -.Bd -unfilled -offset indent -options EAP_USE_BOTH_DACS -.Ed +.Pp +.D1 Cd options EAP_USE_BOTH_DACS .Pp a second audio device is attached. You can use it simply by directing audio output to it.
CVS commit: src/share/man/man4
Module Name:src Committed By: uwe Date: Thu May 16 14:41:03 UTC 2024 Modified Files: src/share/man/man4: eap.4 Log Message: eap(4): touch up markup a bit To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/share/man/man4/eap.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/cdrom
Module Name:src
Committed By: tsutsui
Date: Thu May 16 14:21:45 UTC 2024
Modified Files:
src/distrib/cdrom: Makefile
Log Message:
Add -data-change-warn to MKISOFS_ARGS for macppc as done for mac68k:
https://mail-index.netbsd.org/source-changes/2023/05/19/msg144826.html
> Creating Type mappings for .bin (macbinary encoded) files,
> mkisofs changes files, then turns around and complains they have been
> changed.
>
> This is a self-inflicted wound, so demote the error to a warning.
This looks to make macppccd builds with cdrtools-3.02a10.
To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/distrib/cdrom/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/cdrom/Makefile
diff -u src/distrib/cdrom/Makefile:1.53 src/distrib/cdrom/Makefile:1.54
--- src/distrib/cdrom/Makefile:1.53 Fri May 19 14:47:16 2023
+++ src/distrib/cdrom/Makefile Thu May 16 14:21:45 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2023/05/19 14:47:16 hauke Exp $
+# $NetBSD: Makefile,v 1.54 2024/05/16 14:21:45 tsutsui Exp $
#
# Consult "*.conf" for the configuration variables; this Makefile is typically
# not edited for basic configuration changes.
@@ -294,7 +294,7 @@ MKISOFS_ARGS.${image}+= -b ${BOOTFILE.am
.if !empty(ports:Mmacppc)
BOOTHFS= boothfs
MKISOFS_ARGS.${image}+= -hfs -part -hide-hfs-list ${.CURDIR}/hide-hfs.lst \
- --macbin -map ${.CURDIR}/hfsmap.lst \
+ --macbin -data-change-warn -map ${.CURDIR}/hfsmap.lst \
-boot-hfs-file ${.OBJDIR}/${BOOTHFS}
UUDECODE_FILES= ${BOOTHFS}
.include
CVS commit: src/distrib/cdrom
Module Name:src Committed By: tsutsui Date: Thu May 16 14:21:45 UTC 2024 Modified Files: src/distrib/cdrom: Makefile Log Message: Add -data-change-warn to MKISOFS_ARGS for macppc as done for mac68k: https://mail-index.netbsd.org/source-changes/2023/05/19/msg144826.html > Creating Type mappings for .bin (macbinary encoded) files, > mkisofs changes files, then turns around and complains they have been > changed. > > This is a self-inflicted wound, so demote the error to a warning. This looks to make macppccd builds with cdrtools-3.02a10. To generate a diff of this commit: cvs rdiff -u -r1.53 -r1.54 src/distrib/cdrom/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/wscons/keymaps
Module Name:src Committed By: gson Date: Thu May 16 14:11:42 UTC 2024 Modified Files: src/share/wscons/keymaps: pckbd.sv.svascii Log Message: Fix typo in comment To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/wscons/keymaps/pckbd.sv.svascii Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/wscons/keymaps
Module Name:src Committed By: gson Date: Thu May 16 14:11:42 UTC 2024 Modified Files: src/share/wscons/keymaps: pckbd.sv.svascii Log Message: Fix typo in comment To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/share/wscons/keymaps/pckbd.sv.svascii Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/wscons/keymaps/pckbd.sv.svascii diff -u src/share/wscons/keymaps/pckbd.sv.svascii:1.1 src/share/wscons/keymaps/pckbd.sv.svascii:1.2 --- src/share/wscons/keymaps/pckbd.sv.svascii:1.1 Wed May 2 15:08:35 2001 +++ src/share/wscons/keymaps/pckbd.sv.svascii Thu May 16 14:11:42 2024 @@ -1,7 +1,7 @@ -# $NetBSD: pckbd.sv.svascii,v 1.1 2001/05/02 15:08:35 drochner Exp $ +# $NetBSD: pckbd.sv.svascii,v 1.2 2024/05/16 14:11:42 gson Exp $ # # This is an overlay to the swedish keymap which maps -# the natinal characters to their ASCII counterparts. +# the national characters to their ASCII counterparts. # From Michael Eriksson per PR kern/8456. keycode 5 = 4 dollar currency
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Thu May 16 12:32:00 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #688 - #691 To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-10.1 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.1 diff -u src/doc/CHANGES-10.1:1.1.2.10 src/doc/CHANGES-10.1:1.1.2.11 --- src/doc/CHANGES-10.1:1.1.2.10 Sat May 11 14:51:14 2024 +++ src/doc/CHANGES-10.1 Thu May 16 12:32:00 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-10.1,v 1.1.2.10 2024/05/11 14:51:14 martin Exp $ +# $NetBSD: CHANGES-10.1,v 1.1.2.11 2024/05/16 12:32:00 martin Exp $ A complete list of changes from the NetBSD 10.0 release on 2024-03-28 until the 10.1 release: @@ -262,3 +262,30 @@ sys/dev/pci/if_vmx.c1.13 vmx(4): set IFM_FDX flag if the link is up. [msaitoh, ticket #687] +usr.bin/tic/tic.c1.41 + + tic(1): PR 58034: only mark the terminfo entry promoted if + it actually was. + [wiz, ticket #688] + +sys/dev/hil/hil.c1.8 + + hp300: fix "stray level 1 interrupt" panic by pressing keys + during autoconf(9). + [tsutsui, ticket #689] + +distrib/notes/hp300/hardware 1.28 +share/man/man4/man4.hp300/topcat.4 1.8 +sys/arch/hp300/dev/diofb.c 1.8-1.10 +sys/arch/hp300/dev/diofbvar.h 1.5 +sys/arch/hp300/dev/topcat.c 1.7-1.12 +sys/arch/hp300/dev/topcatreg.h 1.5 + + hp300: topcat(4) framebuffer fixes. + [tsutsui, ticket #690] + +sys/arch/i386/conf/LEGACY 1.4 + + Exclude DRM_LEGACY from the ISA kernel. + [nia, ticket #691] +
CVS commit: [netbsd-10] src/doc
Module Name:src Committed By: martin Date: Thu May 16 12:32:00 UTC 2024 Modified Files: src/doc [netbsd-10]: CHANGES-10.1 Log Message: Tickets #688 - #691 To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-10.1 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/i386/conf
Module Name:src Committed By: martin Date: Thu May 16 12:29:12 UTC 2024 Modified Files: src/sys/arch/i386/conf [netbsd-10]: LEGACY Log Message: Pull up following revision(s) (requested by nia in ticket #691): sys/arch/i386/conf/LEGACY: revision 1.4 also exclude DRM_LEGACY from the ISA kernel To generate a diff of this commit: cvs rdiff -u -r1.1.54.1 -r1.1.54.2 src/sys/arch/i386/conf/LEGACY 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/i386/conf
Module Name:src Committed By: martin Date: Thu May 16 12:29:12 UTC 2024 Modified Files: src/sys/arch/i386/conf [netbsd-10]: LEGACY Log Message: Pull up following revision(s) (requested by nia in ticket #691): sys/arch/i386/conf/LEGACY: revision 1.4 also exclude DRM_LEGACY from the ISA kernel To generate a diff of this commit: cvs rdiff -u -r1.1.54.1 -r1.1.54.2 src/sys/arch/i386/conf/LEGACY 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/i386/conf/LEGACY diff -u src/sys/arch/i386/conf/LEGACY:1.1.54.1 src/sys/arch/i386/conf/LEGACY:1.1.54.2 --- src/sys/arch/i386/conf/LEGACY:1.1.54.1 Sat May 11 14:31:56 2024 +++ src/sys/arch/i386/conf/LEGACY Thu May 16 12:29:11 2024 @@ -1,4 +1,4 @@ -# $NetBSD: LEGACY,v 1.1.54.1 2024/05/11 14:31:56 martin Exp $ +# $NetBSD: LEGACY,v 1.1.54.2 2024/05/16 12:29:11 martin Exp $ # LEGACY kernel -- includes vga@isa and pcdisplay@isa for pre-PCI # systems, due to significant pain making them fail to attach when @@ -21,3 +21,5 @@ no radeondrmkmsfb* at radeonfbbus? no nouveau* at pci? no nouveaufb* at nouveaufbbus? + +no options DRM_LEGACY
CVS commit: [netbsd-10] src
Module Name:src Committed By: martin Date: Thu May 16 12:27:50 UTC 2024 Modified Files: src/distrib/notes/hp300 [netbsd-10]: hardware src/share/man/man4/man4.hp300 [netbsd-10]: topcat.4 src/sys/arch/hp300/dev [netbsd-10]: diofb.c diofbvar.h topcat.c topcatreg.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #690): sys/arch/hp300/dev/topcat.c: revision 1.7 sys/arch/hp300/dev/topcat.c: revision 1.8 sys/arch/hp300/dev/topcat.c: revision 1.9 sys/arch/hp300/dev/diofb.c: revision 1.8 sys/arch/hp300/dev/diofb.c: revision 1.9 sys/arch/hp300/dev/diofb.c: revision 1.10 sys/arch/hp300/dev/topcat.c: revision 1.10 sys/arch/hp300/dev/topcat.c: revision 1.11 sys/arch/hp300/dev/topcat.c: revision 1.12 sys/arch/hp300/dev/topcatreg.h: revision 1.5 distrib/notes/hp300/hardware: revision 1.28 sys/arch/hp300/dev/diofbvar.h: revision 1.5 share/man/man4/man4.hp300/topcat.4: revision 1.8 Increase DELAY() for waitbusy macroes as pre-wscons and 4.4BSD did. It looks necessary for sane palette ops at least on HP98543 topcat on 68030 HP 9000/360. Move a check of topcat(4) specific fb width quirks to topcat.c. We need to check fb->planes but it's propbed in topcat.c after common diofb_fbinquire() is called. Also add a comment that it looks these 1 bpp and 4 bpp boards have VRAM with sparse address layout and we have to handle 512 pixels per line with 1024 bytes per line. Fix MD allocattr to return proper attributes what MI rasops(9) expects. Use proper planemask per a vaild number of planes. Check tc_waitbusy() before writing palette registers in topcat_setcolor(). This seems to make palette operations more stable on my HP360 with HP98543. Add DELAY(9) to make palette register settings stable on 98543 in HP360. Note 98547 (6 bpp variant) on HP370 (68030 33MHz) doesn't need these DELAYs so maybe only some old variants (98543 and 98545?) on 020/030 have such restriction (actually only one nop seems enough.) Fix topcat(4) problems on some models that cause garbages on screen. - Make sure that windowmove (hardware BITBLT) ops complete by checking tc_busywait() before calling putchar functions by MI rasops(9). It looks CPU accesses against VRAM during windowmove (copy, erase, and cursor) ops causes unexpected garbages at least on 98543 on HP360, 98547 on HP370, and also on 98543 on 040 HP380 (but not on 98549). - Handle 'sparse VRAM' on 98543 (and probably 98542) properly: - Prepare and use own topcat_putchar1_4() function for sparse VRAM. - Pass proper 'VRAM width' rather than actuall font width to all windowmove (copycols, erasecols, copyrows, eraserows, and do_cursor) operation functions. Now all topcat(4) consoles on 98543 on HP360/HP380 and 98547 on HP370 work fine, and no visible regression on 98549 on HP380 and 98544 on HP360. Note that 98542 and 98543 variants are also supported by topcat(4). Add 98542 and 98543 framebuffers to supported "Graphics Devices" section. I hope someone will sync a list of supported devices in port wiki pages with one in this installation notes. Add comments about quirks of 98542/98543 framebuffers with 1024x400 pixels. To generate a diff of this commit: cvs rdiff -u -r1.26.2.1 -r1.26.2.2 src/distrib/notes/hp300/hardware cvs rdiff -u -r1.7 -r1.7.54.1 src/share/man/man4/man4.hp300/topcat.4 cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/hp300/dev/diofb.c cvs rdiff -u -r1.3 -r1.3.90.1 src/sys/arch/hp300/dev/diofbvar.h cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/hp300/dev/topcat.c cvs rdiff -u -r1.2 -r1.2.90.1 src/sys/arch/hp300/dev/topcatreg.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
Module Name:src Committed By: martin Date: Thu May 16 12:27:50 UTC 2024 Modified Files: src/distrib/notes/hp300 [netbsd-10]: hardware src/share/man/man4/man4.hp300 [netbsd-10]: topcat.4 src/sys/arch/hp300/dev [netbsd-10]: diofb.c diofbvar.h topcat.c topcatreg.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #690): sys/arch/hp300/dev/topcat.c: revision 1.7 sys/arch/hp300/dev/topcat.c: revision 1.8 sys/arch/hp300/dev/topcat.c: revision 1.9 sys/arch/hp300/dev/diofb.c: revision 1.8 sys/arch/hp300/dev/diofb.c: revision 1.9 sys/arch/hp300/dev/diofb.c: revision 1.10 sys/arch/hp300/dev/topcat.c: revision 1.10 sys/arch/hp300/dev/topcat.c: revision 1.11 sys/arch/hp300/dev/topcat.c: revision 1.12 sys/arch/hp300/dev/topcatreg.h: revision 1.5 distrib/notes/hp300/hardware: revision 1.28 sys/arch/hp300/dev/diofbvar.h: revision 1.5 share/man/man4/man4.hp300/topcat.4: revision 1.8 Increase DELAY() for waitbusy macroes as pre-wscons and 4.4BSD did. It looks necessary for sane palette ops at least on HP98543 topcat on 68030 HP 9000/360. Move a check of topcat(4) specific fb width quirks to topcat.c. We need to check fb->planes but it's propbed in topcat.c after common diofb_fbinquire() is called. Also add a comment that it looks these 1 bpp and 4 bpp boards have VRAM with sparse address layout and we have to handle 512 pixels per line with 1024 bytes per line. Fix MD allocattr to return proper attributes what MI rasops(9) expects. Use proper planemask per a vaild number of planes. Check tc_waitbusy() before writing palette registers in topcat_setcolor(). This seems to make palette operations more stable on my HP360 with HP98543. Add DELAY(9) to make palette register settings stable on 98543 in HP360. Note 98547 (6 bpp variant) on HP370 (68030 33MHz) doesn't need these DELAYs so maybe only some old variants (98543 and 98545?) on 020/030 have such restriction (actually only one nop seems enough.) Fix topcat(4) problems on some models that cause garbages on screen. - Make sure that windowmove (hardware BITBLT) ops complete by checking tc_busywait() before calling putchar functions by MI rasops(9). It looks CPU accesses against VRAM during windowmove (copy, erase, and cursor) ops causes unexpected garbages at least on 98543 on HP360, 98547 on HP370, and also on 98543 on 040 HP380 (but not on 98549). - Handle 'sparse VRAM' on 98543 (and probably 98542) properly: - Prepare and use own topcat_putchar1_4() function for sparse VRAM. - Pass proper 'VRAM width' rather than actuall font width to all windowmove (copycols, erasecols, copyrows, eraserows, and do_cursor) operation functions. Now all topcat(4) consoles on 98543 on HP360/HP380 and 98547 on HP370 work fine, and no visible regression on 98549 on HP380 and 98544 on HP360. Note that 98542 and 98543 variants are also supported by topcat(4). Add 98542 and 98543 framebuffers to supported "Graphics Devices" section. I hope someone will sync a list of supported devices in port wiki pages with one in this installation notes. Add comments about quirks of 98542/98543 framebuffers with 1024x400 pixels. To generate a diff of this commit: cvs rdiff -u -r1.26.2.1 -r1.26.2.2 src/distrib/notes/hp300/hardware cvs rdiff -u -r1.7 -r1.7.54.1 src/share/man/man4/man4.hp300/topcat.4 cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/hp300/dev/diofb.c cvs rdiff -u -r1.3 -r1.3.90.1 src/sys/arch/hp300/dev/diofbvar.h cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/hp300/dev/topcat.c cvs rdiff -u -r1.2 -r1.2.90.1 src/sys/arch/hp300/dev/topcatreg.h 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/hp300/hardware diff -u src/distrib/notes/hp300/hardware:1.26.2.1 src/distrib/notes/hp300/hardware:1.26.2.2 --- src/distrib/notes/hp300/hardware:1.26.2.1 Sun Jan 14 16:00:09 2024 +++ src/distrib/notes/hp300/hardware Thu May 16 12:27:50 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: hardware,v 1.26.2.1 2024/01/14 16:00:09 martin Exp $ +.\" $NetBSD: hardware,v 1.26.2.2 2024/05/16 12:27:50 martin Exp $ . .Nx*M \*V will run on most HP 9000/300- and 400-series machines. @@ -155,6 +155,10 @@ Network interfaces .It Graphics Devices .(bullet -compact +98542 monochrome Topcat (512x400, 1 bit, DIO-II) +.It +98543 color Topcat (512x400, 4 bits, DIO-II) +.It 98544 monochrome Topcat (1024x768, 1 bit, DIO-II) .It 98545A color Topcat (1024x768, 4 bits, DIO-II) Index: src/share/man/man4/man4.hp300/topcat.4 diff -u src/share/man/man4/man4.hp300/topcat.4:1.7 src/share/man/man4/man4.hp300/topcat.4:1.7.54.1 --- src/share/man/man4/man4.hp300/topcat.4:1.7 Wed Feb 9 14:37:56 2011 +++ src/share/man/man4/man4.hp300/topcat.4 Thu May 16 12:27:50 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: topcat.4,v 1.7 2011/02/09 14:37:56 wiz Exp $ +.\" $NetBSD:
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Thu May 16 12:24:02 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Ticket #1840 To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/CHANGES-9.5 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.5 diff -u src/doc/CHANGES-9.5:1.1.2.3 src/doc/CHANGES-9.5:1.1.2.4 --- src/doc/CHANGES-9.5:1.1.2.3 Sat May 11 14:48:38 2024 +++ src/doc/CHANGES-9.5 Thu May 16 12:24:02 2024 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.5,v 1.1.2.3 2024/05/11 14:48:38 martin Exp $ +# $NetBSD: CHANGES-9.5,v 1.1.2.4 2024/05/16 12:24:02 martin Exp $ A complete list of changes from the NetBSD 9.4 release to the NetBSD 9.5 release: @@ -36,3 +36,9 @@ sys/arch/mac68k/dev/pm_direct.c 1.31 when using mouse or keyboard. [nat, ticket #1839] +sys/dev/hil/hil.c1.8 + + hp300: fix "stray level 1 interrupt" panic by pressing keys + during autoconf(9). + [tsutsui, ticket #1840] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Thu May 16 12:24:02 UTC 2024 Modified Files: src/doc [netbsd-9]: CHANGES-9.5 Log Message: Ticket #1840 To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/doc/CHANGES-9.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/hil
Module Name:src Committed By: martin Date: Thu May 16 12:23:13 UTC 2024 Modified Files: src/sys/dev/hil [netbsd-9]: hil.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1840): sys/dev/hil/hil.c: revision 1.8 Fix "stray level 1 interrupt" panic by pressing keys during autoconf(9). Also explicitly initialize sc->sc_status = HIL_STATUS_BUSY in hil_attach(). Previously hil_intr(9) returned immediately during 'cold', but all interrupts are enabled at the end of configure() (actually in MD cpu_configure()) and cold is cleared in confiugre2() after configure(), so there is a small window when hil interrupts can be triggered during cold. It looks there is no problem to process hil_intr() before hil_attach_deferre() is called via configure2() because we already check 'sc->sc_status != HIL_STATUS_BUSY' on processing a kthread. Note this seems also to appease the similar panic on mame's hp9k370 emulation (though mame's emulation around DMAC looks still incomplete). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.4.1 src/sys/dev/hil/hil.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/hil/hil.c diff -u src/sys/dev/hil/hil.c:1.3 src/sys/dev/hil/hil.c:1.3.4.1 --- src/sys/dev/hil/hil.c:1.3 Mon Sep 3 16:29:31 2018 +++ src/sys/dev/hil/hil.c Thu May 16 12:23:13 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: hil.c,v 1.3 2018/09/03 16:29:31 riastradh Exp $ */ +/* $NetBSD: hil.c,v 1.3.4.1 2024/05/16 12:23:13 martin Exp $ */ /* $OpenBSD: hil.c,v 1.24 2010/11/20 16:45:46 miod Exp $ */ /* * Copyright (c) 2003, 2004, Miodrag Vallat. @@ -150,6 +150,7 @@ hil_attach(struct hil_softc *sc, int *hi sc->sc_cmdbp = sc->sc_cmdbuf; sc->sc_pollbp = sc->sc_pollbuf; sc->sc_console = hil_is_console; + sc->sc_status = HIL_STATUS_BUSY; } /* @@ -269,9 +270,6 @@ hil_intr(void *v) struct hil_softc *sc = v; uint8_t c, stat; - if (cold) - return 0; - stat = bus_space_read_1(sc->sc_bst, sc->sc_bsh, HILP_STAT); /*
CVS commit: [netbsd-9] src/sys/dev/hil
Module Name:src Committed By: martin Date: Thu May 16 12:23:13 UTC 2024 Modified Files: src/sys/dev/hil [netbsd-9]: hil.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1840): sys/dev/hil/hil.c: revision 1.8 Fix "stray level 1 interrupt" panic by pressing keys during autoconf(9). Also explicitly initialize sc->sc_status = HIL_STATUS_BUSY in hil_attach(). Previously hil_intr(9) returned immediately during 'cold', but all interrupts are enabled at the end of configure() (actually in MD cpu_configure()) and cold is cleared in confiugre2() after configure(), so there is a small window when hil interrupts can be triggered during cold. It looks there is no problem to process hil_intr() before hil_attach_deferre() is called via configure2() because we already check 'sc->sc_status != HIL_STATUS_BUSY' on processing a kthread. Note this seems also to appease the similar panic on mame's hp9k370 emulation (though mame's emulation around DMAC looks still incomplete). To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.3.4.1 src/sys/dev/hil/hil.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/dev/hil
Module Name:src Committed By: martin Date: Thu May 16 12:22:07 UTC 2024 Modified Files: src/sys/dev/hil [netbsd-10]: hil.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #689): sys/dev/hil/hil.c: revision 1.8 Fix "stray level 1 interrupt" panic by pressing keys during autoconf(9). Also explicitly initialize sc->sc_status = HIL_STATUS_BUSY in hil_attach(). Previously hil_intr(9) returned immediately during 'cold', but all interrupts are enabled at the end of configure() (actually in MD cpu_configure()) and cold is cleared in confiugre2() after configure(), so there is a small window when hil interrupts can be triggered during cold. It looks there is no problem to process hil_intr() before hil_attach_deferre() is called via configure2() because we already check 'sc->sc_status != HIL_STATUS_BUSY' on processing a kthread. Note this seems also to appease the similar panic on mame's hp9k370 emulation (though mame's emulation around DMAC looks still incomplete). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/dev/hil/hil.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/hil/hil.c diff -u src/sys/dev/hil/hil.c:1.7 src/sys/dev/hil/hil.c:1.7.4.1 --- src/sys/dev/hil/hil.c:1.7 Sat Jun 25 02:36:27 2022 +++ src/sys/dev/hil/hil.c Thu May 16 12:22:06 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: hil.c,v 1.7 2022/06/25 02:36:27 tsutsui Exp $ */ +/* $NetBSD: hil.c,v 1.7.4.1 2024/05/16 12:22:06 martin Exp $ */ /* $OpenBSD: hil.c,v 1.24 2010/11/20 16:45:46 miod Exp $ */ /* * Copyright (c) 2003, 2004, Miodrag Vallat. @@ -153,6 +153,7 @@ hil_attach(struct hil_softc *sc, int *hi sc->sc_cmdbp = sc->sc_cmdbuf; sc->sc_pollbp = sc->sc_pollbuf; sc->sc_console = hil_is_console; + sc->sc_status = HIL_STATUS_BUSY; } /* @@ -272,9 +273,6 @@ hil_intr(void *v) struct hil_softc *sc = v; uint8_t c, stat; - if (cold) - return 0; - stat = bus_space_read_1(sc->sc_bst, sc->sc_bsh, HILP_STAT); /*
CVS commit: [netbsd-10] src/sys/dev/hil
Module Name:src Committed By: martin Date: Thu May 16 12:22:07 UTC 2024 Modified Files: src/sys/dev/hil [netbsd-10]: hil.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #689): sys/dev/hil/hil.c: revision 1.8 Fix "stray level 1 interrupt" panic by pressing keys during autoconf(9). Also explicitly initialize sc->sc_status = HIL_STATUS_BUSY in hil_attach(). Previously hil_intr(9) returned immediately during 'cold', but all interrupts are enabled at the end of configure() (actually in MD cpu_configure()) and cold is cleared in confiugre2() after configure(), so there is a small window when hil interrupts can be triggered during cold. It looks there is no problem to process hil_intr() before hil_attach_deferre() is called via configure2() because we already check 'sc->sc_status != HIL_STATUS_BUSY' on processing a kthread. Note this seems also to appease the similar panic on mame's hp9k370 emulation (though mame's emulation around DMAC looks still incomplete). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.4.1 src/sys/dev/hil/hil.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/tic
Module Name:src Committed By: martin Date: Thu May 16 12:19:49 UTC 2024 Modified Files: src/usr.bin/tic [netbsd-10]: tic.c Log Message: Pull up following revision(s) (requested by wiz in ticket #688): usr.bin/tic/tic.c: revision 1.41 Only mark the terminfo entry promoted if actually was. To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.40.6.1 src/usr.bin/tic/tic.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/tic
Module Name:src
Committed By: martin
Date: Thu May 16 12:19:49 UTC 2024
Modified Files:
src/usr.bin/tic [netbsd-10]: tic.c
Log Message:
Pull up following revision(s) (requested by wiz in ticket #688):
usr.bin/tic/tic.c: revision 1.41
Only mark the terminfo entry promoted if actually was.
To generate a diff of this commit:
cvs rdiff -u -r1.40 -r1.40.6.1 src/usr.bin/tic/tic.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/tic/tic.c
diff -u src/usr.bin/tic/tic.c:1.40 src/usr.bin/tic/tic.c:1.40.6.1
--- src/usr.bin/tic/tic.c:1.40 Mon Mar 30 00:09:06 2020
+++ src/usr.bin/tic/tic.c Thu May 16 12:19:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: tic.c,v 1.40 2020/03/30 00:09:06 roy Exp $ */
+/* $NetBSD: tic.c,v 1.40.6.1 2024/05/16 12:19:48 martin Exp $ */
/*
* Copyright (c) 2009, 2010, 2020 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#endif
#include
-__RCSID("$NetBSD: tic.c,v 1.40 2020/03/30 00:09:06 roy Exp $");
+__RCSID("$NetBSD: tic.c,v 1.40.6.1 2024/05/16 12:19:48 martin Exp $");
#include
#include
@@ -468,7 +468,7 @@ merge_use(int flags)
if (!promoted && rtic->rtype != TERMINFO_RTYPE) {
if (promote(rtic, utic) == -1)
err(EXIT_FAILURE, "promote");
-promoted = true;
+promoted = rtic->rtype == TERMINFO_RTYPE;
}
merge(rtic, utic, flags);
CVS commit: src/share/misc
Module Name:src Committed By: ast Date: Thu May 16 12:04:22 UTC 2024 Modified Files: src/share/misc: bsd-family-tree Log Message: . Update the ASCII art timeline for the last two years . In particular, add NetBSD 8.3 to timeline . Add respective "publication dates" of those points in time While here, also: . Fix white space idiosyncracies and opt for https instead of http . Track some changes made to the FreeBSD version of this file To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/share/misc/bsd-family-tree Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/bsd-family-tree diff -u src/share/misc/bsd-family-tree:1.84 src/share/misc/bsd-family-tree:1.85 --- src/share/misc/bsd-family-tree:1.84 Sat Mar 30 19:34:46 2024 +++ src/share/misc/bsd-family-tree Thu May 16 12:04:21 2024 @@ -411,62 +411,87 @@ FreeBSD 5.2 | | | | | | || ||DragonFly 5.8 | | | | || ||| | | | | || ||DragonFly 5.6.3 - | | | | || NetBSD || - | | | | ||8.2|DragonFly 5.8.1 - | | | | || OpenBSD 6.7 | - | | FreeBSD| || || - | | 11.4 | || || - | | | || |DragonFly 5.8.2 - | | | || |DragonFly 5.8.3 - | | | | NetBSD 9.1OpenBSD 6.8 | - | FreeBSD | || || - | 12.2 macOS|| || - | | 11 || || - | `--. | || || - || | || || - *--FreeBSD | | || || - | 13.0 | | | NetBSD 9.2OpenBSD 6.9 DragonFly 6.0 - | | | | || || - | | | | || || - | | FreeBSD macOS|| OpenBSD 7.0 DragonFly 6.2.1 - | | 12.312 || || - | | | || || - | | | || OpenBSD 7.1 | - | FreeBSD | || || - | 13.1 | || || - || || |DragonFly 6.2.2 - || | NetBSD 9.3|| + | | | | ||NetBSD || + | | | | || 8.2 || + | | | | || ||DragonFly 5.8.1 + | | | | || |OpenBSD 6.7 | + | | FreeBSD| || ||| + | | 11.4 | || ||| + | | | || ||DragonFly 5.8.2 + | | | || ||DragonFly 5.8.3 + | | | | NetBSD |OpenBSD 6.8 | + | | | | 9.1 ||| + | FreeBSD macOS|| ||| + | 12.211 || ||| + | | | || ||| + | `--. | || ||| + *--FreeBSD | | || ||| + | 13.0 | | | NetBSD |OpenBSD 6.9 DragonFly 6.0.0 + | | | | | 9.2 ||| + | | | | || ||DragonFly 6.0.1 + | | FreeBSD macOS|| |OpenBSD 7.0 | + | | 12.312 || ||| + | | | | || ||DragonFly 6.2.1 + | | | | || |OpenBSD 7.1 | + | FreeBSD | | || ||| + | 13.1 | | || ||| + | | | | || ||DragonFly
CVS commit: src/share/misc
Module Name:src Committed By: ast Date: Thu May 16 12:04:22 UTC 2024 Modified Files: src/share/misc: bsd-family-tree Log Message: . Update the ASCII art timeline for the last two years . In particular, add NetBSD 8.3 to timeline . Add respective "publication dates" of those points in time While here, also: . Fix white space idiosyncracies and opt for https instead of http . Track some changes made to the FreeBSD version of this file To generate a diff of this commit: cvs rdiff -u -r1.84 -r1.85 src/share/misc/bsd-family-tree 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: nia Date: Thu May 16 11:54:20 UTC 2024 Modified Files: src/share/man/man4: eap.4 Log Message: Note that EAP_USE_BOTH_DACS is deprecated in the eap(4) manual page. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/eap.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/eap.4 diff -u src/share/man/man4/eap.4:1.17 src/share/man/man4/eap.4:1.18 --- src/share/man/man4/eap.4:1.17 Wed Apr 30 13:10:53 2008 +++ src/share/man/man4/eap.4 Thu May 16 11:54:19 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: eap.4,v 1.17 2008/04/30 13:10:53 martin Exp $ +.\" $NetBSD: eap.4,v 1.18 2024/05/16 11:54:19 nia Exp $ .\" .\" Copyright (c) 1999 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 July 22, 2006 +.Dd May 16, 2024 .Dt EAP 4 .Os .Sh NAME @@ -53,8 +53,6 @@ options EAP_USE_BOTH_DACS .Pp a second audio device is attached. You can use it simply by directing audio output to it. -This way it is possible for two different programs to use the "same" -audio device simultaneously. .Sh SEE ALSO .Xr ac97 4 , .Xr audio 4 , @@ -76,3 +74,8 @@ This is unlikely to work on PCI busses o There is also a possibility for conflicts with real ISA devices because the PCI bus is probed before ISA. Use with caution. +.Pp +The +.Dv EAP_USE_BOTH_DACS +option is rather redundant after the introduction of the in-kernel audio +mixer, and may be removed in a future release.
CVS commit: src/share/man/man4
Module Name:src Committed By: nia Date: Thu May 16 11:54:20 UTC 2024 Modified Files: src/share/man/man4: eap.4 Log Message: Note that EAP_USE_BOTH_DACS is deprecated in the eap(4) manual page. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/share/man/man4/eap.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
