CVS commit: src/sys/dev/usb
Module Name:src
Committed By: nat
Date: Tue Mar 2 22:21:38 UTC 2021
Modified Files:
src/sys/dev/usb: if_urtwn.c
Log Message:
OppsRemove irrelavent debug code and don't free_m before IFQ_DEQUEUE().
Identified and reported by Patrick Welche and remedy found by Martin Husemann.
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/usb/if_urtwn.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/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.95 src/sys/dev/usb/if_urtwn.c:1.96
--- src/sys/dev/usb/if_urtwn.c:1.95 Fri Feb 26 01:38:44 2021
+++ src/sys/dev/usb/if_urtwn.c Tue Mar 2 22:21:38 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.95 2021/02/26 01:38:44 nat Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.96 2021/03/02 22:21:38 nat Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.95 2021/02/26 01:38:44 nat Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.96 2021/03/02 22:21:38 nat Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1470,10 +1470,6 @@ urtwn_read_rom(struct urtwn_softc *sc)
sc->pa_setting, sc->board_type, sc->regulatory, 0);
IEEE80211_ADDR_COPY(ic->ic_myaddr, rom->macaddr);
-#if 0
- uint8_t new_myaddr[6] = {0x90,0x0a,0x1a,0xe7,0x1e,0xf0}; //Camera
- IEEE80211_ADDR_COPY(ic->ic_myaddr, new_myaddr);
-#endif
sc->sc_rf_write = urtwn_r92c_rf_write;
sc->sc_power_on = urtwn_r92c_power_on;
@@ -2913,7 +2909,6 @@ urtwn_start(struct ifnet *ifp)
data = urtwn_get_tx_data(sc, sc->ac2idx[qid]);
if (data == NULL) {
- m_freem(m);
ifp->if_flags |= IFF_OACTIVE;
DPRINTFN(DBG_TX, "empty tx_free_list", 0, 0, 0, 0);
return;
CVS commit: src/sys/dev/usb
Module Name:src Committed By: nat Date: Tue Mar 2 22:21:38 UTC 2021 Modified Files: src/sys/dev/usb: if_urtwn.c Log Message: OppsRemove irrelavent debug code and don't free_m before IFQ_DEQUEUE(). Identified and reported by Patrick Welche and remedy found by Martin Husemann. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/dev/usb/if_urtwn.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/amd64/conf
Module Name:src Committed By: gdt Date: Tue Mar 2 18:10:31 UTC 2021 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: XEN3_DOM0: Fix pckbc console attachment logic Copy PCKBD_CNATTACH_MAY_FAIL lines from GENERIC to XEN3_DOM0. GENERIC defines PCKBD_CNATTACH_MAY_FAIL, which means that an attempt to activate console input on pckbc will fail if there is no keyboard present. This is a problem on semi-modern machines that have pckbc silicon but not ports, and thus almost always have a USB keyboard also. What I suspect are bugs in console attachment logic lead to attempting to attach a ukbd while there already is a console keyboard, and with DIAGNOSTIC this is (properly) fatal, so XEN3_DOM0 blows up with a USB keyboard in current, and probably not in 9. Live tested on a machine that previously paniced on boot. To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: gdt Date: Tue Mar 2 18:10:31 UTC 2021 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: XEN3_DOM0: Fix pckbc console attachment logic Copy PCKBD_CNATTACH_MAY_FAIL lines from GENERIC to XEN3_DOM0. GENERIC defines PCKBD_CNATTACH_MAY_FAIL, which means that an attempt to activate console input on pckbc will fail if there is no keyboard present. This is a problem on semi-modern machines that have pckbc silicon but not ports, and thus almost always have a USB keyboard also. What I suspect are bugs in console attachment logic lead to attempting to attach a ukbd while there already is a console keyboard, and with DIAGNOSTIC this is (properly) fatal, so XEN3_DOM0 blows up with a USB keyboard in current, and probably not in 9. Live tested on a machine that previously paniced on boot. To generate a diff of this commit: cvs rdiff -u -r1.188 -r1.189 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.188 src/sys/arch/amd64/conf/XEN3_DOM0:1.189 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.188 Tue Mar 2 18:06:12 2021 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Mar 2 18:10:31 2021 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.188 2021/03/02 18:06:12 gdt Exp $ +# $NetBSD: XEN3_DOM0,v 1.189 2021/03/02 18:10:31 gdt Exp $ # XEN3_DOM0 machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.188 $" +#ident "XEN3_DOM0-$Revision: 1.189 $" maxusers 32 # estimated number of users @@ -166,6 +166,8 @@ options WSDISPLAY_COMPAT_PCVT # emulat options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls options WSDISPLAY_COMPAT_USL # wsconscfg VT handling options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes +# don't attach pckbd as the console if no PS/2 keyboard is found +options PCKBD_CNATTACH_MAY_FAIL # see dev/pckbport/wskbdmap_mfii.c for implemented layouts #options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)" # allocate a number of virtual screens at autoconfiguration time
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: gdt Date: Tue Mar 2 18:06:12 UTC 2021 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: XEN3_DOM0: Sync VERBOSE with GENERIC Copy the *VERBOSE option block from GENERIC, and prune the scattered verbose options in XEN3_DOM0, surely dating from a time they were copied from an earlier GENERIC. This amounts to adding PCIVERBOSE and SCSIVERBOSE, and the diff from GENERIC to DOM0 boots is markedly reduced. To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/sys/arch/amd64/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.187 src/sys/arch/amd64/conf/XEN3_DOM0:1.188 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.187 Mon Mar 1 13:52:50 2021 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Mar 2 18:06:12 2021 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.187 2021/03/01 13:52:50 gdt Exp $ +# $NetBSD: XEN3_DOM0,v 1.188 2021/03/02 18:06:12 gdt Exp $ # XEN3_DOM0 machine description file # @@ -22,7 +22,7 @@ options INCLUDE_CONFIG_FILE # embed con #options UVMHIST_PRINT #options SYSCALL_DEBUG -#ident "XEN3_DOM0-$Revision: 1.187 $" +#ident "XEN3_DOM0-$Revision: 1.188 $" maxusers 32 # estimated number of users @@ -133,6 +133,17 @@ options PPP_FILTER # Active filter supp #options ALTQ_RIO # RED with IN/OUT #options ALTQ_WFQ # Weighted Fair Queueing +# These options enable verbose messages for several subsystems. +# Warning, these may compile large string tables into the kernel! +#options ACPIVERBOSE # verbose ACPI configuration messages +#options MIIVERBOSE # verbose PHY autoconfig messages +options PCIVERBOSE # verbose PCI device autoconfig messages +#options PCI_CONFIG_DUMP # verbosely dump PCI config space +#options PCMCIAVERBOSE # verbose PCMCIA configuration messages +options SCSIVERBOSE # human readable SCSI error messages +#options USBVERBOSE # verbose USB device autoconfig messages +#options HDAUDIOVERBOSE # verbose HDAUDIO driver messages + options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM #options NFS_BOOT_BOOTSTATIC #options NFS_BOOTSTATIC_MYIP="\"169.254.1.2\"" @@ -197,8 +208,6 @@ acpi0 at mainbus? # ACPI access in PVH #options ACPI_ACTIVATE_DEV # If set, activate inactive devices options ACPI_SCANPCI # find PCI roots using ACPI #options ACPICA_PEDANTIC # force strict conformance to the Spec. -#options ACPIVERBOSE # verbose ACPI configuration messages -#options MIIVERBOSE # verbose PHY autoconfig messages options MPBIOS # configure CPUs and APICs using MPBIOS #options MPDEBUG # MPBIOS configures PCI roots #options MPVERBOSE # verbose MPBIOS autoconfig messages @@ -206,9 +215,6 @@ options MPBIOS_SCANPCI # MPBIOS config #options PCI_ADDR_FIXUP # fixup PCI I/O addresses #options PCI_BUS_FIXUP # fixup PCI bus numbering #options PCI_INTR_FIXUP # fixup PCI interrupt routing -#options PCIVERBOSE # verbose PCI device autoconfig messages -#options USBVERBOSE # verbose USB device autoconfig messages -#options HDAUDIOVERBOSE # verbose HDAUDIO driver messages ioapic* at mainbus? apid ?
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: gdt Date: Tue Mar 2 18:06:12 UTC 2021 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 Log Message: XEN3_DOM0: Sync VERBOSE with GENERIC Copy the *VERBOSE option block from GENERIC, and prune the scattered verbose options in XEN3_DOM0, surely dating from a time they were copied from an earlier GENERIC. This amounts to adding PCIVERBOSE and SCSIVERBOSE, and the diff from GENERIC to DOM0 boots is markedly reduced. To generate a diff of this commit: cvs rdiff -u -r1.187 -r1.188 src/sys/arch/amd64/conf/XEN3_DOM0 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: Tue Mar 2 15:59:04 UTC 2021 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Ticket #1220 To generate a diff of this commit: cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-9.2 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.2 diff -u src/doc/CHANGES-9.2:1.1.2.53 src/doc/CHANGES-9.2:1.1.2.54 --- src/doc/CHANGES-9.2:1.1.2.53 Mon Mar 1 16:01:06 2021 +++ src/doc/CHANGES-9.2 Tue Mar 2 15:59:04 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.2,v 1.1.2.53 2021/03/01 16:01:06 martin Exp $ +# $NetBSD: CHANGES-9.2,v 1.1.2.54 2021/03/02 15:59:04 martin Exp $ A complete list of changes from the NetBSD 9.1 release to the NetBSD 9.2 release: @@ -1732,3 +1732,10 @@ sys/dev/audio/audio.c1.89-1.91 and audiodetach. Refactor code around audio_unlink(). [isaki, ticket #1219] +share/man/man4/pad.41.7-1.10 + + pad(4): update documentation: + - explain the format of the device and a few quirks. + - give an example of recording an application's output. + [nia, ticket #1220] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Mar 2 15:59:04 UTC 2021 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Ticket #1220 To generate a diff of this commit: cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-9.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/share/man/man4
Module Name:src Committed By: martin Date: Tue Mar 2 15:57:06 UTC 2021 Modified Files: src/share/man/man4 [netbsd-9]: pad.4 Log Message: Pull up following revision(s) (requested by nia in ticket #1220): share/man/man4/pad.4: revision 1.7 share/man/man4/pad.4: revision 1.8 share/man/man4/pad.4: revision 1.9 share/man/man4/pad.4: revision 1.10 Use /dev/audioX rather than /dev/soundX in examples. Avoids accidentally running into confusing behavior. Add another example of recording the output of an application. Explain something that confused me. Slightly adjust wording. It does seem to work with multiple applications concurrently writing to the device in a quick test I did. Explain the format of the raw PCM data users can read from a pad(4). Since it's headerless this is important so the data can be interpreted properly. Also, ordinary audio ioctls cannot be used on a pad and the format can't be changed, so applications that attempt to automatically determine the format of a device like audiorecord don't work. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.8.1 src/share/man/man4/pad.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/pad.4 diff -u src/share/man/man4/pad.4:1.6 src/share/man/man4/pad.4:1.6.8.1 --- src/share/man/man4/pad.4:1.6 Mon Jul 3 21:30:58 2017 +++ src/share/man/man4/pad.4 Tue Mar 2 15:57:06 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: pad.4,v 1.6 2017/07/03 21:30:58 wiz Exp $ +.\" $NetBSD: pad.4,v 1.6.8.1 2021/03/02 15:57:06 martin Exp $ .\" .\" Copyright (c) 2007 Jared D. McNeill .\" All rights reserved. @@ -24,7 +24,7 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd November 11, 2007 +.Dd February 6, 2021 .Dt PAD 4 .Os .Sh NAME @@ -36,19 +36,27 @@ .Sh DESCRIPTION .Nm is a pseudo-device driver which provides support for feeding back PCM data -from a consumer of the +from consumers of an .Xr audio 4 -API to userland. +device to userland. +.Pp +The raw PCM data readable from +.Pa /dev/padN +is encoded in stereo little-endian 16-bit linear PCM at 44100 Hz. .Sh FILES The .Nm pseudo-device driver receives data from -.Pa /dev/soundN +.Pa /dev/audioN and feeds the raw PCM output to .Pa /dev/padN . +.Pa /dev/audioN +is created once +.Pa /dev/padN +is opened. .Bl -item .It -.Pa /dev/soundN +.Pa /dev/audioN .It .Pa /dev/padN .El @@ -56,7 +64,13 @@ and feeds the raw PCM output to The following example streams an MP3 to an Apple AirTunes compatible device: .Bd -literal -offset indent $ rtunes - < /dev/pad0 & -$ mpg123 -a /dev/sound1 mozart.mp3 +$ mpg123 -a /dev/audio1 mozart.mp3 +.Ed +.Pp +Record the output of an application (in this case, audioplay): +.Bd -literal -offset indent +$ ffmpeg -f s16le -ar 44100 -ac 2 -i /dev/pad0 output.wav +$ audioplay -d /dev/audio1 input.wav .Ed .Sh SEE ALSO .Xr audio 4
CVS commit: [netbsd-9] src/share/man/man4
Module Name:src Committed By: martin Date: Tue Mar 2 15:57:06 UTC 2021 Modified Files: src/share/man/man4 [netbsd-9]: pad.4 Log Message: Pull up following revision(s) (requested by nia in ticket #1220): share/man/man4/pad.4: revision 1.7 share/man/man4/pad.4: revision 1.8 share/man/man4/pad.4: revision 1.9 share/man/man4/pad.4: revision 1.10 Use /dev/audioX rather than /dev/soundX in examples. Avoids accidentally running into confusing behavior. Add another example of recording the output of an application. Explain something that confused me. Slightly adjust wording. It does seem to work with multiple applications concurrently writing to the device in a quick test I did. Explain the format of the raw PCM data users can read from a pad(4). Since it's headerless this is important so the data can be interpreted properly. Also, ordinary audio ioctls cannot be used on a pad and the format can't be changed, so applications that attempt to automatically determine the format of a device like audiorecord don't work. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.8.1 src/share/man/man4/pad.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/resize
Module Name:src
Committed By: christos
Date: Tue Mar 2 14:26:00 UTC 2021
Modified Files:
src/usr.bin/resize: Makefile
Log Message:
Only specify the dependencies if we are making the copy target.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/resize/Makefile
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/resize/Makefile
diff -u src/usr.bin/resize/Makefile:1.6 src/usr.bin/resize/Makefile:1.7
--- src/usr.bin/resize/Makefile:1.6 Sun Feb 28 04:04:28 2021
+++ src/usr.bin/resize/Makefile Tue Mar 2 09:26:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2021/02/28 09:04:28 mrg Exp $
+# $NetBSD: Makefile,v 1.7 2021/03/02 14:26:00 christos Exp $
.include
@@ -14,14 +14,14 @@ LDADD+= -lutil
XTERM=${X11SRCDIR}/external/mit/xterm/dist
# XXX disable for now; breaks on r/o source trees.
-.if 0
-.if exists(${XTERM})
-.for i in resize.c resize.man
+.if make(copy)
+. if exists(${XTERM})
+. for i in resize.c resize.man
copy:: ${.CURDIR}/${i}
${.CURDIR}/${i}: ${XTERM}/${i}
cp -p ${.ALLSRC} ${.TARGET}
-.endfor
-.endif
+. endfor
+. endif
.endif
CLEANFILES+=resize.1
CVS commit: src/usr.bin/resize
Module Name:src Committed By: christos Date: Tue Mar 2 14:26:00 UTC 2021 Modified Files: src/usr.bin/resize: Makefile Log Message: Only specify the dependencies if we are making the copy target. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/usr.bin/resize/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbppc/include
Module Name:src Committed By: rin Date: Tue Mar 2 13:44:58 UTC 2021 Modified Files: src/sys/arch/evbppc/include: explora.h Log Message: Adjust tabs. Add NetBSD RCSID. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/include/explora.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/evbppc/include/explora.h diff -u src/sys/arch/evbppc/include/explora.h:1.3 src/sys/arch/evbppc/include/explora.h:1.4 --- src/sys/arch/evbppc/include/explora.h:1.3 Mon Oct 23 06:49:17 2006 +++ src/sys/arch/evbppc/include/explora.h Tue Mar 2 13:44:58 2021 @@ -1,3 +1,4 @@ +/* $NetBSD: explora.h,v 1.4 2021/03/02 13:44:58 rin Exp $ */ #ifndef _EVBPPC_EXPLORA_H_ #define _EVBPPC_EXPLORA_H_ @@ -9,10 +10,10 @@ #define BASE_LE 0x7080 #define BASE_FB2 0x7100 #define BASE_ISA 0x7400 -#define BASE_PCKBC 0x74c0 -#define BASE_PCKBC2 0x74c8 -#define BASE_COM 0x740005f0 -#define BASE_LPT 0x740006f0 +#define BASE_PCKBC 0x74c0 +#define BASE_PCKBC2 0x74c8 +#define BASE_COM 0x740005f0 +#define BASE_LPT 0x740006f0 #define SIZE_FB (2*1024*1024)
CVS commit: src/sys/arch/evbppc/include
Module Name:src Committed By: rin Date: Tue Mar 2 13:44:58 UTC 2021 Modified Files: src/sys/arch/evbppc/include: explora.h Log Message: Adjust tabs. Add NetBSD RCSID. No binary changes. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbppc/include/explora.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/evbppc/explora/dev
Module Name:src Committed By: rin Date: Tue Mar 2 12:01:02 UTC 2021 Modified Files: src/sys/arch/evbppc/explora/dev: com_elb.c le_elb.c pckbc_elb.c Log Message: Convert to intr_establish_xname(). To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/explora/dev/com_elb.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/explora/dev/le_elb.c \ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/explora/dev/com_elb.c diff -u src/sys/arch/evbppc/explora/dev/com_elb.c:1.10 src/sys/arch/evbppc/explora/dev/com_elb.c:1.11 --- src/sys/arch/evbppc/explora/dev/com_elb.c:1.10 Sat Dec 8 17:46:11 2018 +++ src/sys/arch/evbppc/explora/dev/com_elb.c Tue Mar 2 12:01:02 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: com_elb.c,v 1.10 2018/12/08 17:46:11 thorpej Exp $ */ +/* $NetBSD: com_elb.c,v 1.11 2021/03/02 12:01:02 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.10 2018/12/08 17:46:11 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: com_elb.c,v 1.11 2021/03/02 12:01:02 rin Exp $"); #include #include @@ -87,5 +87,6 @@ com_elb_attach(device_t parent, device_t com_attach_subr(sc); - intr_establish(eaa->elb_irq, IST_LEVEL, IPL_SERIAL, comintr, sc); + intr_establish_xname(eaa->elb_irq, IST_LEVEL, IPL_SERIAL, comintr, sc, + device_xname(self)); } Index: src/sys/arch/evbppc/explora/dev/le_elb.c diff -u src/sys/arch/evbppc/explora/dev/le_elb.c:1.9 src/sys/arch/evbppc/explora/dev/le_elb.c:1.10 --- src/sys/arch/evbppc/explora/dev/le_elb.c:1.9 Fri Jul 1 19:02:32 2011 +++ src/sys/arch/evbppc/explora/dev/le_elb.c Tue Mar 2 12:01:02 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: le_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $ */ +/* $NetBSD: le_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: le_elb.c,v 1.9 2011/07/01 19:02:32 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: le_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $"); #include #include @@ -170,7 +170,8 @@ le_elb_attach(device_t parent, device_t /* Chip is stopped. Set "software style" to 32-bit. */ le_wrcsr(sc, LE_CSR58, 2); - intr_establish(eaa->elb_irq, IST_LEVEL, IPL_NET, am79900_intr, sc); + intr_establish_xname(eaa->elb_irq, IST_LEVEL, IPL_NET, am79900_intr, + sc, device_xname(self)); } /* Index: src/sys/arch/evbppc/explora/dev/pckbc_elb.c diff -u src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.9 src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.10 --- src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.9 Tue Mar 2 11:59:49 2021 +++ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Tue Mar 2 12:01:02 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc_elb.c,v 1.9 2021/03/02 11:59:49 rin Exp $ */ +/* $NetBSD: pckbc_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.9 2021/03/02 11:59:49 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.10 2021/03/02 12:01:02 rin Exp $"); #include #include @@ -116,7 +116,8 @@ pckbc_elb_intr_establish(struct pckbc_so */ if (irq >= 0) - intr_establish(irq, IST_LEVEL, IPL_SERIAL, pckbcintr, sc); + intr_establish_xname(irq, IST_LEVEL, IPL_SERIAL, pckbcintr, sc, + device_xname(sc->sc_dv)); msc->sc_irq = -1; }
CVS commit: src/sys/arch/evbppc/explora/dev
Module Name:src Committed By: rin Date: Tue Mar 2 12:01:02 UTC 2021 Modified Files: src/sys/arch/evbppc/explora/dev: com_elb.c le_elb.c pckbc_elb.c Log Message: Convert to intr_establish_xname(). To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbppc/explora/dev/com_elb.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/explora/dev/le_elb.c \ src/sys/arch/evbppc/explora/dev/pckbc_elb.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/evbppc/explora/dev
Module Name:src Committed By: rin Date: Tue Mar 2 11:59:49 UTC 2021 Modified Files: src/sys/arch/evbppc/explora/dev: pckbc_elb.c Log Message: Stop registering same function twice, i.e., for pckbd(4) and pms(4), via intr_establish(). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/explora/dev/pckbc_elb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/explora/dev/pckbc_elb.c diff -u src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.8 src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.9 --- src/sys/arch/evbppc/explora/dev/pckbc_elb.c:1.8 Sat Nov 21 15:42:20 2020 +++ src/sys/arch/evbppc/explora/dev/pckbc_elb.c Tue Mar 2 11:59:49 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pckbc_elb.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $ */ +/* $NetBSD: pckbc_elb.c,v 1.9 2021/03/02 11:59:49 rin Exp $ */ /*- * Copyright (c) 2003 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.8 2020/11/21 15:42:20 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pckbc_elb.c,v 1.9 2021/03/02 11:59:49 rin Exp $"); #include #include @@ -118,5 +118,5 @@ pckbc_elb_intr_establish(struct pckbc_so if (irq >= 0) intr_establish(irq, IST_LEVEL, IPL_SERIAL, pckbcintr, sc); - irq = -1; + msc->sc_irq = -1; }
CVS commit: src/sys/arch/evbppc/explora/dev
Module Name:src Committed By: rin Date: Tue Mar 2 11:59:49 UTC 2021 Modified Files: src/sys/arch/evbppc/explora/dev: pckbc_elb.c Log Message: Stop registering same function twice, i.e., for pckbd(4) and pms(4), via intr_establish(). To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbppc/explora/dev/pckbc_elb.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: jmcneill
Date: Tue Mar 2 11:51:00 UTC 2021
Modified Files:
src/sys/arch/arm/fdt: arm_simplefb.c
src/sys/dev/fdt: simplefb.c
Log Message:
Fix previous: Each line is "stride" bytes wide, not "width * depth".
While here, add a comment explaining what this test is doing.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/fdt/arm_simplefb.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/fdt/simplefb.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/arm/fdt/arm_simplefb.c
diff -u src/sys/arch/arm/fdt/arm_simplefb.c:1.9 src/sys/arch/arm/fdt/arm_simplefb.c:1.10
--- src/sys/arch/arm/fdt/arm_simplefb.c:1.9 Tue Mar 2 07:02:05 2021
+++ src/sys/arch/arm/fdt/arm_simplefb.c Tue Mar 2 11:51:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: arm_simplefb.c,v 1.9 2021/03/02 07:02:05 skrll Exp $ */
+/* $NetBSD: arm_simplefb.c,v 1.10 2021/03/02 11:51:00 jmcneill Exp $ */
/*-
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include "opt_vcons.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: arm_simplefb.c,v 1.9 2021/03/02 07:02:05 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arm_simplefb.c,v 1.10 2021/03/02 11:51:00 jmcneill Exp $");
#include
#include
@@ -237,8 +237,13 @@ arm_simplefb_preattach(void)
return;
}
- if (size < width * height * depth)
+ /*
+ * Make sure that the size of the linear FB mapping is big enough
+ * to fit the requested screen dimensions.
+ */
+ if (size < stride * height) {
return;
+ }
if (bus_space_map(bst, addr, size,
BUS_SPACE_MAP_LINEAR | BUS_SPACE_MAP_PREFETCHABLE, ) != 0)
Index: src/sys/dev/fdt/simplefb.c
diff -u src/sys/dev/fdt/simplefb.c:1.13 src/sys/dev/fdt/simplefb.c:1.14
--- src/sys/dev/fdt/simplefb.c:1.13 Tue Mar 2 07:02:06 2021
+++ src/sys/dev/fdt/simplefb.c Tue Mar 2 11:51:00 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: simplefb.c,v 1.13 2021/03/02 07:02:06 skrll Exp $ */
+/* $NetBSD: simplefb.c,v 1.14 2021/03/02 11:51:00 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -29,7 +29,7 @@
#include "opt_wsdisplay_compat.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: simplefb.c,v 1.13 2021/03/02 07:02:06 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: simplefb.c,v 1.14 2021/03/02 11:51:00 jmcneill Exp $");
#include
#include
@@ -169,7 +169,7 @@ simplefb_attach_genfb(struct simplefb_so
return ENXIO;
}
- if (size < width * height * depth) {
+ if (size < stride * height) {
aprint_error(": incorrect size\n");
return ENXIO;
}
CVS commit: src/sys
Module Name:src Committed By: jmcneill Date: Tue Mar 2 11:51:00 UTC 2021 Modified Files: src/sys/arch/arm/fdt: arm_simplefb.c src/sys/dev/fdt: simplefb.c Log Message: Fix previous: Each line is "stride" bytes wide, not "width * depth". While here, add a comment explaining what this test is doing. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/fdt/arm_simplefb.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/fdt/simplefb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src
Committed By: msaitoh
Date: Tue Mar 2 11:10:53 UTC 2021
Modified Files:
src/sys/dev/pci/ixgbe: ix_txrx.c
Log Message:
Fix jcl's starvation case in ixgbe_rxeof() again.
ix_txrx.c rev.1.64 preallocates jcl to prevent starvation but it's not
perfect. Don't use ixgbe_rx_discard() and just update the old descriptor
for reuse. It's also required for multiple descriptors case to refresh
subsequent descriptor(s). Reviewed by knakahara@.
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/pci/ixgbe/ix_txrx.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.64 src/sys/dev/pci/ixgbe/ix_txrx.c:1.65
--- src/sys/dev/pci/ixgbe/ix_txrx.c:1.64 Mon Jan 18 09:09:04 2021
+++ src/sys/dev/pci/ixgbe/ix_txrx.c Tue Mar 2 11:10:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ix_txrx.c,v 1.64 2021/01/18 09:09:04 knakahara Exp $ */
+/* $NetBSD: ix_txrx.c,v 1.65 2021/03/02 11:10:53 msaitoh Exp $ */
/**
@@ -1319,6 +1319,11 @@ ixgbe_setup_hw_rsc(struct rx_ring *rxr)
* exhaustion are unnecessary, if an mbuf cannot be obtained
* it just returns, keeping its placeholder, thus it can simply
* be recalled to try again.
+ *
+ * XXX NetBSD TODO:
+ *- The ixgbe_rxeof() function always preallocates mbuf cluster (jcl),
+ * so the ixgbe_refresh_mbufs() function can be simplified.
+ *
/
static void
ixgbe_refresh_mbufs(struct rx_ring *rxr, int limit)
@@ -1799,7 +1804,9 @@ ixgbe_rxeof(struct ix_queue *que)
struct ixgbe_rx_buf *rbuf, *nbuf;
int i, nextp, processed = 0;
u32 staterr = 0;
- u32 count = adapter->rx_process_limit;
+ u32 count = 0;
+ u32 limit = adapter->rx_process_limit;
+ bool discard_multidesc = false;
#ifdef RSS
u16 pkt_info;
#endif
@@ -1816,7 +1823,14 @@ ixgbe_rxeof(struct ix_queue *que)
}
#endif /* DEV_NETMAP */
- for (i = rxr->next_to_check; count != 0;) {
+ /*
+ * The max number of loop is rx_process_limit. If discard_multidesc is
+ * true, continue processing to not to send broken packet to the upper
+ * layer.
+ */
+ for (i = rxr->next_to_check;
+ (count < limit) || (discard_multidesc == true);) {
+
struct mbuf *sendmp, *mp;
struct mbuf *newmp;
u32 rsc, ptype;
@@ -1837,7 +1851,7 @@ ixgbe_rxeof(struct ix_queue *que)
if ((staterr & IXGBE_RXD_STAT_DD) == 0)
break;
- count--;
+ count++;
sendmp = NULL;
nbuf = NULL;
rsc = 0;
@@ -1858,17 +1872,37 @@ ixgbe_rxeof(struct ix_queue *que)
#endif
rxr->rx_discarded.ev_count++;
ixgbe_rx_discard(rxr, i);
+ discard_multidesc = false;
goto next_desc;
}
/* pre-alloc new mbuf */
- newmp = ixgbe_getjcl(>jcl_head, M_NOWAIT, MT_DATA, M_PKTHDR,
- rxr->mbuf_sz);
+ if (!discard_multidesc)
+ newmp = ixgbe_getjcl(>jcl_head, M_NOWAIT, MT_DATA,
+ M_PKTHDR, rxr->mbuf_sz);
+ else
+ newmp = NULL;
if (newmp == NULL) {
rxr->rx_discarded.ev_count++;
- ixgbe_rx_discard(rxr, i);
+ /*
+ * Descriptor initialization is already done by the
+ * above code (cur->wb.upper.status_error = 0).
+ * So, we can reuse current rbuf->buf for new packet.
+ *
+ * Rewrite the buffer addr, see comment in
+ * ixgbe_rx_discard().
+ */
+ cur->read.pkt_addr = rbuf->addr;
+ m_freem(rbuf->fmp);
+ rbuf->fmp = NULL;
+ if (!eop) {
+/* Discard the entire packet. */
+discard_multidesc = true;
+ } else
+discard_multidesc = false;
goto next_desc;
}
+ discard_multidesc = false;
bus_dmamap_sync(rxr->ptag->dt_dmat, rbuf->pmap, 0,
rbuf->buf->m_pkthdr.len, BUS_DMASYNC_POSTREAD);
CVS commit: src/sys/dev/pci/ixgbe
Module Name:src Committed By: msaitoh Date: Tue Mar 2 11:10:53 UTC 2021 Modified Files: src/sys/dev/pci/ixgbe: ix_txrx.c Log Message: Fix jcl's starvation case in ixgbe_rxeof() again. ix_txrx.c rev.1.64 preallocates jcl to prevent starvation but it's not perfect. Don't use ixgbe_rx_discard() and just update the old descriptor for reuse. It's also required for multiple descriptors case to refresh subsequent descriptor(s). Reviewed by knakahara@. To generate a diff of this commit: cvs rdiff -u -r1.64 -r1.65 src/sys/dev/pci/ixgbe/ix_txrx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/ctwm/dist
Module Name:xsrc Committed By: nia Date: Tue Mar 2 10:21:09 UTC 2021 Modified Files: xsrc/external/mit/ctwm/dist: system.ctwmrc Log Message: Restore defaults. The actual config now lives in src and we don't want merge conflicts. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/ctwm/dist/system.ctwmrc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: xsrc/external/mit/ctwm/dist
Module Name:xsrc
Committed By: nia
Date: Tue Mar 2 10:21:09 UTC 2021
Modified Files:
xsrc/external/mit/ctwm/dist: system.ctwmrc
Log Message:
Restore defaults.
The actual config now lives in src and we don't want merge conflicts.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/ctwm/dist/system.ctwmrc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/ctwm/dist/system.ctwmrc
diff -u xsrc/external/mit/ctwm/dist/system.ctwmrc:1.8 xsrc/external/mit/ctwm/dist/system.ctwmrc:1.9
--- xsrc/external/mit/ctwm/dist/system.ctwmrc:1.8 Thu Sep 24 05:38:16 2020
+++ xsrc/external/mit/ctwm/dist/system.ctwmrc Tue Mar 2 10:21:09 2021
@@ -1,383 +1,181 @@
#
-# $NetBSD: system.ctwmrc,v 1.8 2020/09/24 05:38:16 nia Exp $
+# $XConsortium: system.twmrc,v 1.8 91/04/23 21:10:58 gildea Exp $
#
-# ctwmrc by nia
+# Default twm configuration file; needs to be kept small to conserve string
+# space in systems whose compilers don't handle medium-sized strings.
#
-# An attempt to strike a usability balance that makes keys and buttons
-# do the thing users of various operating systems expect them to do.
+# Sites should tailor this file, providing any extra title buttons, menus, etc.
+# that may be appropriate for their environment. For example, if most of the
+# users were accustomed to uwm, the defaults could be set up not to decorate
+# any windows and to use meta-keys.
#
-# Most things should be possible to accomplish with only the keyboard.
-#
-# Also, mostly inoffensive colours (avoiding potentially inaccessible
-# combinations like red-green).
-#
-
-# don't use the default buttons or key bindings, we define our own
-NoDefaults
-
-ShowWorkSpaceManager
-ShowIconManager
-
-# 3D icon managers do not seemingly honor IconManagerHighlight,
-# which makes them slightly less useful
-#UseThreeDIconManagers
-#UseThreeDWMap
-UseThreeDBorders
-#UseThreeDMenus
-UseThreeDTitles
-
-ThreeDBorderWidth 3
-
-# TODO: we can use syscmd() in combination with xdpyinfo to detect
-# HiDPI screens and set appropiate fonts.
-#
-# need some good scaled bitmap fonts imported - terminus or spleen
-# would be good candidates
-MenuFont "-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*"
-TitleFont"-misc-fixed-bold-r-*-*-18-*-*-*-*-*-*-*"
-IconManagerFont "-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*"
-IconFont "-misc-fixed-bold-r-*-*-18-*-*-*-*-*-*-*"
-ResizeFont "-misc-fixed-medium-r-*-*-18-*-*-*-*-*-*-*"
-WorkSpaceFont"-misc-fixed-medium-r-*-*-14-*-*-*-*-*-*-*"
+NoGrabServer
RestartPreviousState
-
DecorateTransients
+TitleFont "-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*"
+ResizeFont "-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*"
+MenuFont "-adobe-helvetica-bold-r-normal--*-120-*-*-*-*-*-*"
+IconFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*-*-*-*"
+IconManagerFont "-adobe-helvetica-bold-r-normal--*-100-*-*-*"
+ShowWorkSpaceManager # start with workspace manager up
+UseThreeDMenus
+UseThreeDTitles
+UseThreeDIconManagers
+UseThreeDBorders
+UseThreeDWMap
+SunkFocusWindowTitle
-# hide window contents while altering windows for performance
-NoOpaqueMove
-NoOpaqueResize
-
-SloppyFocus
-
-AutoOccupy
-AutoRelativeResize
-
-CenterFeedbackWindow
-
-NoGrabServer
-
-RaiseOnClick
-
-DontMoveOff
-MoveOffResistance 150
-
-ConstrainedMoveTime 0
-
-IgnoreLockModifier
-
-# Not actually that random.
-# Means that windows do not have to be placed by hand with a mouse,
-# which helps if you are using a keyboard only.
-RandomPlacement "on"
-
-MoveDelta 3
-ClearShadowContrast 50
-DarkShadowContrast50
-MovePackResistance100
-
-RaiseWhenAutoUnSqueeze
-ShortAllWindowsMenus
-
-#BeNiceToColorMap
-
-NoStackMode
-
-StayUpMenus
-WarpToDefaultMenuEntry
-MenuShadowDepth 1
-
-NoTitleFocus
-
-# warp through all windows in the current workspace
-WindowRing
-WarpRingOnScreen
-
-NoTitleHighlight
-
-TitleButtonShadowDepth1
-TitleShadowDepth 1
-TitleButtonBorderWidth0
-TitlePadding 0
-TitleJustification"left"
-ButtonIndent 0
-FramePadding 0
-
-LeftTitleButton ":xpm:dot" = f.menu "titleops"
-RightTitleButton ":xpm:resize" = f.resize
-RightTitleButton ":xpm:cross"= f.delete
-
-BorderWidth 4
-BorderShadowDepth 2
-BorderResizeCursors
-
-MaxIconTitleWidth 120
-NoIconManagerFocus
-IconManagerShadowDepth1
-IconManagerGeometry "200x-1-1+0" 1
-IconifyByUnmapping
-
-ReallyMoveInWorkspaceManager
-MapWindowCurrentWorkSpace { "black" "firebrick" }
-DontToggleWorkSpaceManagerState
-DontWarpCursorInWMap
-NoShowOccupyAll
-ReverseCurrentWorkspace
-StartInMapState
-WMgrHorizButtonIndent 0
-WMgrVertButtonIndent 0
-WorkSpaceManagerGeometry "70x270-4-4" 1
-
-WorkSpaces
-{
-"1"{ "lavender"
CVS commit: src/usr.bin/newsyslog
Module Name:src Committed By: uwe Date: Tue Mar 2 10:17:25 UTC 2021 Modified Files: src/usr.bin/newsyslog: newsyslog.8 Log Message: Use proper -width instead of the cargo-cult value. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/usr.bin/newsyslog/newsyslog.8 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/newsyslog/newsyslog.8 diff -u src/usr.bin/newsyslog/newsyslog.8:1.45 src/usr.bin/newsyslog/newsyslog.8:1.46 --- src/usr.bin/newsyslog/newsyslog.8:1.45 Tue Mar 2 10:14:59 2021 +++ src/usr.bin/newsyslog/newsyslog.8 Tue Mar 2 10:17:25 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: newsyslog.8,v 1.45 2021/03/02 10:14:59 uwe Exp $ +.\" $NetBSD: newsyslog.8,v 1.46 2021/03/02 10:17:25 uwe Exp $ .\" .\" Copyright (c) 1999, 2000 Andrew Doran .\" All rights reserved. @@ -108,7 +108,7 @@ Blank lines or lines beginning with are ignored. The fields of the configuration file are as follows: -.Bl -tag -width indent +.Bl -tag -width Fl .It Ar logfile_name Name of the system log file to be archived. .It Ar owner Ns Li \&: Ns Ar group
CVS commit: src/usr.bin/newsyslog
Module Name:src Committed By: uwe Date: Tue Mar 2 10:17:25 UTC 2021 Modified Files: src/usr.bin/newsyslog: newsyslog.8 Log Message: Use proper -width instead of the cargo-cult value. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/usr.bin/newsyslog/newsyslog.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/newsyslog
Module Name:src Committed By: uwe Date: Tue Mar 2 10:14:59 UTC 2021 Modified Files: src/usr.bin/newsyslog: newsyslog.8 Log Message: Sort config file flags and command line options. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/usr.bin/newsyslog/newsyslog.8 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/newsyslog/newsyslog.8 diff -u src/usr.bin/newsyslog/newsyslog.8:1.44 src/usr.bin/newsyslog/newsyslog.8:1.45 --- src/usr.bin/newsyslog/newsyslog.8:1.44 Tue Mar 2 10:12:33 2021 +++ src/usr.bin/newsyslog/newsyslog.8 Tue Mar 2 10:14:59 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: newsyslog.8,v 1.44 2021/03/02 10:12:33 uwe Exp $ +.\" $NetBSD: newsyslog.8,v 1.45 2021/03/02 10:14:59 uwe Exp $ .\" .\" Copyright (c) 1999, 2000 Andrew Doran .\" All rights reserved. @@ -320,16 +320,16 @@ This flag is mostly usable in conjunctio flag that prevents .Nm from inserting an ASCII informational message. +.It Ic j +Archived log files should be compressed with +.Xr bzip2 1 +to save space. .It Ic n No signal should be sent when the log is trimmed. .It Ic p The first historical log file (i.e. the historical log file with the suffix .Ql \.0 ) should not be compressed. -.It Ic j -Archived log files should be compressed with -.Xr bzip2 1 -to save space. .It Ic x Archived log files should be compressed with .Xr xz 1 @@ -364,6 +364,10 @@ By default a .Sh OPTIONS The following options can be used with newsyslog: .Bl -tag -width indent +.It Fl F +Force trimming of the logs, even if the trim conditions have not been met. +This option is useful for diagnosing system problems by providing you with +fresh logs. .It Fl f Ar config_file Use .Ar config_file @@ -393,10 +397,6 @@ Do not signal daemon processes. .It Fl v Run in verbose mode. In this mode each action that is taken will be printed. -.It Fl F -Force trimming of the logs, even if the trim conditions have not been met. -This option is useful for diagnosing system problems by providing you with -fresh logs. .El .Pp If additional command line arguments are given,
CVS commit: src/usr.bin/newsyslog
Module Name:src Committed By: uwe Date: Tue Mar 2 10:14:59 UTC 2021 Modified Files: src/usr.bin/newsyslog: newsyslog.8 Log Message: Sort config file flags and command line options. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/usr.bin/newsyslog/newsyslog.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/newsyslog
Module Name:src Committed By: uwe Date: Tue Mar 2 10:12:33 UTC 2021 Modified Files: src/usr.bin/newsyslog: newsyslog.8 Log Message: Fix markup so that literals are typeset as literals. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/usr.bin/newsyslog/newsyslog.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/newsyslog
Module Name:src Committed By: uwe Date: Tue Mar 2 10:12:33 UTC 2021 Modified Files: src/usr.bin/newsyslog: newsyslog.8 Log Message: Fix markup so that literals are typeset as literals. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/usr.bin/newsyslog/newsyslog.8 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/newsyslog/newsyslog.8 diff -u src/usr.bin/newsyslog/newsyslog.8:1.43 src/usr.bin/newsyslog/newsyslog.8:1.44 --- src/usr.bin/newsyslog/newsyslog.8:1.43 Mon Mar 1 21:43:00 2021 +++ src/usr.bin/newsyslog/newsyslog.8 Tue Mar 2 10:12:33 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: newsyslog.8,v 1.43 2021/03/01 21:43:00 wiz Exp $ +.\" $NetBSD: newsyslog.8,v 1.44 2021/03/02 10:12:33 uwe Exp $ .\" .\" Copyright (c) 1999, 2000 Andrew Doran .\" All rights reserved. @@ -104,17 +104,17 @@ that should be handled by Each line has six mandatory fields and three optional fields, with whitespace separating each field. Blank lines or lines beginning with -.Dq # +.Ql # are ignored. The fields of the configuration file are as follows: .Bl -tag -width indent .It Ar logfile_name Name of the system log file to be archived. -.It Ar owner:group +.It Ar owner Ns Li \&: Ns Ar group This optional field specifies the owner and group for the archive file. The -.Dq \&: +.Ql \&: is essential, even if the .Ar owner or @@ -125,9 +125,9 @@ The field may be numeric, or a name whic or .Pa /etc/group . For backward compatibility, -.Dq \&\. +.Ql \&. is usable in lieu of -.Dq \&: , +.Ql \&: , however use of this feature is discouraged. .It Ar mode Specify the mode of the log file and archives. @@ -245,22 +245,22 @@ The lead-in character for day, week and .So Li \&$ Sc Ns No -sign . The particular format of day, week and month specification is: .Oo -.Va D\ +.Li D Ns Va \ .Oc , .Sm off .Oo -.Va W\ +.Li W Ns Va \ .Oo -.Va D\ +.Li D Ns Va \ .Oc .Oc .Sm on and .Sm off .Oo -.Va M\ +.Li M Ns Va \ .Oo -.Va D\ +.Li D Ns Va \ .Oc .Oc .Sm on @@ -275,26 +275,26 @@ hours, range 0 ... 23 day of week, range 0 ... 6, 0 = Sunday .It Ar dd day of month, range 1 ... 31, or the letter -.Em L +.Ql L or -.Em l +.Ql l to specify the last day of the month. .El .Pp Some examples: .Pp .Bl -tag -width Ds -compact -offset indent -.It Ar $D0 +.It Li $D0 rotate every night at midnight -.It Ar $D23 +.It Li $D23 rotate every day at 23:00 hr -.It Ar $W0D23 +.It Li $W0D23 rotate every week on Sunday at 23:00 hr -.It Ar $W5D16 +.It Li $W5D16 rotate every week on Friday at 16:00 hr -.It Ar $MLD0 +.It Li $MLD0 rotate at the last day of every month at midnight -.It Ar $M5D6 +.It Li $M5D6 rotate on every 5th day of month at 6:00 hr .El .It Ar flags @@ -303,38 +303,38 @@ These flags are parsed in a case insensi Individual flags and their meanings: .Bl -tag -width indent -.It Sy - -This flag means nothing - it is used as a spacer when no flags are set. -.It Sy b +.It Ic \- +This flag means nothing \(em it is used as a spacer when no flags are set. +.It Ic b The file is a binary file or is not in .Xr syslogd 8 format: the ASCII message which .Nm inserts to indicate that the logs have been trimmed should not be included. -.It Sy c +.It Ic c Create an empty log file if none currently exists. -.It Sy e +.It Ic e Do not rotate log file with zero size (empty). This flag is mostly usable in conjunction with -.Ar b +.Ic b flag that prevents .Nm from inserting an ASCII informational message. -.It Sy n +.It Ic n No signal should be sent when the log is trimmed. -.It Sy p +.It Ic p The first historical log file (i.e. the historical log file with the suffix -.Dq \.0 ) +.Ql \.0 ) should not be compressed. -.It Sy j +.It Ic j Archived log files should be compressed with .Xr bzip2 1 to save space. -.It Sy x +.It Ic x Archived log files should be compressed with .Xr xz 1 to save space. -.It Sy z +.It Ic z Archived log files should be compressed with .Xr gzip 1 to save space. @@ -351,13 +351,15 @@ is sent to the process id contained in t .Ar path_to_pid_file file. This field must start with -.Sq / +.Ql / in order to be recognized properly. .It Ar sigtype This optional field specifies the type of signal to be sent to the daemon process. This may be a numeric or symbolic value. -By default a SIGHUP (hang-up) will be sent. +By default a +.Dv SIGHUP +(hang-up) will be sent. .El .Sh OPTIONS The following options can be used with newsyslog: @@ -380,7 +382,9 @@ Remove the restriction that must be running as root. When running as a regular user, .Nm -will not be able to send a HUP signal to +will not be able to send a +.Dv SIGHUP +signal to .Xr syslogd 8 , so this option should be used only when debugging or trimming user generated logs.
CVS commit: src/sys/arch/mips/include
Module Name:src
Committed By: skrll
Date: Tue Mar 2 08:16:53 UTC 2021
Modified Files:
src/sys/arch/mips/include: locore.h
Log Message:
Ensure the "memory" clobber is on inline assembly store operations
No binary change of note with this change in MALTA32
To generate a diff of this commit:
cvs rdiff -u -r1.116 -r1.117 src/sys/arch/mips/include/locore.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/include/locore.h
diff -u src/sys/arch/mips/include/locore.h:1.116 src/sys/arch/mips/include/locore.h:1.117
--- src/sys/arch/mips/include/locore.h:1.116 Sat Aug 22 09:08:21 2020
+++ src/sys/arch/mips/include/locore.h Tue Mar 2 08:16:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.h,v 1.116 2020/08/22 09:08:21 simonb Exp $ */
+/* $NetBSD: locore.h,v 1.117 2021/03/02 08:16:52 skrll Exp $ */
/*
* This file should not be included by MI code!!!
@@ -539,7 +539,7 @@ static inline void
mips_sb(register_t addr, uint8_t val)
{
#if defined(__mips_n32)
- __asm volatile("sb\t%1, 0(%0)" :: "d"(addr), "r"(val));
+ __asm volatile("sb\t%1, 0(%0)" :: "d"(addr), "r"(val) : "memory");
#else
*(volatile uint8_t *)addr = val;
#endif
@@ -549,7 +549,7 @@ static inline void
mips_sh(register_t addr, uint16_t val)
{
#if defined(__mips_n32)
- __asm volatile("sh\t%1, 0(%0)" :: "d"(addr), "r"(val));
+ __asm volatile("sh\t%1, 0(%0)" :: "d"(addr), "r"(val) : "memory");
#else
*(volatile uint16_t *)addr = val;
#endif
@@ -559,7 +559,7 @@ static inline void
mips_sw(register_t addr, uint32_t val)
{
#if defined(__mips_n32)
- __asm volatile("sw\t%1, 0(%0)" :: "d"(addr), "r"(val));
+ __asm volatile("sw\t%1, 0(%0)" :: "d"(addr), "r"(val) : "memory");
#else
*(volatile uint32_t *)addr = val;
#endif
@@ -570,7 +570,7 @@ static inline void
mips3_sd(register_t addr, uint64_t val)
{
#if defined(__mips_n32)
- __asm volatile("sd\t%1, 0(%0)" :: "d"(addr), "r"(val));
+ __asm volatile("sd\t%1, 0(%0)" :: "d"(addr), "r"(val) : "memory");
#else
*(volatile uint64_t *)addr = val;
#endif
CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: skrll Date: Tue Mar 2 08:16:53 UTC 2021 Modified Files: src/sys/arch/mips/include: locore.h Log Message: Ensure the "memory" clobber is on inline assembly store operations No binary change of note with this change in MALTA32 To generate a diff of this commit: cvs rdiff -u -r1.116 -r1.117 src/sys/arch/mips/include/locore.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
