CVS commit: src/sys/dev/pci
Module Name:src Committed By: isaki Date: Sat Feb 10 02:25:15 UTC 2024 Modified Files: src/sys/dev/pci: virtio.c Log Message: Split KASSERT(A && B) into KASSERT(A); KASSERT(B). To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/virtio.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/virtio.c diff -u src/sys/dev/pci/virtio.c:1.80 src/sys/dev/pci/virtio.c:1.81 --- src/sys/dev/pci/virtio.c:1.80 Fri Feb 9 22:08:36 2024 +++ src/sys/dev/pci/virtio.c Sat Feb 10 02:25:15 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: virtio.c,v 1.80 2024/02/09 22:08:36 andvar Exp $ */ +/* $NetBSD: virtio.c,v 1.81 2024/02/10 02:25:15 isaki Exp $ */ /* * Copyright (c) 2020 The NetBSD Foundation, Inc. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.80 2024/02/09 22:08:36 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.81 2024/02/10 02:25:15 isaki Exp $"); #include #include @@ -1069,7 +1069,8 @@ virtio_enqueue_reserve(struct virtio_sof struct vring_desc_extra *vdx; int i; - KASSERT(1 <= nsegs && nsegs <= vq->vq_num); + KASSERT(1 <= nsegs); + KASSERT(nsegs <= vq->vq_num); vdx = >vq_descx[slot]; vd = >vq_desc[slot];
CVS commit: src/sys/dev/pci
Module Name:src Committed By: isaki Date: Sat Feb 10 02:25:15 UTC 2024 Modified Files: src/sys/dev/pci: virtio.c Log Message: Split KASSERT(A && B) into KASSERT(A); KASSERT(B). To generate a diff of this commit: cvs rdiff -u -r1.80 -r1.81 src/sys/dev/pci/virtio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/touch
Module Name:src
Committed By: kre
Date: Sat Feb 10 00:19:30 UTC 2024
Modified Files:
src/usr.bin/touch: touch.1 touch.c
Log Message:
Add a -D option to touch, which acts like the -d option added to
chmod/chown/chgrp (probably others) in the not too far distant past,
and causes the operation to be a no-op if no actual change would be
made (avoiding updating the file's ctime for no reason).
That is, with touch, -D causes no modifying sys call to be made to
a file if that file's atime and mtime are already set to the values
that would be used. A common case for this is when a "-r ref-file"
is also a target file for the operation.
Unfortunately -d was already taken in touch, so next best available is -D.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/usr.bin/touch/touch.1
cvs rdiff -u -r1.39 -r1.40 src/usr.bin/touch/touch.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/touch/touch.1
diff -u src/usr.bin/touch/touch.1:1.28 src/usr.bin/touch/touch.1:1.29
--- src/usr.bin/touch/touch.1:1.28 Fri Feb 9 23:41:48 2024
+++ src/usr.bin/touch/touch.1 Sat Feb 10 00:19:30 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: touch.1,v 1.28 2024/02/09 23:41:48 kre Exp $
+.\" $NetBSD: touch.1,v 1.29 2024/02/10 00:19:30 kre Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" @(#)touch.1 8.3 (Berkeley) 4/28/95
.\"
-.Dd February 9, 2024
+.Dd February 10, 2024
.Dt TOUCH 1
.Os
.Sh NAME
@@ -40,7 +40,7 @@
.Nd change file access and modification times
.Sh SYNOPSIS
.Nm
-.Op Fl acfhm
+.Op Fl acDfhm
.Op Fl d Ar posix-datetime|human-datetime
.Op Fl Fl \|date Ar posix-datetime|human-datetime
.Op Fl R Ar ref-file
@@ -77,6 +77,11 @@ The
.Nm
utility does not treat this as an error.
No error messages are displayed and the exit value is not affected.
+.Pp
+.It Fl D
+Do not attempt to adjust a
+.Ar file Ns 's
+times if they are already set to the values specified.
.Pp
.It Fl d Ar posix-datetime
.It Fl d Ar human-datetime
@@ -360,6 +365,56 @@ of the
.Ar path
file to the current time of day.
.Pp
+.Dl touch -Dh -d human-datetime -t CCYYMMDDhhmm.ss -R file file
+.Pp
+Provided
+.Ar file
+exists, this parses the
+.Ar human-datetime
+and
+.Ar CCYYMMDDhhmm.ss
+arguments,
+verifying that they would be suitable for use with
+.Nm ,
+then does nothing, as the final time specification
+.Pq Fl R
+specifies to take the times from
+.Ar file
+and apply them to
+.Ar file
+itself, changing nothing, which the
+.Fl D
+option then prevents from actually occurring.
+That is, this merely tests that the
+.Ar human-datetime
+and
+.Ar datetime
+argumments to
+.Fl d
+and
+.Fl t
+respectively are valid, and could be used to specify a time.
+Use of both
+.Fl h
+and
+.Fl R
+means this works if
+.Ar file
+is a symbolic link,
+even one which does not reference an existing file,
+as well as if it is some other file type.
+Use of
+.Fl R
+requires that
+.Ar file
+exists,
+though if it does not, and an error is generated for that reason,
+the
+.Fl d
+and
+.Fl t
+arguments would have already been successfully processed.
+.Pp
.Dl touch -m -d '-1 day' somefile
.Pp
Set the modify time for
Index: src/usr.bin/touch/touch.c
diff -u src/usr.bin/touch/touch.c:1.39 src/usr.bin/touch/touch.c:1.40
--- src/usr.bin/touch/touch.c:1.39 Fri Feb 9 23:41:48 2024
+++ src/usr.bin/touch/touch.c Sat Feb 10 00:19:30 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: touch.c,v 1.39 2024/02/09 23:41:48 kre Exp $ */
+/* $NetBSD: touch.c,v 1.40 2024/02/10 00:19:30 kre Exp $ */
/*
* Copyright (c) 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
#if 0
static char sccsid[] = "@(#)touch.c 8.2 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: touch.c,v 1.39 2024/02/09 23:41:48 kre Exp $");
+__RCSID("$NetBSD: touch.c,v 1.40 2024/02/10 00:19:30 kre Exp $");
#endif /* not lint */
#include
@@ -91,18 +91,18 @@ main(int argc, char *argv[])
{
struct stat sb;
struct timespec ts[2];
- int aflag, cflag, hflag, mflag, ch, fd, len, rval, timeset;
+ int aflag, cflag, Dflag, hflag, mflag, ch, fd, len, rval, timeset;
char *p;
int (*change_file_times)(const char *, const struct timespec *);
int (*get_file_status)(const char *, struct stat *);
setlocale(LC_ALL, "");
- aflag = cflag = hflag = mflag = timeset = 0;
+ aflag = cflag = Dflag = hflag = mflag = timeset = 0;
if (clock_gettime(CLOCK_REALTIME, [0]))
err(1, "clock_gettime");
- while ((ch = getopt_long(argc, argv, "acd:fhmR:r:t:", touch_longopts,
+ while ((ch = getopt_long(argc, argv, "acDd:fhmR:r:t:", touch_longopts,
NULL)) != -1)
switch (ch) {
case 'a':
@@ -111,6 +111,9 @@ main(int argc, char *argv[])
case 'c':
cflag = 1;
break;
+ case 'D':
+ Dflag = 1;
+ break;
case 'd':
timeset = 1;
if (!stime_posix(optarg, ts))
@@ -200,6 +203,11 @@ main(int argc, char
CVS commit: src/usr.bin/touch
Module Name:src Committed By: kre Date: Sat Feb 10 00:19:30 UTC 2024 Modified Files: src/usr.bin/touch: touch.1 touch.c Log Message: Add a -D option to touch, which acts like the -d option added to chmod/chown/chgrp (probably others) in the not too far distant past, and causes the operation to be a no-op if no actual change would be made (avoiding updating the file's ctime for no reason). That is, with touch, -D causes no modifying sys call to be made to a file if that file's atime and mtime are already set to the values that would be used. A common case for this is when a "-r ref-file" is also a target file for the operation. Unfortunately -d was already taken in touch, so next best available is -D. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/usr.bin/touch/touch.1 cvs rdiff -u -r1.39 -r1.40 src/usr.bin/touch/touch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/touch
Module Name:src
Committed By: kre
Date: Fri Feb 9 23:41:48 UTC 2024
Modified Files:
src/usr.bin/touch: touch.1 touch.c
Log Message:
Add a -R option, which is identical to -r, except that if the reference file
is a symbolic link, the times to use are taken from those of the symbolic
link itself, instead of from the file it references. If the reference file
is not a symbolic link, -R and -r are identical.
This allows the BUGS entry in the manual page to be removed.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/usr.bin/touch/touch.1
cvs rdiff -u -r1.38 -r1.39 src/usr.bin/touch/touch.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/touch/touch.1
diff -u src/usr.bin/touch/touch.1:1.27 src/usr.bin/touch/touch.1:1.28
--- src/usr.bin/touch/touch.1:1.27 Thu Feb 8 02:54:13 2024
+++ src/usr.bin/touch/touch.1 Fri Feb 9 23:41:48 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: touch.1,v 1.27 2024/02/08 02:54:13 kre Exp $
+.\" $NetBSD: touch.1,v 1.28 2024/02/09 23:41:48 kre Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -32,7 +32,7 @@
.\"
.\" @(#)touch.1 8.3 (Berkeley) 4/28/95
.\"
-.Dd February 7, 2024
+.Dd February 9, 2024
.Dt TOUCH 1
.Os
.Sh NAME
@@ -43,6 +43,7 @@
.Op Fl acfhm
.Op Fl d Ar posix-datetime|human-datetime
.Op Fl Fl \|date Ar posix-datetime|human-datetime
+.Op Fl R Ar ref-file
.Op Fl r Ar ref-file
.Op Fl Fl \|reference Ar ref-file
.Op Fl t Ar datetime
@@ -193,6 +194,7 @@ is not changed unless the
.Fl a
flag is also specified.
.Pp
+.It Fl R Ar ref-file
.It Fl r Ar ref-file
.It Fl Fl \|reference Ar ref-file
Use the access and modification times,
@@ -203,7 +205,15 @@ instead of the current time of day.
If the
.Ar ref-file
is a symbolic link,
+then if the
+.Fl R
+form of this option was used,
+the times are taken from the symbolic link itself,
+otherwise
the times are taken from the file referenced by it.
+If
+.Ar ref-file
+is not a symbolic link, all three forms are identical.
.Pp
.It Fl t Ar datetime
Change the access and modification times of the
@@ -292,6 +302,7 @@ all conversions use decimal numbers.
.Pp
The
.Fl d ,
+.Fl R ,
.Fl r ,
and
.Fl t
@@ -301,10 +312,12 @@ each will be evaluated, and may cause an
then the result from the last one specified is used.
.Pp
The options which specify any part of the time
-.Pq Fl d , Fl r , Fl t
+.Pq Fl d , Fl R, Fl r , Fl t
apply to both the access and modification times
(with
.Fl r
+and
+.Fl R
obtaining those values independently from the
.Ar ref-file ) ,
though which is actually applied depends upon
@@ -421,5 +434,3 @@ A
.Nm
utility appeared in
.At v7 .
-.Sh BUGS
-A symbolic link can't be a reference file of access and/or modification time.
Index: src/usr.bin/touch/touch.c
diff -u src/usr.bin/touch/touch.c:1.38 src/usr.bin/touch/touch.c:1.39
--- src/usr.bin/touch/touch.c:1.38 Thu Feb 8 02:54:07 2024
+++ src/usr.bin/touch/touch.c Fri Feb 9 23:41:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: touch.c,v 1.38 2024/02/08 02:54:07 kre Exp $ */
+/* $NetBSD: touch.c,v 1.39 2024/02/09 23:41:48 kre Exp $ */
/*
* Copyright (c) 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1993\
#if 0
static char sccsid[] = "@(#)touch.c 8.2 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: touch.c,v 1.38 2024/02/08 02:54:07 kre Exp $");
+__RCSID("$NetBSD: touch.c,v 1.39 2024/02/09 23:41:48 kre Exp $");
#endif /* not lint */
#include
@@ -65,7 +65,8 @@ __RCSID("$NetBSD: touch.c,v 1.38 2024/02
static void stime_arg0(const char *, struct timespec *);
static void stime_arg1(char *, struct timespec *);
static void stime_arg2(const char *, int, struct timespec *);
-static void stime_file(const char *, struct timespec *);
+static void stime_file(const char *, struct timespec *,
+ int (const char *, struct stat *));
static int stime_posix(const char *, struct timespec *);
static int difftm(const struct tm *, const struct tm *);
__dead static void usage(void);
@@ -101,7 +102,7 @@ main(int argc, char *argv[])
if (clock_gettime(CLOCK_REALTIME, [0]))
err(1, "clock_gettime");
- while ((ch = getopt_long(argc, argv, "acd:fhmr:t:", touch_longopts,
+ while ((ch = getopt_long(argc, argv, "acd:fhmR:r:t:", touch_longopts,
NULL)) != -1)
switch (ch) {
case 'a':
@@ -123,9 +124,13 @@ main(int argc, char *argv[])
case 'm':
mflag = 1;
break;
+ case 'R':
+ timeset = 1;
+ stime_file(optarg, ts, lstat);
+ break;
case 'r':
timeset = 1;
- stime_file(optarg, ts);
+ stime_file(optarg, ts, stat);
break;
case 't':
timeset = 1;
@@ -335,11 +340,12 @@ stime_arg2(const char *arg, int year, st
}
static void
-stime_file(const char *fname, struct timespec *tsp)
+stime_file(const char *fname, struct timespec *tsp,
+int statfunc(const char *, struct stat *))
{
struct stat sb;
- if (stat(fname,
CVS commit: src/usr.bin/touch
Module Name:src Committed By: kre Date: Fri Feb 9 23:41:48 UTC 2024 Modified Files: src/usr.bin/touch: touch.1 touch.c Log Message: Add a -R option, which is identical to -r, except that if the reference file is a symbolic link, the times to use are taken from those of the symbolic link itself, instead of from the file it references. If the reference file is not a symbolic link, -R and -r are identical. This allows the BUGS entry in the manual page to be removed. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.bin/touch/touch.1 cvs rdiff -u -r1.38 -r1.39 src/usr.bin/touch/touch.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: andvar Date: Fri Feb 9 22:08:39 UTC 2024 Modified Files: src: UPDATING src/bin/sh: shell.h src/lib/libc/db/hash: README src/lib/libusbhid: usb_hid_usages src/lib/libwrap: diag.c src/sbin/dmctl: dmctl.c src/share/i18n/csmapper/JIS: JISX0212%UCS.src UCS%JISX0212.src src/sys/altq: altq_rmclass.c src/sys/arch/alpha/pci: cia_dma.c src/sys/arch/dreamcast/dev/microcode: aica_arm_locore.S src/sys/arch/evbarm/g42xxeb: g42xxeb_kmkbd.c src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c src/sys/arch/evbcf/evbcf: vectors.S src/sys/arch/ews4800mips/conf: std.ews4800mips src/sys/arch/m68k/include: mmu_40.h src/sys/arch/mips/mips: locore_mips1.S src/sys/arch/newsmips/dev: scsi_1185.c src/sys/arch/powerpc/booke/dev: pq3etsec.c src/sys/arch/riscv/riscv: locore.S src/sys/arch/sgimips/stand/common: iris_scsi.c src/sys/arch/shark/shark: scr.c src/sys/arch/sparc64/sparc64: pmap.c src/sys/arch/sun3/dev: if_ie.c src/sys/arch/x86/x86: consinit.c src/sys/arch/xen/xen: xpci_xenbus.c src/sys/arch/xen/xenbus: xenbus_dev.c src/sys/coda: coda_namecache.c src/sys/compat/linux/common: linux_inotify.c linux_prctl.h src/sys/conf: files src/sys/dev/hyperv: if_hvn.c if_hvnreg.h src/sys/dev/ic: ad1848.c cs89x0.c i82557.c i82586.c i82586var.h i8259reg.h interwavereg.h isp_netbsd.c mb89352reg.h mpt_debug.c mpt_netbsd.c oosiop.c smc83c170reg.h tcic2reg.h wd33c93.c wd33c93var.h src/sys/dev/isa: aps.c ess.c essreg.h gusreg.h sbreg.h src/sys/dev/marvell: mvspi.c mvxpsec.c src/sys/dev/microcode/aic7xxx: aic79xx.reg src/sys/dev/mii: ciphyreg.h ihphyreg.h lxtphyreg.h makphy.c tlphyreg.h src/sys/dev/nor: cfi_0002.h src/sys/dev/pci: ahc_pci.c arcmsrvar.h cz.c czreg.h esmvar.h if_alcreg.h if_alereg.h if_bce.c if_bge.c if_bgereg.h if_bnx.c if_bnxreg.h if_casvar.h if_dge.c if_enavar.h if_etreg.h if_ixl.c if_jmereg.h if_lii.c if_skreg.h if_tlregs.h if_vge.c if_vgereg.h if_vioif.c pciide_cy693_reg.h pciide_pdc202xx_reg.h pciide_piix_reg.h pucdata.c sv.c tga.c trm.c virtio.c yds.c src/sys/dev/pckbport: pckbd.c src/sys/dev/pcmcia: if_malo_pcmcia.c src/sys/dev/raidframe: rf_evenodd_dagfuncs.h src/sys/dev/scsipi: scsi_spc.h src/sys/dev/tc: sticio.h src/sys/dev/usb: ehci.c if_zyd.c ohci.c umcs.c usbdi.c src/sys/dev/wscons: wsdisplay_vcons.c src/sys/fs/puffs: puffs_msgif.c puffs_vnops.c src/sys/kern: gendevcalls.awk src/sys/netbt: rfcomm_session.c src/sys/netinet: sctp_asconf.c sctp_output.c sctp_usrreq.c src/sys/netinet6: in6_proto.c ip6_var.h src/sys/sys: swap.h src/sys/ufs/lfs: CHANGES src/sys/uvm: uvm_map.c src/tests/kernel: t_umount.sh src/usr.bin/m4: eval.c src/usr.bin/split: split.c src/usr.sbin/dumplfs: dumplfs.c src/usr.sbin/rpcbind: rpcb_svc_com.c Log Message: fix spelling mistakes, mainly in comments and log messages. To generate a diff of this commit: cvs rdiff -u -r1.344 -r1.345 src/UPDATING cvs rdiff -u -r1.31 -r1.32 src/bin/sh/shell.h cvs rdiff -u -r1.5 -r1.6 src/lib/libc/db/hash/README cvs rdiff -u -r1.7 -r1.8 src/lib/libusbhid/usb_hid_usages cvs rdiff -u -r1.17 -r1.18 src/lib/libwrap/diag.c cvs rdiff -u -r1.5 -r1.6 src/sbin/dmctl/dmctl.c cvs rdiff -u -r1.2 -r1.3 src/share/i18n/csmapper/JIS/JISX0212%UCS.src cvs rdiff -u -r1.3 -r1.4 src/share/i18n/csmapper/JIS/UCS%JISX0212.src cvs rdiff -u -r1.29 -r1.30 src/sys/altq/altq_rmclass.c cvs rdiff -u -r1.37 -r1.38 src/sys/arch/alpha/pci/cia_dma.c cvs rdiff -u -r1.6 -r1.7 \ src/sys/arch/dreamcast/dev/microcode/aica_arm_locore.S cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbcf/evbcf/vectors.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ews4800mips/conf/std.ews4800mips cvs rdiff -u -r1.2 -r1.3 src/sys/arch/m68k/include/mmu_40.h cvs rdiff -u -r1.98 -r1.99 src/sys/arch/mips/mips/locore_mips1.S cvs rdiff -u -r1.25 -r1.26 src/sys/arch/newsmips/dev/scsi_1185.c cvs rdiff -u -r1.58 -r1.59 src/sys/arch/powerpc/booke/dev/pq3etsec.c cvs rdiff -u -r1.44 -r1.45 src/sys/arch/riscv/riscv/locore.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sgimips/stand/common/iris_scsi.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/shark/shark/scr.c cvs rdiff -u -r1.318 -r1.319 src/sys/arch/sparc64/sparc64/pmap.c cvs rdiff -u -r1.73 -r1.74 src/sys/arch/sun3/dev/if_ie.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/x86/consinit.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/xen/xen/xpci_xenbus.c cvs rdiff -u -r1.18 -r1.19
CVS commit: src
Module Name:src Committed By: andvar Date: Fri Feb 9 22:08:39 UTC 2024 Modified Files: src: UPDATING src/bin/sh: shell.h src/lib/libc/db/hash: README src/lib/libusbhid: usb_hid_usages src/lib/libwrap: diag.c src/sbin/dmctl: dmctl.c src/share/i18n/csmapper/JIS: JISX0212%UCS.src UCS%JISX0212.src src/sys/altq: altq_rmclass.c src/sys/arch/alpha/pci: cia_dma.c src/sys/arch/dreamcast/dev/microcode: aica_arm_locore.S src/sys/arch/evbarm/g42xxeb: g42xxeb_kmkbd.c src/sys/arch/evbarm/npwr_fc: npwr_fc_machdep.c src/sys/arch/evbcf/evbcf: vectors.S src/sys/arch/ews4800mips/conf: std.ews4800mips src/sys/arch/m68k/include: mmu_40.h src/sys/arch/mips/mips: locore_mips1.S src/sys/arch/newsmips/dev: scsi_1185.c src/sys/arch/powerpc/booke/dev: pq3etsec.c src/sys/arch/riscv/riscv: locore.S src/sys/arch/sgimips/stand/common: iris_scsi.c src/sys/arch/shark/shark: scr.c src/sys/arch/sparc64/sparc64: pmap.c src/sys/arch/sun3/dev: if_ie.c src/sys/arch/x86/x86: consinit.c src/sys/arch/xen/xen: xpci_xenbus.c src/sys/arch/xen/xenbus: xenbus_dev.c src/sys/coda: coda_namecache.c src/sys/compat/linux/common: linux_inotify.c linux_prctl.h src/sys/conf: files src/sys/dev/hyperv: if_hvn.c if_hvnreg.h src/sys/dev/ic: ad1848.c cs89x0.c i82557.c i82586.c i82586var.h i8259reg.h interwavereg.h isp_netbsd.c mb89352reg.h mpt_debug.c mpt_netbsd.c oosiop.c smc83c170reg.h tcic2reg.h wd33c93.c wd33c93var.h src/sys/dev/isa: aps.c ess.c essreg.h gusreg.h sbreg.h src/sys/dev/marvell: mvspi.c mvxpsec.c src/sys/dev/microcode/aic7xxx: aic79xx.reg src/sys/dev/mii: ciphyreg.h ihphyreg.h lxtphyreg.h makphy.c tlphyreg.h src/sys/dev/nor: cfi_0002.h src/sys/dev/pci: ahc_pci.c arcmsrvar.h cz.c czreg.h esmvar.h if_alcreg.h if_alereg.h if_bce.c if_bge.c if_bgereg.h if_bnx.c if_bnxreg.h if_casvar.h if_dge.c if_enavar.h if_etreg.h if_ixl.c if_jmereg.h if_lii.c if_skreg.h if_tlregs.h if_vge.c if_vgereg.h if_vioif.c pciide_cy693_reg.h pciide_pdc202xx_reg.h pciide_piix_reg.h pucdata.c sv.c tga.c trm.c virtio.c yds.c src/sys/dev/pckbport: pckbd.c src/sys/dev/pcmcia: if_malo_pcmcia.c src/sys/dev/raidframe: rf_evenodd_dagfuncs.h src/sys/dev/scsipi: scsi_spc.h src/sys/dev/tc: sticio.h src/sys/dev/usb: ehci.c if_zyd.c ohci.c umcs.c usbdi.c src/sys/dev/wscons: wsdisplay_vcons.c src/sys/fs/puffs: puffs_msgif.c puffs_vnops.c src/sys/kern: gendevcalls.awk src/sys/netbt: rfcomm_session.c src/sys/netinet: sctp_asconf.c sctp_output.c sctp_usrreq.c src/sys/netinet6: in6_proto.c ip6_var.h src/sys/sys: swap.h src/sys/ufs/lfs: CHANGES src/sys/uvm: uvm_map.c src/tests/kernel: t_umount.sh src/usr.bin/m4: eval.c src/usr.bin/split: split.c src/usr.sbin/dumplfs: dumplfs.c src/usr.sbin/rpcbind: rpcb_svc_com.c Log Message: fix spelling mistakes, mainly in comments and log messages. To generate a diff of this commit: cvs rdiff -u -r1.344 -r1.345 src/UPDATING cvs rdiff -u -r1.31 -r1.32 src/bin/sh/shell.h cvs rdiff -u -r1.5 -r1.6 src/lib/libc/db/hash/README cvs rdiff -u -r1.7 -r1.8 src/lib/libusbhid/usb_hid_usages cvs rdiff -u -r1.17 -r1.18 src/lib/libwrap/diag.c cvs rdiff -u -r1.5 -r1.6 src/sbin/dmctl/dmctl.c cvs rdiff -u -r1.2 -r1.3 src/share/i18n/csmapper/JIS/JISX0212%UCS.src cvs rdiff -u -r1.3 -r1.4 src/share/i18n/csmapper/JIS/UCS%JISX0212.src cvs rdiff -u -r1.29 -r1.30 src/sys/altq/altq_rmclass.c cvs rdiff -u -r1.37 -r1.38 src/sys/arch/alpha/pci/cia_dma.c cvs rdiff -u -r1.6 -r1.7 \ src/sys/arch/dreamcast/dev/microcode/aica_arm_locore.S cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/g42xxeb/g42xxeb_kmkbd.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbarm/npwr_fc/npwr_fc_machdep.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbcf/evbcf/vectors.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/ews4800mips/conf/std.ews4800mips cvs rdiff -u -r1.2 -r1.3 src/sys/arch/m68k/include/mmu_40.h cvs rdiff -u -r1.98 -r1.99 src/sys/arch/mips/mips/locore_mips1.S cvs rdiff -u -r1.25 -r1.26 src/sys/arch/newsmips/dev/scsi_1185.c cvs rdiff -u -r1.58 -r1.59 src/sys/arch/powerpc/booke/dev/pq3etsec.c cvs rdiff -u -r1.44 -r1.45 src/sys/arch/riscv/riscv/locore.S cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sgimips/stand/common/iris_scsi.c cvs rdiff -u -r1.36 -r1.37 src/sys/arch/shark/shark/scr.c cvs rdiff -u -r1.318 -r1.319 src/sys/arch/sparc64/sparc64/pmap.c cvs rdiff -u -r1.73 -r1.74 src/sys/arch/sun3/dev/if_ie.c cvs rdiff -u -r1.38 -r1.39 src/sys/arch/x86/x86/consinit.c cvs rdiff -u -r1.25 -r1.26 src/sys/arch/xen/xen/xpci_xenbus.c cvs rdiff -u -r1.18 -r1.19
CVS commit: src/usr.sbin/faithd
Module Name:src Committed By: andvar Date: Fri Feb 9 20:55:15 UTC 2024 Modified Files: src/usr.sbin/faithd: ftp.c Log Message: s/connetion/connection/ in messages. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/faithd/ftp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/faithd
Module Name:src
Committed By: andvar
Date: Fri Feb 9 20:55:15 UTC 2024
Modified Files:
src/usr.sbin/faithd: ftp.c
Log Message:
s/connetion/connection/ in messages.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.sbin/faithd/ftp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/faithd/ftp.c
diff -u src/usr.sbin/faithd/ftp.c:1.19 src/usr.sbin/faithd/ftp.c:1.20
--- src/usr.sbin/faithd/ftp.c:1.19 Fri Nov 26 18:58:43 2010
+++ src/usr.sbin/faithd/ftp.c Fri Feb 9 20:55:15 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: ftp.c,v 1.19 2010/11/26 18:58:43 christos Exp $ */
+/* $NetBSD: ftp.c,v 1.20 2024/02/09 20:55:15 andvar Exp $ */
/* $KAME: ftp.c,v 1.23 2003/08/19 21:20:33 itojun Exp $ */
/*
@@ -422,7 +422,7 @@ ftp_copyresult(int src, int dst, enum st
if (!passivemode && rbuf[0] == '1') {
if (ftp_activeconn() < 0) {
n = snprintf(rbuf, sizeof(rbuf),
-"425 Cannot open data connetion\r\n");
+"425 Cannot open data connection\r\n");
if (n < 0 || n >= (int)sizeof(rbuf))
n = 0;
}
@@ -864,7 +864,7 @@ eprtparamfail:
*state = NONE;
if (ftp_passiveconn() < 0) {
return dprintf(src,
- "425 Cannot open data connetion\r\n");
+ "425 Cannot open data connection\r\n");
} else {
/* simply relay the command */
return write(dst, rbuf, (size_t)n);
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Fri Feb 9 18:39:53 UTC 2024 Modified Files: src/sys/arch/riscv/dev: plic_fdt.c src/sys/dev/pci: if_vmx.c Log Message: s/incompatiable/incompatible/ in error messages. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/dev/plic_fdt.c cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/if_vmx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: andvar
Date: Fri Feb 9 18:39:53 UTC 2024
Modified Files:
src/sys/arch/riscv/dev: plic_fdt.c
src/sys/dev/pci: if_vmx.c
Log Message:
s/incompatiable/incompatible/ in error messages.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/riscv/dev/plic_fdt.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/pci/if_vmx.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/riscv/dev/plic_fdt.c
diff -u src/sys/arch/riscv/dev/plic_fdt.c:1.4 src/sys/arch/riscv/dev/plic_fdt.c:1.5
--- src/sys/arch/riscv/dev/plic_fdt.c:1.4 Mon Jan 1 13:51:56 2024
+++ src/sys/arch/riscv/dev/plic_fdt.c Fri Feb 9 18:39:53 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: plic_fdt.c,v 1.4 2024/01/01 13:51:56 skrll Exp $ */
+/* $NetBSD: plic_fdt.c,v 1.5 2024/02/09 18:39:53 andvar Exp $ */
/*-
* Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: plic_fdt.c,v 1.4 2024/01/01 13:51:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plic_fdt.c,v 1.5 2024/02/09 18:39:53 andvar Exp $");
#include
@@ -117,7 +117,7 @@ plic_fdt_attach_source(device_t self, in
};
if (!of_compatible_match(xref, clint_compat_data)) {
- aprint_error_dev(self, "incompatiable CLINT "
+ aprint_error_dev(self, "incompatible CLINT "
"for PLIC for context %d\n", context);
return;
}
Index: src/sys/dev/pci/if_vmx.c
diff -u src/sys/dev/pci/if_vmx.c:1.13 src/sys/dev/pci/if_vmx.c:1.14
--- src/sys/dev/pci/if_vmx.c:1.13 Mon Aug 28 09:50:12 2023
+++ src/sys/dev/pci/if_vmx.c Fri Feb 9 18:39:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vmx.c,v 1.13 2023/08/28 09:50:12 msaitoh Exp $ */
+/* $NetBSD: if_vmx.c,v 1.14 2024/02/09 18:39:52 andvar Exp $ */
/* $OpenBSD: if_vmx.c,v 1.16 2014/01/22 06:04:17 brad Exp $ */
/*
@@ -19,7 +19,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.13 2023/08/28 09:50:12 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vmx.c,v 1.14 2024/02/09 18:39:52 andvar Exp $");
#ifdef _KERNEL_OPT
#include "opt_if_vmx.h"
@@ -754,7 +754,7 @@ vmxnet3_check_version(struct vmxnet3_sof
ver = vmxnet3_read_bar1(sc, VMXNET3_BAR1_UVRS);
if ((ver & 0x1) == 0) {
aprint_error_dev(sc->vmx_dev,
- "incompatiable UPT version 0x%x\n", ver);
+ "incompatible UPT version 0x%x\n", ver);
return (ENOTSUP);
}
vmxnet3_write_bar1(sc, VMXNET3_BAR1_UVRS, 1);
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Fri Feb 9 18:20:00 UTC 2024 Modified Files: src/sys/arch/mac68k/dev: adb_direct.c src/sys/dev/isa: pcppi.c src/sys/netinet: sctp_indata.c Log Message: s/anthing/anything/ and s/be to/too/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/arch/mac68k/dev/adb_direct.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/isa/pcppi.c cvs rdiff -u -r1.14 -r1.15 src/sys/netinet/sctp_indata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mac68k/dev/adb_direct.c diff -u src/sys/arch/mac68k/dev/adb_direct.c:1.69 src/sys/arch/mac68k/dev/adb_direct.c:1.70 --- src/sys/arch/mac68k/dev/adb_direct.c:1.69 Thu Sep 21 09:31:49 2023 +++ src/sys/arch/mac68k/dev/adb_direct.c Fri Feb 9 18:20:00 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: adb_direct.c,v 1.69 2023/09/21 09:31:49 msaitoh Exp $ */ +/* $NetBSD: adb_direct.c,v 1.70 2024/02/09 18:20:00 andvar Exp $ */ /* From: adb_direct.c 2.02 4/18/97 jpw */ @@ -62,7 +62,7 @@ #ifdef __NetBSD__ #include -__KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.69 2023/09/21 09:31:49 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: adb_direct.c,v 1.70 2024/02/09 18:20:00 andvar Exp $"); #include "opt_adb.h" @@ -2225,7 +2225,7 @@ adb_reinit(void) (Ptr)0, (short)command); delay(1000); - /* send TALK R3 - anthing at new address? */ + /* send TALK R3 - anything at new address? */ command = ADBTALK(saveptr, 3); send_string[0] = 0; result = adb_op_sync((Ptr)send_string, (Ptr)0, Index: src/sys/dev/isa/pcppi.c diff -u src/sys/dev/isa/pcppi.c:1.47 src/sys/dev/isa/pcppi.c:1.48 --- src/sys/dev/isa/pcppi.c:1.47 Sat Aug 7 16:19:12 2021 +++ src/sys/dev/isa/pcppi.c Fri Feb 9 18:20:00 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: pcppi.c,v 1.47 2021/08/07 16:19:12 thorpej Exp $ */ +/* $NetBSD: pcppi.c,v 1.48 2024/02/09 18:20:00 andvar Exp $ */ /* * Copyright (c) 1996 Carnegie-Mellon University. @@ -28,7 +28,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.47 2021/08/07 16:19:12 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pcppi.c,v 1.48 2024/02/09 18:20:00 andvar Exp $"); #include "attimer.h" @@ -118,7 +118,7 @@ pcppi_match(device_t parent, cfdata_t ma * * We don't want to have any chance of changing speaker output (which * this test might, if it crashes in the middle, or something; - * normally it's be to quick to produce anthing audible), but + * normally it's too quick to produce anything audible), but * many "combo chip" mock-PPI's don't seem to support the top bit * of Port B as a settable bit. The bottom bit has to be settable, * since the speaker driver hardware still uses it. Index: src/sys/netinet/sctp_indata.c diff -u src/sys/netinet/sctp_indata.c:1.14 src/sys/netinet/sctp_indata.c:1.15 --- src/sys/netinet/sctp_indata.c:1.14 Mon Jan 15 19:44:07 2024 +++ src/sys/netinet/sctp_indata.c Fri Feb 9 18:20:00 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: sctp_indata.c,v 1.14 2024/01/15 19:44:07 andvar Exp $ */ +/* $NetBSD: sctp_indata.c,v 1.15 2024/02/09 18:20:00 andvar Exp $ */ /* $KAME: sctp_indata.c,v 1.36 2005/03/06 16:04:17 itojun Exp $ */ /* @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sctp_indata.c,v 1.14 2024/01/15 19:44:07 andvar Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sctp_indata.c,v 1.15 2024/02/09 18:20:00 andvar Exp $"); #ifdef _KERNEL_OPT #include "opt_ipsec.h" @@ -1036,7 +1036,7 @@ sctp_is_all_msg_on_reasm(struct sctp_ass /* * Dump onto the re-assembly queue, in its proper place. After dumping on - * the queue, see if anthing can be delivered. If so pull it off (or as much + * the queue, see if anything can be delivered. If so pull it off (or as much * as we can. If we run out of space then we must dump what we can and set * the appropriate flag to say we queued what we could. */
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Fri Feb 9 18:20:00 UTC 2024 Modified Files: src/sys/arch/mac68k/dev: adb_direct.c src/sys/dev/isa: pcppi.c src/sys/netinet: sctp_indata.c Log Message: s/anthing/anything/ and s/be to/too/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.69 -r1.70 src/sys/arch/mac68k/dev/adb_direct.c cvs rdiff -u -r1.47 -r1.48 src/sys/dev/isa/pcppi.c cvs rdiff -u -r1.14 -r1.15 src/sys/netinet/sctp_indata.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Fri Feb 9 17:57:03 UTC 2024 Modified Files: src/sys/arch/mips/sibyte/dev: sbmac.c src/sys/dev/pci: arcmsr.c Log Message: s/firwmare/firmware/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/mips/sibyte/dev/sbmac.c cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/arcmsr.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/mips/sibyte/dev/sbmac.c diff -u src/sys/arch/mips/sibyte/dev/sbmac.c:1.65 src/sys/arch/mips/sibyte/dev/sbmac.c:1.66 --- src/sys/arch/mips/sibyte/dev/sbmac.c:1.65 Sun Sep 18 12:43:41 2022 +++ src/sys/arch/mips/sibyte/dev/sbmac.c Fri Feb 9 17:57:03 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: sbmac.c,v 1.65 2022/09/18 12:43:41 thorpej Exp $ */ +/* $NetBSD: sbmac.c,v 1.66 2024/02/09 17:57:03 andvar Exp $ */ /* * Copyright 2000, 2001, 2004 @@ -33,7 +33,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.65 2022/09/18 12:43:41 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sbmac.c,v 1.66 2024/02/09 17:57:03 andvar Exp $"); #include "opt_inet.h" #include "opt_ns.h" @@ -2249,7 +2249,7 @@ sbmac_attach(device_t parent, device_t s callout_init(&(sc->sc_tick_ch), 0); /* - * Read the ethernet address. The firwmare left this programmed + * Read the ethernet address. The firmware left this programmed * for us in the ethernet address register for each mac. */ Index: src/sys/dev/pci/arcmsr.c diff -u src/sys/dev/pci/arcmsr.c:1.44 src/sys/dev/pci/arcmsr.c:1.45 --- src/sys/dev/pci/arcmsr.c:1.44 Sun Sep 25 17:52:25 2022 +++ src/sys/dev/pci/arcmsr.c Fri Feb 9 17:57:03 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: arcmsr.c,v 1.44 2022/09/25 17:52:25 thorpej Exp $ */ +/* $NetBSD: arcmsr.c,v 1.45 2024/02/09 17:57:03 andvar Exp $ */ /* $OpenBSD: arc.c,v 1.68 2007/10/27 03:28:27 dlg Exp $ */ /* @@ -21,7 +21,7 @@ #include "bio.h" #include -__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.44 2022/09/25 17:52:25 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: arcmsr.c,v 1.45 2024/02/09 17:57:03 andvar Exp $"); #include #include @@ -1499,7 +1499,7 @@ arc_bio_disk_filldata(struct arc_softc * #endif /* - * the firwmare doesnt seem to fill scsi_attr in, so fake it with + * the firmware doesn't seem to fill scsi_attr in, so fake it with * the diskid. */ bd->bd_channel = 0;
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Fri Feb 9 17:57:03 UTC 2024 Modified Files: src/sys/arch/mips/sibyte/dev: sbmac.c src/sys/dev/pci: arcmsr.c Log Message: s/firwmare/firmware/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/mips/sibyte/dev/sbmac.c cvs rdiff -u -r1.44 -r1.45 src/sys/dev/pci/arcmsr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: andvar
Date: Fri Feb 9 17:39:34 UTC 2024
Modified Files:
src/sys/arch/acorn32/stand/boot32: start.S
src/sys/dev/pci: cxdtv.c
src/sys/dev/qbus: if_qereg.h
Log Message:
s/discriptor/descriptor/ in comments.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn32/stand/boot32/start.S
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/cxdtv.c
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/qbus/if_qereg.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/acorn32/stand/boot32/start.S
diff -u src/sys/arch/acorn32/stand/boot32/start.S:1.5 src/sys/arch/acorn32/stand/boot32/start.S:1.6
--- src/sys/arch/acorn32/stand/boot32/start.S:1.5 Fri Aug 20 20:25:26 2021
+++ src/sys/arch/acorn32/stand/boot32/start.S Fri Feb 9 17:39:33 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: start.S,v 1.5 2021/08/20 20:25:26 andvar Exp $ */
+/* $NetBSD: start.S,v 1.6 2024/02/09 17:39:33 andvar Exp $ */
/*
* Copyright (c) 2002 Reinoud Zandijk
@@ -247,7 +247,7 @@ flush_ID_cache_try:
add r1, r1, r7 /* add offset*/
mov r0, r2 /* put configuration structure in r0 */
mov r2, r3
- mov r3, r4 /* L1 page discriptor */
+ mov r3, r4 /* L1 page descriptor */
mov r4, r5 /* kernel entry point */
mov pc, r9 /* jump to page addr == relocate_code */
Index: src/sys/dev/pci/cxdtv.c
diff -u src/sys/dev/pci/cxdtv.c:1.21 src/sys/dev/pci/cxdtv.c:1.22
--- src/sys/dev/pci/cxdtv.c:1.21 Wed May 10 00:11:32 2023
+++ src/sys/dev/pci/cxdtv.c Fri Feb 9 17:39:33 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: cxdtv.c,v 1.21 2023/05/10 00:11:32 riastradh Exp $ */
+/* $NetBSD: cxdtv.c,v 1.22 2024/02/09 17:39:33 andvar Exp $ */
/*
* Copyright (c) 2008, 2011 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.21 2023/05/10 00:11:32 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cxdtv.c,v 1.22 2024/02/09 17:39:33 andvar Exp $");
#include
#include
@@ -139,7 +139,7 @@ static struct cxdtv_sram_ch cxdtv_sram_c
.csc_iq = 0x180340, /* after last CMDS */
.csc_iqsz = 0x40, /* 16 dwords */
.csc_cdt = 0x180380, /* after iq */
- .csc_cdtsz = 0x40, /* cluster discriptor space */
+ .csc_cdtsz = 0x40, /* cluster descriptor space */
.csc_fifo = 0x180400, /* after cdt */
.csc_fifosz = 0x001C00, /* let's just align this up */
.csc_risc = 0x182000, /* after fifo */
Index: src/sys/dev/qbus/if_qereg.h
diff -u src/sys/dev/qbus/if_qereg.h:1.9 src/sys/dev/qbus/if_qereg.h:1.10
--- src/sys/dev/qbus/if_qereg.h:1.9 Sun Dec 11 12:23:29 2005
+++ src/sys/dev/qbus/if_qereg.h Fri Feb 9 17:39:34 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: if_qereg.h,v 1.9 2005/12/11 12:23:29 christos Exp $ */
+/* $NetBSD: if_qereg.h,v 1.10 2024/02/09 17:39:34 andvar Exp $ */
/*
* Copyright (c) 1988 Regents of the University of California.
* All rights reserved.
@@ -114,7 +114,7 @@ struct qedevice {
#define QE_RCV_INT 0x8000 /* Receiver interrupt */
/*
- * Transmit and receive ring discriptor ---
+ * Transmit and receive ring descriptor ---
*
* The QNA uses the flag, status1 and the valid bit as a handshake/semiphore
* mechinism.
CVS commit: src/sys
Module Name:src Committed By: andvar Date: Fri Feb 9 17:39:34 UTC 2024 Modified Files: src/sys/arch/acorn32/stand/boot32: start.S src/sys/dev/pci: cxdtv.c src/sys/dev/qbus: if_qereg.h Log Message: s/discriptor/descriptor/ in comments. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/acorn32/stand/boot32/start.S cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/cxdtv.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/qbus/if_qereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: uwe Date: Fri Feb 9 17:24:45 UTC 2024 Modified Files: src/lib/libc/gen: signal.3 Log Message: signal(3): mention old signal(2) syscall in HISTORY To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/lib/libc/gen/signal.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: uwe Date: Fri Feb 9 17:24:45 UTC 2024 Modified Files: src/lib/libc/gen: signal.3 Log Message: signal(3): mention old signal(2) syscall in HISTORY To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/lib/libc/gen/signal.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/gen/signal.3 diff -u src/lib/libc/gen/signal.3:1.29 src/lib/libc/gen/signal.3:1.30 --- src/lib/libc/gen/signal.3:1.29 Sat Aug 7 03:17:23 2021 +++ src/lib/libc/gen/signal.3 Fri Feb 9 17:24:44 2024 @@ -1,4 +1,4 @@ -.\" $NetBSD: signal.3,v 1.29 2021/08/07 03:17:23 dholland Exp $ +.\" $NetBSD: signal.3,v 1.30 2024/02/09 17:24:44 uwe Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -190,3 +190,11 @@ This .Fn signal facility appeared in .Bx 4.0 . +.Pp +The +.Fn signal +facility used to be a system call that implemented a different +semantics +.Dq ( old signals ) . +It first appeared in +.At v4 .
CVS commit: src/sys/dev
Module Name:src
Committed By: skrll
Date: Fri Feb 9 17:16:42 UTC 2024
Modified Files:
src/sys/dev/fdt: dwcmmc_fdt.c
src/sys/dev/ic: dwc_mmc.c
Log Message:
Restrict dwcmmc to 32bit DMA (<4GB) regardless of attachment
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/fdt/dwcmmc_fdt.c
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/dwc_mmc.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/fdt/dwcmmc_fdt.c
diff -u src/sys/dev/fdt/dwcmmc_fdt.c:1.22 src/sys/dev/fdt/dwcmmc_fdt.c:1.23
--- src/sys/dev/fdt/dwcmmc_fdt.c:1.22 Fri Feb 9 08:50:52 2024
+++ src/sys/dev/fdt/dwcmmc_fdt.c Fri Feb 9 17:16:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dwcmmc_fdt.c,v 1.22 2024/02/09 08:50:52 skrll Exp $ */
+/* $NetBSD: dwcmmc_fdt.c,v 1.23 2024/02/09 17:16:42 skrll Exp $ */
/*-
* Copyright (c) 2015-2018 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.22 2024/02/09 08:50:52 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.23 2024/02/09 17:16:42 skrll Exp $");
#include
#include
@@ -149,16 +149,7 @@ dwcmmc_fdt_attach(device_t parent, devic
sc->sc_dev = self;
sc->sc_bst = faa->faa_bst;
- if (sizeof(bus_addr_t) > 4) {
- error = bus_dmatag_subregion(faa->faa_dmat, 0, __MASK(32),
- >sc_dmat, BUS_DMA_WAITOK);
- if (error != 0) {
- aprint_error(": couldn't create DMA tag: %d\n", error);
- return;
- }
- } else {
- sc->sc_dmat = faa->faa_dmat;
- }
+ sc->sc_dmat = faa->faa_dmat;
error = bus_space_map(sc->sc_bst, addr, size, 0, >sc_bsh);
if (error) {
aprint_error(": couldn't map %#" PRIx64 ": %d\n",
Index: src/sys/dev/ic/dwc_mmc.c
diff -u src/sys/dev/ic/dwc_mmc.c:1.30 src/sys/dev/ic/dwc_mmc.c:1.31
--- src/sys/dev/ic/dwc_mmc.c:1.30 Fri Feb 9 16:57:11 2024
+++ src/sys/dev/ic/dwc_mmc.c Fri Feb 9 17:16:42 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_mmc.c,v 1.30 2024/02/09 16:57:11 skrll Exp $ */
+/* $NetBSD: dwc_mmc.c,v 1.31 2024/02/09 17:16:42 skrll Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.30 2024/02/09 16:57:11 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.31 2024/02/09 17:16:42 skrll Exp $");
#include
#include
@@ -837,6 +837,16 @@ dwc_mmc_init(struct dwc_mmc_softc *sc)
val = MMC_READ(sc, DWC_MMC_VERID);
sc->sc_verid = __SHIFTOUT(val, DWC_MMC_VERID_ID);
+ if (sizeof(bus_addr_t) > 4) {
+ int error = bus_dmatag_subregion(sc->sc_dmat, 0, __MASK(32),
+ >sc_dmat, BUS_DMA_WAITOK);
+ if (error != 0) {
+ aprint_error_dev(sc->sc_dev,
+ "failed to create DMA subregion\n");
+ return ENOMEM;
+ }
+ }
+
if (sc->sc_fifo_reg == 0) {
if (sc->sc_verid < DWC_MMC_VERID_240A)
sc->sc_fifo_reg = 0x100;
CVS commit: src/sys/dev
Module Name:src Committed By: skrll Date: Fri Feb 9 17:16:42 UTC 2024 Modified Files: src/sys/dev/fdt: dwcmmc_fdt.c src/sys/dev/ic: dwc_mmc.c Log Message: Restrict dwcmmc to 32bit DMA (<4GB) regardless of attachment To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/sys/dev/fdt/dwcmmc_fdt.c cvs rdiff -u -r1.30 -r1.31 src/sys/dev/ic/dwc_mmc.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/ic
Module Name:src Committed By: skrll Date: Fri Feb 9 16:57:11 UTC 2024 Modified Files: src/sys/dev/ic: dwc_mmc.c Log Message: Fix a typo in a comment To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/dwc_mmc.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/ic
Module Name:src
Committed By: skrll
Date: Fri Feb 9 16:57:11 UTC 2024
Modified Files:
src/sys/dev/ic: dwc_mmc.c
Log Message:
Fix a typo in a comment
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/dwc_mmc.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/ic/dwc_mmc.c
diff -u src/sys/dev/ic/dwc_mmc.c:1.29 src/sys/dev/ic/dwc_mmc.c:1.30
--- src/sys/dev/ic/dwc_mmc.c:1.29 Sun Jan 9 15:03:43 2022
+++ src/sys/dev/ic/dwc_mmc.c Fri Feb 9 16:57:11 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_mmc.c,v 1.29 2022/01/09 15:03:43 jmcneill Exp $ */
+/* $NetBSD: dwc_mmc.c,v 1.30 2024/02/09 16:57:11 skrll Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.29 2022/01/09 15:03:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc_mmc.c,v 1.30 2024/02/09 16:57:11 skrll Exp $");
#include
#include
@@ -477,7 +477,7 @@ dwc_mmc_dma_prepare(struct dwc_mmc_softc
uint32_t val;
/*
- * If the command includs a dma map use it, otherwise we need to
+ * If the command includes a dma map use it, otherwise we need to
* bounce. This can happen for SDIO IO_RW_EXTENDED (CMD53) commands.
*/
if (cmd->c_dmamap) {
CVS commit: src/sys/dev/ic
Module Name:src Committed By: skrll Date: Fri Feb 9 16:56:23 UTC 2024 Modified Files: src/sys/dev/ic: dw_hdmi.c dwiic.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/dw_hdmi.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/dwiic.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/ic/dw_hdmi.c diff -u src/sys/dev/ic/dw_hdmi.c:1.11 src/sys/dev/ic/dw_hdmi.c:1.12 --- src/sys/dev/ic/dw_hdmi.c:1.11 Mon Dec 11 13:29:03 2023 +++ src/sys/dev/ic/dw_hdmi.c Fri Feb 9 16:56:23 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: dw_hdmi.c,v 1.11 2023/12/11 13:29:03 mlelstv Exp $ */ +/* $NetBSD: dw_hdmi.c,v 1.12 2024/02/09 16:56:23 skrll Exp $ */ /*- * Copyright (c) 2019 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dw_hdmi.c,v 1.11 2023/12/11 13:29:03 mlelstv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dw_hdmi.c,v 1.12 2024/02/09 16:56:23 skrll Exp $"); #include #include @@ -531,7 +531,7 @@ dwhdmi_audio_init(struct dwhdmi_softc *s val &= ~HDMI_AUD_CONF0_I2S_IN_EN; val |= __SHIFTIN(1, HDMI_AUD_CONF0_I2S_IN_EN); /* XXX 2ch */ dwhdmi_write(sc, HDMI_AUD_CONF0, val); - + val = __SHIFTIN(16, HDMI_AUD_CONF1_I2S_WIDTH); dwhdmi_write(sc, HDMI_AUD_CONF1, val); Index: src/sys/dev/ic/dwiic.c diff -u src/sys/dev/ic/dwiic.c:1.9 src/sys/dev/ic/dwiic.c:1.10 --- src/sys/dev/ic/dwiic.c:1.9 Wed Oct 19 22:34:10 2022 +++ src/sys/dev/ic/dwiic.c Fri Feb 9 16:56:23 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: dwiic.c,v 1.9 2022/10/19 22:34:10 riastradh Exp $ */ +/* $NetBSD: dwiic.c,v 1.10 2024/02/09 16:56:23 skrll Exp $ */ /* $OpenBSD: dwiic.c,v 1.4 2018/05/23 22:08:00 kettenis Exp $ */ @@ -49,7 +49,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dwiic.c,v 1.9 2022/10/19 22:34:10 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwiic.c,v 1.10 2024/02/09 16:56:23 skrll Exp $"); #include @@ -163,7 +163,7 @@ dwiic_attach(struct dwiic_softc *sc) } /* fetch timing parameters */ - if (sc->ss_hcnt == 0) + if (sc->ss_hcnt == 0) sc->ss_hcnt = dwiic_read(sc, DW_IC_SS_SCL_HCNT); if (sc->ss_lcnt == 0) sc->ss_lcnt = dwiic_read(sc, DW_IC_SS_SCL_LCNT);
CVS commit: src/sys/dev/ic
Module Name:src Committed By: skrll Date: Fri Feb 9 16:56:23 UTC 2024 Modified Files: src/sys/dev/ic: dw_hdmi.c dwiic.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/dev/ic/dw_hdmi.c cvs rdiff -u -r1.9 -r1.10 src/sys/dev/ic/dwiic.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/acpi
Module Name:src Committed By: skrll Date: Fri Feb 9 16:53:15 UTC 2024 Modified Files: src/sys/dev/acpi: dwcmmc_acpi.c Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/dwcmmc_acpi.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/acpi/dwcmmc_acpi.c diff -u src/sys/dev/acpi/dwcmmc_acpi.c:1.2 src/sys/dev/acpi/dwcmmc_acpi.c:1.3 --- src/sys/dev/acpi/dwcmmc_acpi.c:1.2 Sun Feb 6 15:48:12 2022 +++ src/sys/dev/acpi/dwcmmc_acpi.c Fri Feb 9 16:53:15 2024 @@ -1,4 +1,4 @@ -/* $NetBSD: dwcmmc_acpi.c,v 1.2 2022/02/06 15:48:12 jmcneill Exp $ */ +/* $NetBSD: dwcmmc_acpi.c,v 1.3 2024/02/09 16:53:15 skrll Exp $ */ /*- * Copyright (c) 2022 Jared McNeill @@ -27,16 +27,16 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: dwcmmc_acpi.c,v 1.2 2022/02/06 15:48:12 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dwcmmc_acpi.c,v 1.3 2024/02/09 16:53:15 skrll Exp $"); #include #include #include #include -#include -#include -#include +#include +#include +#include #include #include
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: skrll Date: Fri Feb 9 16:53:15 UTC 2024 Modified Files: src/sys/dev/acpi: dwcmmc_acpi.c Log Message: Trailing whitespace. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/acpi/dwcmmc_acpi.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/hp300/stand/mkboot
Module Name:src
Committed By: christos
Date: Fri Feb 9 16:18:12 UTC 2024
Modified Files:
src/sys/arch/hp300/stand/mkboot: mkboot.c
Log Message:
fix usage string, improve error handling.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/mkboot/mkboot.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/hp300/stand/mkboot/mkboot.c
diff -u src/sys/arch/hp300/stand/mkboot/mkboot.c:1.12 src/sys/arch/hp300/stand/mkboot/mkboot.c:1.13
--- src/sys/arch/hp300/stand/mkboot/mkboot.c:1.12 Thu Feb 8 13:10:34 2024
+++ src/sys/arch/hp300/stand/mkboot/mkboot.c Fri Feb 9 11:18:12 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mkboot.c,v 1.12 2024/02/08 18:10:34 christos Exp $ */
+/* $NetBSD: mkboot.c,v 1.13 2024/02/09 16:18:12 christos Exp $ */
/*
* Copyright (c) 1990, 1993
@@ -47,7 +47,7 @@ __COPYRIGHT(
#ifdef notdef
static char sccsid[] = "@(#)mkboot.c 7.2 (Berkeley) 12/16/90";
#endif
-__RCSID("$NetBSD: mkboot.c,v 1.12 2024/02/08 18:10:34 christos Exp $");
+__RCSID("$NetBSD: mkboot.c,v 1.13 2024/02/09 16:18:12 christos Exp $");
#endif /* not lint */
#include
@@ -215,7 +215,7 @@ main(int argc, char **argv)
write(to, , LIF_VOLSIZE);
lseek(to, LIF_DIRSTART, SEEK_SET);
write(to, lifd, LIF_DIRSIZE);
- exit(0);
+ return EXIT_SUCCESS;
}
int
@@ -223,21 +223,18 @@ putfile(char *from, int to)
{
int fd;
struct stat statb;
- int nr;
+ ssize_t nr;
void *bp;
- if ((fd = open(from, 0)) < 0) {
- printf("error: unable to open file %s\n", from);
- exit(1);
- }
+ if ((fd = open(from, 0)) < 0)
+ err(EXIT_FAILURE, "Unable to open file `%s'", from);
fstat(fd, );
ld.address = htobe32(loadpoint);
ld.count = htobe32(statb.st_size);
- bp = malloc(statb.st_size);
- if ((nr = read(fd, bp, statb.st_size)) < 0) {
- printf("error: reading from file %s\n", from);
- exit(1);
- }
+ if ((bp = malloc(statb.st_size)) == NULL)
+ err(EXIT_FAILURE, "Can't allocate buffer");
+ if (read(fd, bp, statb.st_size) < 0)
+ err(EXIT_FAILURE, "Error reading from file `%s'", from);
(void)close(fd);
write(to, , sizeof(ld));
write(to, bp, statb.st_size);
@@ -249,8 +246,9 @@ void
usage(void)
{
- fprintf(stderr, "Usage: %s -l ] prog1 [ prog2 ] outfile\n", getprogname());
- exit(1);
+ fprintf(stderr, "Usage: %s -l [-t ] prog1 "
+ "[ prog2 ] outfile\n", getprogname());
+ exit(EXIT_FAILURE);
}
char *
CVS commit: src/sys/arch/hp300/stand/mkboot
Module Name:src Committed By: christos Date: Fri Feb 9 16:18:12 UTC 2024 Modified Files: src/sys/arch/hp300/stand/mkboot: mkboot.c Log Message: fix usage string, improve error handling. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/hp300/stand/mkboot/mkboot.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/sandpoint/stand/altboot
Module Name:src
Committed By: christos
Date: Fri Feb 9 16:12:02 UTC 2024
Modified Files:
src/sys/arch/sandpoint/stand/altboot: Makefile
Log Message:
PR/57915: Jan-Benedict Glaw: Use $MKREPRO_TIMESTAMP for repro builds in uBoot
images
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/stand/altboot/Makefile
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/sandpoint/stand/altboot/Makefile
diff -u src/sys/arch/sandpoint/stand/altboot/Makefile:1.18 src/sys/arch/sandpoint/stand/altboot/Makefile:1.19
--- src/sys/arch/sandpoint/stand/altboot/Makefile:1.18 Tue Mar 23 22:53:16 2021
+++ src/sys/arch/sandpoint/stand/altboot/Makefile Fri Feb 9 11:12:02 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2021/03/24 02:53:16 rin Exp $
+# $NetBSD: Makefile,v 1.19 2024/02/09 16:12:02 christos Exp $
S= ${.CURDIR}/../../../..
@@ -56,13 +56,19 @@ cleandir distclean: .WAIT cleanlibdir
cleanlibdir:
-rm -rf lib
+.if ${MKREPRO_TIMESTAMP:Uno} != "no"
+MKUBOOTIMAGE_TIMESTAMP=-t "${MKREPRO_TIMESTAMP}"
+.endif
+
${PROG}: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${_MKTARGET_LINK}
${LD} -N -Ttext ${RELOC} -Bstatic -e ${ENTRY} -o ${PROG} \
${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
${OBJCOPY} -S -O binary ${PROG} ${PROG}.bin
${TOOL_MKUBOOTIMAGE} -A powerpc -T kernel -C none -O linux \
- -a 0x${RELOC} -n ${PROG} ${PROG}.bin ${PROG}.img
+ -a 0x${RELOC} ${MKUBOOTIMAGE_TIMESTAMP} -n ${PROG} \
+ ${PROG}.bin ${PROG}.img
+
VERSIONFLAGS+=-k
.include "${S}/conf/newvers_stand.mk"
CVS commit: src/sys/arch/sandpoint/stand/altboot
Module Name:src Committed By: christos Date: Fri Feb 9 16:12:02 UTC 2024 Modified Files: src/sys/arch/sandpoint/stand/altboot: Makefile Log Message: PR/57915: Jan-Benedict Glaw: Use $MKREPRO_TIMESTAMP for repro builds in uBoot images To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sandpoint/stand/altboot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/mkubootimage
Module Name:src
Committed By: christos
Date: Fri Feb 9 16:10:18 UTC 2024
Modified Files:
src/usr.bin/mkubootimage: crc32.c mkubootimage.1 mkubootimage.c
Added Files:
src/usr.bin/mkubootimage: crc32.h
Log Message:
PR/57914: Jan-Benedict Glaw: Set reproducible timestamp
Cleanup lint.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/mkubootimage/crc32.c
cvs rdiff -u -r0 -r1.1 src/usr.bin/mkubootimage/crc32.h
cvs rdiff -u -r1.14 -r1.15 src/usr.bin/mkubootimage/mkubootimage.1
cvs rdiff -u -r1.30 -r1.31 src/usr.bin/mkubootimage/mkubootimage.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/mkubootimage/crc32.c
diff -u src/usr.bin/mkubootimage/crc32.c:1.4 src/usr.bin/mkubootimage/crc32.c:1.5
--- src/usr.bin/mkubootimage/crc32.c:1.4 Sat Dec 29 11:18:08 2012
+++ src/usr.bin/mkubootimage/crc32.c Fri Feb 9 11:10:18 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: crc32.c,v 1.4 2012/12/29 16:18:08 jmcneill Exp $ */
+/* $NetBSD: crc32.c,v 1.5 2024/02/09 16:10:18 christos Exp $ */
/*-
* Copyright (c) 2002 Marcel Moolenaar
@@ -33,14 +33,12 @@
#endif
#include
-__RCSID("$NetBSD: crc32.c,v 1.4 2012/12/29 16:18:08 jmcneill Exp $");
+__RCSID("$NetBSD: crc32.c,v 1.5 2024/02/09 16:10:18 christos Exp $");
#include
#include
#include
-
-uint32_t crc32(const void *, size_t);
-uint32_t crc32v(const struct iovec *, int);
+#include "crc32.h"
static uint32_t crc32_tab[] = {
0x, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
@@ -99,6 +97,7 @@ crc32v(const struct iovec *iov, int cnt)
for (i = 0; i < cnt; i++) {
p = iov[i].iov_base;
+/*###102 [lint] warning conversion from 'unsigned long' to 'int' may lose accuracy [132]%%%*/
len = iov[i].iov_len;
while (len--)
crc = crc32_tab[(crc ^ *p++) & 0xFF] ^ (crc >> 8);
Index: src/usr.bin/mkubootimage/mkubootimage.1
diff -u src/usr.bin/mkubootimage/mkubootimage.1:1.14 src/usr.bin/mkubootimage/mkubootimage.1:1.15
--- src/usr.bin/mkubootimage/mkubootimage.1:1.14 Sat Dec 7 07:34:17 2019
+++ src/usr.bin/mkubootimage/mkubootimage.1 Fri Feb 9 11:10:18 2024
@@ -1,4 +1,4 @@
-.\" $NetBSD: mkubootimage.1,v 1.14 2019/12/07 12:34:17 wiz Exp $
+.\" $NetBSD: mkubootimage.1,v 1.15 2024/02/09 16:10:18 christos Exp $
.\"
.\" Copyright (c) 2012 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 December 4, 2019
+.Dd February 7, 2024
.Dt MKUBOOTIMAGE 1
.Os
.Sh NAME
@@ -119,6 +119,9 @@ This is required.
Defines the operating system type.
The default OS name is
.Qq netbsd .
+.It Fl t Ar epoch
+Use given epoch timestamp as image creation time.
+(This is only used for legacy U-Boot images.)
.It Fl T No ( fs Ns | Ns kernel Ns | Ns kernel_noload Ns | Ns ramdisk Ns | Ns script Ns | Ns standalone )
Defines the image type.
This is required for
Index: src/usr.bin/mkubootimage/mkubootimage.c
diff -u src/usr.bin/mkubootimage/mkubootimage.c:1.30 src/usr.bin/mkubootimage/mkubootimage.c:1.31
--- src/usr.bin/mkubootimage/mkubootimage.c:1.30 Sat Feb 8 08:27:00 2020
+++ src/usr.bin/mkubootimage/mkubootimage.c Fri Feb 9 11:10:18 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: mkubootimage.c,v 1.30 2020/02/08 13:27:00 ryo Exp $ */
+/* $NetBSD: mkubootimage.c,v 1.31 2024/02/09 16:10:18 christos Exp $ */
/*-
* Copyright (c) 2010 Jared D. McNeill
@@ -30,7 +30,7 @@
#endif
#include
-__RCSID("$NetBSD: mkubootimage.c,v 1.30 2020/02/08 13:27:00 ryo Exp $");
+__RCSID("$NetBSD: mkubootimage.c,v 1.31 2024/02/09 16:10:18 christos Exp $");
#include
#include
@@ -51,6 +51,7 @@ __RCSID("$NetBSD: mkubootimage.c,v 1.30
#include "uboot.h"
#include "arm64.h"
+#include "crc32.h"
#ifndef __arraycount
#define __arraycount(__x) (sizeof(__x) / sizeof(__x[0]))
@@ -62,9 +63,6 @@ enum image_format {
FMT_ARM64, /* Linux ARM64 image (booti) */
};
-extern uint32_t crc32(const void *, size_t);
-extern uint32_t crc32v(const struct iovec *, int);
-
static enum uboot_image_os image_os = IH_OS_NETBSD;
static enum uboot_image_arch image_arch = IH_ARCH_UNKNOWN;
static enum uboot_image_type image_type = IH_TYPE_UNKNOWN;
@@ -264,12 +262,12 @@ get_comp_name(enum uboot_image_comp comp
__dead static void
usage(void)
{
- fprintf(stderr, "usage: mkubootimage [-hu] -A "
- " -a address\n");
- fprintf(stderr, "\t-C [-E address] [-e address]\n");
- fprintf(stderr, "\t[-f ] [-m magic] -n image -O \n");
- fprintf(stderr, "\t-T \n");
- fprintf(stderr, "\tsource destination\n");
+ fprintf(stderr,
+"Usage: %s [-hu] -A -a address\n"
+"\t-C [-E address] [-e address] [-t timestamp]\n"
+"\t[-f ] [-m magic] -n image -O \n"
+"\t-T \n"
+"\tsource destination\n", getprogname());
exit(EXIT_FAILURE);
}
@@ -298,7 +296,8 @@ dump_header_uimg(struct uboot_image_head
}
static int
CVS commit: src/usr.bin/mkubootimage
Module Name:src Committed By: christos Date: Fri Feb 9 16:10:18 UTC 2024 Modified Files: src/usr.bin/mkubootimage: crc32.c mkubootimage.1 mkubootimage.c Added Files: src/usr.bin/mkubootimage: crc32.h Log Message: PR/57914: Jan-Benedict Glaw: Set reproducible timestamp Cleanup lint. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/mkubootimage/crc32.c cvs rdiff -u -r0 -r1.1 src/usr.bin/mkubootimage/crc32.h cvs rdiff -u -r1.14 -r1.15 src/usr.bin/mkubootimage/mkubootimage.1 cvs rdiff -u -r1.30 -r1.31 src/usr.bin/mkubootimage/mkubootimage.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/acorn32
Module Name:src Committed By: christos Date: Fri Feb 9 15:34:34 UTC 2024 Modified Files: src/distrib/acorn32: mksparkive.sh Log Message: PR/57913: Jan-Benedict Glaw: Don't embed build timestamp into archive While here, modernize backquotes. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/distrib/acorn32/mksparkive.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/acorn32
Module Name:src
Committed By: christos
Date: Fri Feb 9 15:34:34 UTC 2024
Modified Files:
src/distrib/acorn32: mksparkive.sh
Log Message:
PR/57913: Jan-Benedict Glaw: Don't embed build timestamp into archive
While here, modernize backquotes.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/distrib/acorn32/mksparkive.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/acorn32/mksparkive.sh
diff -u src/distrib/acorn32/mksparkive.sh:1.8 src/distrib/acorn32/mksparkive.sh:1.9
--- src/distrib/acorn32/mksparkive.sh:1.8 Wed Apr 30 09:10:47 2008
+++ src/distrib/acorn32/mksparkive.sh Fri Feb 9 10:34:34 2024
@@ -1,5 +1,5 @@
#!/bin/sh -e
-# $NetBSD: mksparkive.sh,v 1.8 2008/04/30 13:10:47 martin Exp $
+# $NetBSD: mksparkive.sh,v 1.9 2024/02/09 15:34:34 christos Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -63,8 +63,8 @@ print2()
then
exit 1
fi
- lowbyte=`expr $1 % 256 | xargs printf %02x`
- highbyte=`expr $1 / 256 | xargs printf %02x`
+ lowbyte=$(expr $1 % 256 | xargs printf %02x)
+ highbyte=$(expr $1 / 256 | xargs printf %02x)
printf "\x$lowbyte\x$highbyte"
}
@@ -74,8 +74,8 @@ print4()
then
exit 1
fi
- print2 `expr $1 % 65536`
- print2 `expr $1 / 65536`
+ print2 $(expr $1 % 65536)
+ print2 $(expr $1 / 65536)
}
makeheader()
@@ -83,18 +83,19 @@ makeheader()
filename="$1"
statfilename="$2"
realfilename="$3"
- filetype=`printf %03s "$4"`
+ filetype=$(printf %03s "$4")
compressed="$5"
# length is only passed to length4, so we don't need to worry about
# extracting only the length here.
- length=`wc -c "$filename"`
- eval `${TOOL_STAT} -s "$statfilename"`
+ length=$(wc -c "$filename")
+ eval $(${TOOL_STAT} -s "$statfilename")
+ [ -n "${MKREPRO_TIMESTAMP}" ] && st_mtime=${MKREPRO_TIMESTAMP}
# centiseconds since 1st Jan 1900
- timestamp=`expr $st_mtime \* 100 + 22089888`
- lowtype=`echo "$filetype" | sed s/.//`
- hightype=`echo "$filetype" | sed s/..\$//`
- highdate=`expr $timestamp / 4294967296 | xargs printf %02x`
- lowdate=`expr $timestamp % 4294967296`
+ timestamp=$(expr $st_mtime \* 100 + 22089888)
+ lowtype=$(echo "$filetype" | sed s/.//)
+ hightype=$(echo "$filetype" | sed s/..\$//)
+ highdate=$(expr $timestamp / 4294967296 | xargs printf %02x)
+ lowdate=$(expr $timestamp % 4294967296)
# Header version number
if [ "$compressed" -ne 0 ]
@@ -114,9 +115,9 @@ makeheader()
# CRC
if [ "$compressed" -ne 0 ]
then
- print2 `${TOOL_SPARKCRC} "$statfilename"`
+ print2 $(${TOOL_SPARKCRC} "$statfilename")
else
- print2 `${TOOL_SPARKCRC} "$filename"`
+ print2 $(${TOOL_SPARKCRC} "$filename")
fi
# Original file length
if [ "$compressed" -ne 0 ]
@@ -141,7 +142,7 @@ makearchive()
{
for file in "$@"
do
- temp=`${TOOL_MKTEMP} -t $progname` || exit 1
+ temp=$(${TOOL_MKTEMP} -t $progname) || exit 1
trap "rm -f $temp" 0
# Archive marker
printf \\x1a
@@ -151,10 +152,10 @@ makearchive()
-*) echo "Invalid filename" >&2
exit 1
;;
-*,???) type=`echo "$file" | \
- sed "s/.*,\(...\)$/\1/"`
- filename=`echo "$file" | \
- sed "s/,...$//"`
+*,???) type=$(echo "$file" | \
+ sed "s/.*,\(...\)$/\1/")
+ filename=$(echo "$file" | \
+ sed "s/,...$//")
;;
*) type=fff
filename="$file"
@@ -166,18 +167,18 @@ makearchive()
# to indicate its choice of algorithm. Spark doesn't
# understand that, so it must be stripped.
compress -c "$file" | tail -c +3 >"$temp"
- size1=`wc -c "$file" | awk '{print $1}'`
- size2=`wc -c "$temp" | awk '{print $1}'`
+ size1=$(wc -c "$file" | awk '{print $1}')
+ size2=$(wc -c "$temp" | awk '{print $1}')
if [ $size1 -ge $size2 ]
then
makeheader "$temp" "$file" "$filename" "$type" 1
-nbits=`dd if="$temp" bs=1 count=1 2>/dev/null| \
-od -t d1 | awk '{print $2}'`
+nbits=$(dd if="$temp" bs=1 count=1 \
+2>/dev/null | od -t d1 | awk '{print $2}')
if [ $nbits -ge 128 ]
then
- nbits=`expr $nbits - 128`
+ nbits=$(expr $nbits - 128)
fi
-printf \\x`printf %02x $nbits`
+printf \\x$(printf %02x $nbits)
tail -c +2 "$temp"
else
makeheader "$file" "$file" "$filename" "$type" 0
@@ -188,7 +189,7 @@ makearchive()
then
(
cd "$file"
-makearchive `ls -A` >$temp
+makearchive $(ls -A) >$temp
)
if [ $? -ne 0 ]
then
@@ -206,7 +207,7 @@ makearchive()
printf \\x00
}
-progname=`basename $0`
+progname=$(basename $0)
if [ $# -eq 0 ]
then
CVS commit: src/external/bsd/blocklist/bin
Module Name:src
Committed By: christos
Date: Fri Feb 9 15:15:32 UTC 2024
Modified Files:
src/external/bsd/blocklist/bin: conf.c
Log Message:
PR/57905: Mark Davies: handle empty string.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/blocklist/bin/conf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/blocklist/bin/conf.c
diff -u src/external/bsd/blocklist/bin/conf.c:1.5 src/external/bsd/blocklist/bin/conf.c:1.6
--- src/external/bsd/blocklist/bin/conf.c:1.5 Thu Feb 8 19:39:16 2024
+++ src/external/bsd/blocklist/bin/conf.c Fri Feb 9 10:15:32 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.5 2024/02/09 00:39:16 christos Exp $ */
+/* $NetBSD: conf.c,v 1.6 2024/02/09 15:15:32 christos Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#endif
#include
-__RCSID("$NetBSD: conf.c,v 1.5 2024/02/09 00:39:16 christos Exp $");
+__RCSID("$NetBSD: conf.c,v 1.6 2024/02/09 15:15:32 christos Exp $");
#include
#ifdef HAVE_LIBUTIL_H
@@ -269,6 +269,8 @@ conf_gethostport(const char *f, size_t l
#endif
port = >sin6_port;
}
+ if (!*pstr)
+ pstr = "*";
} else if (pstr != p || strchr(p, '.') || conf_is_interface(p)) {
if (pstr == p)
pstr = "*";
CVS commit: src/external/bsd/blocklist/bin
Module Name:src Committed By: christos Date: Fri Feb 9 15:15:32 UTC 2024 Modified Files: src/external/bsd/blocklist/bin: conf.c Log Message: PR/57905: Mark Davies: handle empty string. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/bsd/blocklist/bin/conf.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/riscv/conf
Module Name:src Committed By: skrll Date: Fri Feb 9 08:51:49 UTC 2024 Modified Files: src/sys/arch/riscv/conf: GENERIC64 Log Message: Attach ld at sdmmc The SD card on my Beagle-V now works. Thanks jmcneill! To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/riscv/conf/GENERIC64 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/riscv/conf/GENERIC64 diff -u src/sys/arch/riscv/conf/GENERIC64:1.8 src/sys/arch/riscv/conf/GENERIC64:1.9 --- src/sys/arch/riscv/conf/GENERIC64:1.8 Wed Feb 7 17:17:59 2024 +++ src/sys/arch/riscv/conf/GENERIC64 Fri Feb 9 08:51:49 2024 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC64,v 1.8 2024/02/07 17:17:59 skrll Exp $ +# $NetBSD: GENERIC64,v 1.9 2024/02/09 08:51:49 skrll Exp $ # # GENERIC machine description file # @@ -58,6 +58,11 @@ jh7100pinctrl* at fdt? pass 2 # StarFi # SDMMC dwcmmc* at fdt? # DesignWare SD/MMC sdmmc* at sdmmcbus? +ld0 at sdmmc0 +ld1 at sdmmc1 +ld2 at sdmmc2 +ld3 at sdmmc3 +ld* at sdmmc? bwfm* at sdmmc? # Broadcom BCM43xxx WiFi Interface # USB
CVS commit: src/sys/arch/riscv/conf
Module Name:src Committed By: skrll Date: Fri Feb 9 08:51:49 UTC 2024 Modified Files: src/sys/arch/riscv/conf: GENERIC64 Log Message: Attach ld at sdmmc The SD card on my Beagle-V now works. Thanks jmcneill! To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/riscv/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: skrll
Date: Fri Feb 9 08:50:52 UTC 2024
Modified Files:
src/sys/dev/fdt: dwcmmc_fdt.c
Log Message:
Limit DMA to below 4GB - the supported controllers are limited this
way.
Thanks to jmcneill for a version of this patch.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/fdt/dwcmmc_fdt.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/fdt/dwcmmc_fdt.c
diff -u src/sys/dev/fdt/dwcmmc_fdt.c:1.21 src/sys/dev/fdt/dwcmmc_fdt.c:1.22
--- src/sys/dev/fdt/dwcmmc_fdt.c:1.21 Fri Feb 9 06:28:50 2024
+++ src/sys/dev/fdt/dwcmmc_fdt.c Fri Feb 9 08:50:52 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: dwcmmc_fdt.c,v 1.21 2024/02/09 06:28:50 skrll Exp $ */
+/* $NetBSD: dwcmmc_fdt.c,v 1.22 2024/02/09 08:50:52 skrll Exp $ */
/*-
* Copyright (c) 2015-2018 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.21 2024/02/09 06:28:50 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwcmmc_fdt.c,v 1.22 2024/02/09 08:50:52 skrll Exp $");
#include
#include
@@ -149,7 +149,16 @@ dwcmmc_fdt_attach(device_t parent, devic
sc->sc_dev = self;
sc->sc_bst = faa->faa_bst;
- sc->sc_dmat = faa->faa_dmat;
+ if (sizeof(bus_addr_t) > 4) {
+ error = bus_dmatag_subregion(faa->faa_dmat, 0, __MASK(32),
+ >sc_dmat, BUS_DMA_WAITOK);
+ if (error != 0) {
+ aprint_error(": couldn't create DMA tag: %d\n", error);
+ return;
+ }
+ } else {
+ sc->sc_dmat = faa->faa_dmat;
+ }
error = bus_space_map(sc->sc_bst, addr, size, 0, >sc_bsh);
if (error) {
aprint_error(": couldn't map %#" PRIx64 ": %d\n",
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: skrll Date: Fri Feb 9 08:50:52 UTC 2024 Modified Files: src/sys/dev/fdt: dwcmmc_fdt.c Log Message: Limit DMA to below 4GB - the supported controllers are limited this way. Thanks to jmcneill for a version of this patch. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/dev/fdt/dwcmmc_fdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
