CVS commit: src/sys/arch/evbarm/zynq

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 07:51:25 UTC 2019

Modified Files:
src/sys/arch/evbarm/zynq: zynq_machdep.c

Log Message:
Fix indentation whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/zynq/zynq_machdep.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/evbarm/zynq/zynq_machdep.c
diff -u src/sys/arch/evbarm/zynq/zynq_machdep.c:1.6 src/sys/arch/evbarm/zynq/zynq_machdep.c:1.7
--- src/sys/arch/evbarm/zynq/zynq_machdep.c:1.6	Sat Nov  3 15:02:32 2018
+++ src/sys/arch/evbarm/zynq/zynq_machdep.c	Tue Jan 22 07:51:25 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: zynq_machdep.c,v 1.6 2018/11/03 15:02:32 skrll Exp $	*/
+/*	$NetBSD: zynq_machdep.c,v 1.7 2019/01/22 07:51:25 skrll Exp $	*/
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -29,7 +29,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zynq_machdep.c,v 1.6 2018/11/03 15:02:32 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_machdep.c,v 1.7 2019/01/22 07:51:25 skrll Exp $");
 
 #include "opt_evbarm_boardtype.h"
 #include "opt_arm_debug.h"
@@ -234,7 +234,7 @@ zynq_mpstart(void)
 	}
 	for (size_t i = 1; i < arm_cpu_max; i++) {
 		if ((arm_cpu_hatched & __BIT(i)) == 0) {
-		printf("%s: warning: cpu%zu failed to hatch\n",
+			printf("%s: warning: cpu%zu failed to hatch\n",
 			__func__, i);
 		}
 	}

CVS commit: src/sys/arch/evbarm/zynq

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 07:51:25 UTC 2019

Modified Files:
src/sys/arch/evbarm/zynq: zynq_machdep.c

Log Message:
Fix indentation whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/zynq/zynq_machdep.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [pgoyette-compat] src/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Jan 22 07:42:42 UTC 2019

Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c
src/sys/arch/mips/mips [pgoyette-compat]: netbsd32_machdep.c
src/sys/arch/sparc/fpu [pgoyette-compat]: fpu.c
src/sys/arch/sparc64/sparc64 [pgoyette-compat]: netbsd32_machdep.c
src/sys/compat/common [pgoyette-compat]: if_43.c
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_kern_proc.c
netbsd32_module.c
src/sys/dev [pgoyette-compat]: bio.c ccd.c clockctl.c vnd.c
src/sys/dev/raidframe [pgoyette-compat]: rf_netbsdkintf.c
src/sys/dev/sysmon [pgoyette-compat]: sysmon_power.c
src/sys/dev/usb [pgoyette-compat]: ugen.c uhid.c usb.c
src/sys/dev/wscons [pgoyette-compat]: wsevent.c
src/sys/fs/puffs [pgoyette-compat]: puffs_msgif.c
src/sys/kern [pgoyette-compat]: kern_proc.c kern_rndq.c sys_module.c
sysv_ipc.c tty.c tty_ptm.c uipc_usrreq.c vfs_syscalls.c
src/sys/net [pgoyette-compat]: if.c if_spppsubr.c rtsock.c
rtsock_shared.c
src/sys/net80211 [pgoyette-compat]: ieee80211_ioctl.c
src/sys/opencrypto [pgoyette-compat]: cryptodev.c
src/sys/sys [pgoyette-compat]: compat_stub.h module_hook.h tty.h

Log Message:
Convert the MODULE_{,VOID_}HOOK_CALL macros to do everything in-line
rather than defining an intermediate hook##call function.  Almost
all of the hooks are called only once, and although we lose the
ability of doing things like

if (MODULE_HOOK_CALL(...) == 0) ...

we simplify things quite a bit.  With this change, we no longer need
to have both declaration and definition macros, and the definition
no longer needs to have both prototype argument list and a "real"
argument list.

FWIW, the above if now needs to written as

int ret;

MODULE_HOOK_CALL(..., ret);
if (ret == 0) ...

with appropriate use of braces {}.


To generate a diff of this commit:
cvs rdiff -u -r1.115.2.15 -r1.115.2.16 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.15.2.11 -r1.15.2.12 \
src/sys/arch/mips/mips/netbsd32_machdep.c
cvs rdiff -u -r1.27.46.4 -r1.27.46.5 src/sys/arch/sparc/fpu/fpu.c
cvs rdiff -u -r1.110.14.4 -r1.110.14.5 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.14.2.13 -r1.14.2.14 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/compat/netbsd32/netbsd32_kern_proc.c
cvs rdiff -u -r1.6.2.12 -r1.6.2.13 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.13.16.8 -r1.13.16.9 src/sys/dev/bio.c
cvs rdiff -u -r1.175.2.11 -r1.175.2.12 src/sys/dev/ccd.c
cvs rdiff -u -r1.35.14.11 -r1.35.14.12 src/sys/dev/clockctl.c
cvs rdiff -u -r1.263.2.13 -r1.263.2.14 src/sys/dev/vnd.c
cvs rdiff -u -r1.356.2.10 -r1.356.2.11 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.58.2.8 -r1.58.2.9 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.139.2.9 -r1.139.2.10 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.101.2.8 -r1.101.2.9 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.168.2.10 -r1.168.2.11 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.37.2.9 -r1.37.2.10 src/sys/dev/wscons/wsevent.c
cvs rdiff -u -r1.101.10.10 -r1.101.10.11 src/sys/fs/puffs/puffs_msgif.c
cvs rdiff -u -r1.209.2.14 -r1.209.2.15 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.89.16.7 -r1.89.16.8 src/sys/kern/kern_rndq.c
cvs rdiff -u -r1.23.2.16 -r1.23.2.17 src/sys/kern/sys_module.c
cvs rdiff -u -r1.32.16.10 -r1.32.16.11 src/sys/kern/sysv_ipc.c
cvs rdiff -u -r1.275.2.8 -r1.275.2.9 src/sys/kern/tty.c
cvs rdiff -u -r1.37.16.5 -r1.37.16.6 src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.183.2.9 -r1.183.2.10 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.518.2.5 -r1.518.2.6 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.419.2.21 -r1.419.2.22 src/sys/net/if.c
cvs rdiff -u -r1.179.2.10 -r1.179.2.11 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.238.2.24 -r1.238.2.25 src/sys/net/rtsock.c
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/net/rtsock_shared.c
cvs rdiff -u -r1.60.16.7 -r1.60.16.8 src/sys/net80211/ieee80211_ioctl.c
cvs rdiff -u -r1.98.2.10 -r1.98.2.11 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.1.2.51 -r1.1.2.52 src/sys/sys/compat_stub.h
cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/sys/module_hook.h
cvs rdiff -u -r1.94.2.3 -r1.94.2.4 src/sys/sys/tty.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/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.15 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.16
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.115.2.15	Mon Jan 21 06:49:27 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c	Tue Jan 22 07:42:40 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep.c,v 1.115.2.15 2019/01/21 06:49:27 pgoyette Exp $	*/
+/*	$NetBSD: netbsd32_machdep.c,v 1.115.2.16 2019/01/22 07:42:40 pgoyette Exp $	*/
 
 /*
  

CVS commit: [pgoyette-compat] src/sys

[Paul Goyette]

Module Name:src
Committed By:   pgoyette
Date:   Tue Jan 22 07:42:42 UTC 2019

Modified Files:
src/sys/arch/amd64/amd64 [pgoyette-compat]: netbsd32_machdep.c
src/sys/arch/mips/mips [pgoyette-compat]: netbsd32_machdep.c
src/sys/arch/sparc/fpu [pgoyette-compat]: fpu.c
src/sys/arch/sparc64/sparc64 [pgoyette-compat]: netbsd32_machdep.c
src/sys/compat/common [pgoyette-compat]: if_43.c
src/sys/compat/netbsd32 [pgoyette-compat]: netbsd32_kern_proc.c
netbsd32_module.c
src/sys/dev [pgoyette-compat]: bio.c ccd.c clockctl.c vnd.c
src/sys/dev/raidframe [pgoyette-compat]: rf_netbsdkintf.c
src/sys/dev/sysmon [pgoyette-compat]: sysmon_power.c
src/sys/dev/usb [pgoyette-compat]: ugen.c uhid.c usb.c
src/sys/dev/wscons [pgoyette-compat]: wsevent.c
src/sys/fs/puffs [pgoyette-compat]: puffs_msgif.c
src/sys/kern [pgoyette-compat]: kern_proc.c kern_rndq.c sys_module.c
sysv_ipc.c tty.c tty_ptm.c uipc_usrreq.c vfs_syscalls.c
src/sys/net [pgoyette-compat]: if.c if_spppsubr.c rtsock.c
rtsock_shared.c
src/sys/net80211 [pgoyette-compat]: ieee80211_ioctl.c
src/sys/opencrypto [pgoyette-compat]: cryptodev.c
src/sys/sys [pgoyette-compat]: compat_stub.h module_hook.h tty.h

Log Message:
Convert the MODULE_{,VOID_}HOOK_CALL macros to do everything in-line
rather than defining an intermediate hook##call function.  Almost
all of the hooks are called only once, and although we lose the
ability of doing things like

if (MODULE_HOOK_CALL(...) == 0) ...

we simplify things quite a bit.  With this change, we no longer need
to have both declaration and definition macros, and the definition
no longer needs to have both prototype argument list and a "real"
argument list.

FWIW, the above if now needs to written as

int ret;

MODULE_HOOK_CALL(..., ret);
if (ret == 0) ...

with appropriate use of braces {}.


To generate a diff of this commit:
cvs rdiff -u -r1.115.2.15 -r1.115.2.16 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
cvs rdiff -u -r1.15.2.11 -r1.15.2.12 \
src/sys/arch/mips/mips/netbsd32_machdep.c
cvs rdiff -u -r1.27.46.4 -r1.27.46.5 src/sys/arch/sparc/fpu/fpu.c
cvs rdiff -u -r1.110.14.4 -r1.110.14.5 \
src/sys/arch/sparc64/sparc64/netbsd32_machdep.c
cvs rdiff -u -r1.14.2.13 -r1.14.2.14 src/sys/compat/common/if_43.c
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/compat/netbsd32/netbsd32_kern_proc.c
cvs rdiff -u -r1.6.2.12 -r1.6.2.13 src/sys/compat/netbsd32/netbsd32_module.c
cvs rdiff -u -r1.13.16.8 -r1.13.16.9 src/sys/dev/bio.c
cvs rdiff -u -r1.175.2.11 -r1.175.2.12 src/sys/dev/ccd.c
cvs rdiff -u -r1.35.14.11 -r1.35.14.12 src/sys/dev/clockctl.c
cvs rdiff -u -r1.263.2.13 -r1.263.2.14 src/sys/dev/vnd.c
cvs rdiff -u -r1.356.2.10 -r1.356.2.11 src/sys/dev/raidframe/rf_netbsdkintf.c
cvs rdiff -u -r1.58.2.8 -r1.58.2.9 src/sys/dev/sysmon/sysmon_power.c
cvs rdiff -u -r1.139.2.9 -r1.139.2.10 src/sys/dev/usb/ugen.c
cvs rdiff -u -r1.101.2.8 -r1.101.2.9 src/sys/dev/usb/uhid.c
cvs rdiff -u -r1.168.2.10 -r1.168.2.11 src/sys/dev/usb/usb.c
cvs rdiff -u -r1.37.2.9 -r1.37.2.10 src/sys/dev/wscons/wsevent.c
cvs rdiff -u -r1.101.10.10 -r1.101.10.11 src/sys/fs/puffs/puffs_msgif.c
cvs rdiff -u -r1.209.2.14 -r1.209.2.15 src/sys/kern/kern_proc.c
cvs rdiff -u -r1.89.16.7 -r1.89.16.8 src/sys/kern/kern_rndq.c
cvs rdiff -u -r1.23.2.16 -r1.23.2.17 src/sys/kern/sys_module.c
cvs rdiff -u -r1.32.16.10 -r1.32.16.11 src/sys/kern/sysv_ipc.c
cvs rdiff -u -r1.275.2.8 -r1.275.2.9 src/sys/kern/tty.c
cvs rdiff -u -r1.37.16.5 -r1.37.16.6 src/sys/kern/tty_ptm.c
cvs rdiff -u -r1.183.2.9 -r1.183.2.10 src/sys/kern/uipc_usrreq.c
cvs rdiff -u -r1.518.2.5 -r1.518.2.6 src/sys/kern/vfs_syscalls.c
cvs rdiff -u -r1.419.2.21 -r1.419.2.22 src/sys/net/if.c
cvs rdiff -u -r1.179.2.10 -r1.179.2.11 src/sys/net/if_spppsubr.c
cvs rdiff -u -r1.238.2.24 -r1.238.2.25 src/sys/net/rtsock.c
cvs rdiff -u -r1.1.2.6 -r1.1.2.7 src/sys/net/rtsock_shared.c
cvs rdiff -u -r1.60.16.7 -r1.60.16.8 src/sys/net80211/ieee80211_ioctl.c
cvs rdiff -u -r1.98.2.10 -r1.98.2.11 src/sys/opencrypto/cryptodev.c
cvs rdiff -u -r1.1.2.51 -r1.1.2.52 src/sys/sys/compat_stub.h
cvs rdiff -u -r1.1.2.13 -r1.1.2.14 src/sys/sys/module_hook.h
cvs rdiff -u -r1.94.2.3 -r1.94.2.4 src/sys/sys/tty.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:47:20 UTC 2019

Modified Files:
src/sys/dev/usb: auvitek_video.c if_run.c slurm.c uark.c uatp.c
uberry.c ubsa.c uhso.c ukyopon.c uslsa.c uyap.c uyurex.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/auvitek_video.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/slurm.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/uark.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/uatp.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/ukyopon.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/usb/uslsa.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/uyap.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/uyurex.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/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:47:20 UTC 2019

Modified Files:
src/sys/dev/usb: auvitek_video.c if_run.c slurm.c uark.c uatp.c
uberry.c ubsa.c uhso.c ukyopon.c uslsa.c uyap.c uyurex.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/usb/auvitek_video.c
cvs rdiff -u -r1.31 -r1.32 src/sys/dev/usb/if_run.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/slurm.c
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/uark.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/uatp.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/uberry.c
cvs rdiff -u -r1.34 -r1.35 src/sys/dev/usb/ubsa.c
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/usb/uhso.c
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/ukyopon.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/usb/uslsa.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/usb/uyap.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/uyurex.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/auvitek_video.c
diff -u src/sys/dev/usb/auvitek_video.c:1.8 src/sys/dev/usb/auvitek_video.c:1.9
--- src/sys/dev/usb/auvitek_video.c:1.8	Mon Sep  3 16:29:33 2018
+++ src/sys/dev/usb/auvitek_video.c	Tue Jan 22 06:47:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: auvitek_video.c,v 1.8 2018/09/03 16:29:33 riastradh Exp $ */
+/* $NetBSD: auvitek_video.c,v 1.9 2019/01/22 06:47:20 skrll Exp $ */
 
 /*-
  * Copyright (c) 2010 Jared D. McNeill 
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.8 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auvitek_video.c,v 1.9 2019/01/22 06:47:20 skrll Exp $");
 
 #include 
 #include 
@@ -134,7 +134,7 @@ auvitek_video_attach(struct auvitek_soft
 
 	auvitek_video_rescan(sc, NULL, NULL);
 
-	return (sc->sc_videodev != NULL);
+	return sc->sc_videodev != NULL;
 }
 
 int

Index: src/sys/dev/usb/if_run.c
diff -u src/sys/dev/usb/if_run.c:1.31 src/sys/dev/usb/if_run.c:1.32
--- src/sys/dev/usb/if_run.c:1.31	Thu Nov 29 18:53:42 2018
+++ src/sys/dev/usb/if_run.c	Tue Jan 22 06:47:20 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_run.c,v 1.31 2018/11/29 18:53:42 jakllsch Exp $	*/
+/*	$NetBSD: if_run.c,v 1.32 2019/01/22 06:47:20 skrll Exp $	*/
 /*	$OpenBSD: if_run.c,v 1.90 2012/03/24 15:11:04 jsg Exp $	*/
 
 /*-
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.31 2018/11/29 18:53:42 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_run.c,v 1.32 2019/01/22 06:47:20 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1114,7 +1114,7 @@ run_efuse_read(struct run_softc *sc, uin
 static int
 run_efuse_read_2(struct run_softc *sc, uint16_t addr, uint16_t *val)
 {
-	return (run_efuse_read(sc, addr, val, 2));
+	return run_efuse_read(sc, addr, val, 2);
 }
 
 static int
@@ -4104,7 +4104,7 @@ run_rt3593_rf_init(struct run_softc *sc)
 
 	run_read(sc, RT3070_OPT_14, );
 	run_write(sc, RT3070_OPT_14, tmp | 1);
-	return (0);
+	return 0;
 }
 
 static int
@@ -4169,7 +4169,7 @@ run_rt5390_rf_init(struct run_softc *sc)
 
 	run_read(sc, RT3070_OPT_14, );
 	run_write(sc, RT3070_OPT_14, tmp | 1);
-	return (0);
+	return 0;
 }
 
 static int
@@ -4490,7 +4490,7 @@ run_adjust_freq_offset(struct run_softc 
 	if (tmp != rf)
 		run_mcu_cmd(sc, 0x74, (tmp << 8 ) | rf);
 
-	return (0);
+	return 0;
 }
 
 static int

Index: src/sys/dev/usb/slurm.c
diff -u src/sys/dev/usb/slurm.c:1.3 src/sys/dev/usb/slurm.c:1.4
--- src/sys/dev/usb/slurm.c:1.3	Thu Jul  7 06:55:42 2016
+++ src/sys/dev/usb/slurm.c	Tue Jan 22 06:47:20 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: slurm.c,v 1.3 2016/07/07 06:55:42 msaitoh Exp $ */
+/*	$NetBSD: slurm.c,v 1.4 2019/01/22 06:47:20 skrll Exp $ */
 
 /*
  * Copyright (c) 2012 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.3 2016/07/07 06:55:42 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: slurm.c,v 1.4 2019/01/22 06:47:20 skrll Exp $");
 
 #include 
 #include 
@@ -156,7 +156,7 @@ slurm_detach(device_t self, int flags)
 
 	usbd_add_drv_event(USB_EVENT_DRIVER_DETACH, sc->sc_udev, sc->sc_dev);
 
-	return (rv);
+	return rv;
 }
 
 static int

Index: src/sys/dev/usb/uark.c
diff -u src/sys/dev/usb/uark.c:1.11 src/sys/dev/usb/uark.c:1.12
--- src/sys/dev/usb/uark.c:1.11	Fri Nov 25 12:56:29 2016
+++ src/sys/dev/usb/uark.c	Tue Jan 22 06:47:20 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: uark.c,v 1.11 2016/11/25 12:56:29 skrll Exp $	*/
+/*	$NetBSD: uark.c,v 1.12 2019/01/22 06:47:20 skrll Exp $	*/
 /*	$OpenBSD: uark.c,v 1.13 2009/10/13 19:33:17 pirofti Exp $	*/
 
 /*
@@ -18,7 +18,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.11 2016/11/25 12:56:29 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uark.c,v 1.12 2019/01/22 06:47:20 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -229,7 +229,7 @@ uark_activate(device_t self, enum devact
 		sc->sc_dying = 1;
 		break;
 	}
-	return (rv);
+	return rv;
 }
 
 void
@@ -272,7 +272,7 @@ uark_param(void 

CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:46:21 UTC 2019

Modified Files:
src/sys/dev/usb: umass_isdata.c umass_scsipi.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/umass_isdata.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/usb/umass_scsipi.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/umass_isdata.c
diff -u src/sys/dev/usb/umass_isdata.c:1.39 src/sys/dev/usb/umass_isdata.c:1.40
--- src/sys/dev/usb/umass_isdata.c:1.39	Mon Oct 22 21:23:16 2018
+++ src/sys/dev/usb/umass_isdata.c	Tue Jan 22 06:46:21 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass_isdata.c,v 1.39 2018/10/22 21:23:16 jdolecek Exp $	*/
+/*	$NetBSD: umass_isdata.c,v 1.40 2019/01/22 06:46:21 skrll Exp $	*/
 
 /*
  * TODO:
@@ -37,21 +37,21 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.39 2018/10/22 21:23:16 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_isdata.c,v 1.40 2019/01/22 06:46:21 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
 #endif
 
 #include 
-#include 
-#include 
-#include 
 #include 
+#include 
 #include 
-#include 
 #include 
+#include 
 #include 
+#include 
+#include 
 
 #include 
 #include 

Index: src/sys/dev/usb/umass_scsipi.c
diff -u src/sys/dev/usb/umass_scsipi.c:1.56 src/sys/dev/usb/umass_scsipi.c:1.57
--- src/sys/dev/usb/umass_scsipi.c:1.56	Tue Nov 13 10:30:57 2018
+++ src/sys/dev/usb/umass_scsipi.c	Tue Jan 22 06:46:21 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass_scsipi.c,v 1.56 2018/11/13 10:30:57 mlelstv Exp $	*/
+/*	$NetBSD: umass_scsipi.c,v 1.57 2019/01/22 06:46:21 skrll Exp $	*/
 
 /*
  * Copyright (c) 2001, 2003, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.56 2018/11/13 10:30:57 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass_scsipi.c,v 1.57 2019/01/22 06:46:21 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -41,15 +41,16 @@ __KERNEL_RCSID(0, "$NetBSD: umass_scsipi
 #include "scsibus.h"
 
 #include 
-#include 
-#include 
-#include 
 #include 
 #include 
+#include 
 #include 
+#include 		/* XXX */
 #include 
+#include 
 #include 
 #include 
+#include 
 
 /* SCSI & ATAPI */
 #include 
@@ -64,7 +65,6 @@ __KERNEL_RCSID(0, "$NetBSD: umass_scsipi
 #include 
 #include 
 
-#include 		/* XXX */
 #include 	/* XXX */
 
 /* USB */

CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:46:21 UTC 2019

Modified Files:
src/sys/dev/usb: umass_isdata.c umass_scsipi.c

Log Message:
KNF


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/umass_isdata.c
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/usb/umass_scsipi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:42:33 UTC 2019

Modified Files:
src/sys/dev/usb: uhci.c xhci.c
src/sys/external/bsd/dwc2: dwc2.c

Log Message:
Add a KASSERT


To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.55 -r1.56 src/sys/external/bsd/dwc2/dwc2.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:42:33 UTC 2019

Modified Files:
src/sys/dev/usb: uhci.c xhci.c
src/sys/external/bsd/dwc2: dwc2.c

Log Message:
Add a KASSERT


To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/sys/dev/usb/uhci.c
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/usb/xhci.c
cvs rdiff -u -r1.55 -r1.56 src/sys/external/bsd/dwc2/dwc2.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/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.284 src/sys/dev/usb/uhci.c:1.285
--- src/sys/dev/usb/uhci.c:1.284	Sun Sep 16 20:21:56 2018
+++ src/sys/dev/usb/uhci.c	Tue Jan 22 06:42:33 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: uhci.c,v 1.284 2018/09/16 20:21:56 mrg Exp $	*/
+/*	$NetBSD: uhci.c,v 1.285 2019/01/22 06:42:33 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.284 2018/09/16 20:21:56 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uhci.c,v 1.285 2019/01/22 06:42:33 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1740,6 +1740,7 @@ uhci_timeout_task(void *addr)
 	DPRINTF("xfer=%#jx", (uintptr_t)xfer, 0, 0, 0);
 
 	mutex_enter(>sc_lock);
+	KASSERT(xfer->ux_status == USBD_TIMEOUT);
 	uhci_abort_xfer(xfer, USBD_TIMEOUT);
 	mutex_exit(>sc_lock);
 }

Index: src/sys/dev/usb/xhci.c
diff -u src/sys/dev/usb/xhci.c:1.103 src/sys/dev/usb/xhci.c:1.104
--- src/sys/dev/usb/xhci.c:1.103	Fri Jan 11 15:43:51 2019
+++ src/sys/dev/usb/xhci.c	Tue Jan 22 06:42:33 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: xhci.c,v 1.103 2019/01/11 15:43:51 skrll Exp $	*/
+/*	$NetBSD: xhci.c,v 1.104 2019/01/22 06:42:33 skrll Exp $	*/
 
 /*
  * Copyright (c) 2013 Jonathan A. Kollasch
@@ -34,7 +34,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.103 2019/01/11 15:43:51 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.104 2019/01/22 06:42:33 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -4180,6 +4180,7 @@ xhci_timeout_task(void *addr)
 	struct xhci_softc * const sc = XHCI_XFER2SC(xfer);
 
 	mutex_enter(>sc_lock);
+	KASSERT(xfer->ux_status == USBD_TIMEOUT);
 	xhci_abort_xfer(xfer, USBD_TIMEOUT);
 	mutex_exit(>sc_lock);
 }

Index: src/sys/external/bsd/dwc2/dwc2.c
diff -u src/sys/external/bsd/dwc2/dwc2.c:1.55 src/sys/external/bsd/dwc2/dwc2.c:1.56
--- src/sys/external/bsd/dwc2/dwc2.c:1.55	Sun Sep 16 20:21:56 2018
+++ src/sys/external/bsd/dwc2/dwc2.c	Tue Jan 22 06:42:33 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: dwc2.c,v 1.55 2018/09/16 20:21:56 mrg Exp $	*/
+/*	$NetBSD: dwc2.c,v 1.56 2019/01/22 06:42:33 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.55 2018/09/16 20:21:56 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2.c,v 1.56 2019/01/22 06:42:33 skrll Exp $");
 
 #include "opt_usb.h"
 
@@ -341,6 +341,7 @@ dwc2_timeout_task(void *addr)
 	DPRINTF("xfer=%p\n", xfer);
 
 	mutex_enter(>sc_lock);
+	KASSERT(xfer->ux_status == USBD_TIMEOUT);
 	dwc2_abort_xfer(xfer, USBD_TIMEOUT);
 	mutex_exit(>sc_lock);
 }

CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:40:49 UTC 2019

Modified Files:
src/sys/dev/usb: umass.c

Log Message:
Update a comment


To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/sys/dev/usb/umass.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/umass.c
diff -u src/sys/dev/usb/umass.c:1.166 src/sys/dev/usb/umass.c:1.167
--- src/sys/dev/usb/umass.c:1.166	Tue Nov 13 10:30:57 2018
+++ src/sys/dev/usb/umass.c	Tue Jan 22 06:40:49 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: umass.c,v 1.166 2018/11/13 10:30:57 mlelstv Exp $	*/
+/*	$NetBSD: umass.c,v 1.167 2019/01/22 06:40:49 skrll Exp $	*/
 
 /*
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -108,8 +108,8 @@
  * umass_*_reset.
  *
  * The reason for doing this is a) CAM performs a lot better this way and b) it
- * avoids using tsleep from interrupt context (for example after a failed
- * transfer).
+ * avoids sleeping in interrupt context which is prohibited (for example after a
+ * failed transfer).
  */
 
 /*
@@ -124,7 +124,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.166 2018/11/13 10:30:57 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: umass.c,v 1.167 2019/01/22 06:40:49 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"

CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:40:49 UTC 2019

Modified Files:
src/sys/dev/usb: umass.c

Log Message:
Update a comment


To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/sys/dev/usb/umass.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/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:39:24 UTC 2019

Modified Files:
src/sys/dev/usb: motg.c

Log Message:
#ifdef DIAGNOSTIC / panic -> KASSERTMSG


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/usb/motg.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/motg.c
diff -u src/sys/dev/usb/motg.c:1.23 src/sys/dev/usb/motg.c:1.24
--- src/sys/dev/usb/motg.c:1.23	Mon Sep  3 16:29:33 2018
+++ src/sys/dev/usb/motg.c	Tue Jan 22 06:39:24 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: motg.c,v 1.23 2018/09/03 16:29:33 riastradh Exp $	*/
+/*	$NetBSD: motg.c,v 1.24 2019/01/22 06:39:24 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2004, 2011, 2012, 2014 The NetBSD Foundation, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.23 2018/09/03 16:29:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: motg.c,v 1.24 2019/01/22 06:39:24 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -2079,10 +2079,9 @@ motg_device_intr_tx(struct motg_softc *s
 complete:
 	DPRINTFN(MD_BULK, "xfer %#jx complete, status %jd", (uintptr_t)xfer,
 	(xfer != NULL) ? xfer->ux_status : 0, 0, 0);
-#ifdef DIAGNOSTIC
-	if (xfer && xfer->ux_status == USBD_IN_PROGRESS && ep->phase != DATA_OUT)
-		panic("motg_device_intr_tx: bad phase %d", ep->phase);
-#endif
+	KASSERTMSG(xfer && xfer->ux_status == USBD_IN_PROGRESS && 
+	ep->phase == DATA_OUT, "xfer %p status %d phase %d",
+	xfer, xfer->ux_status, ep->phase);
 	ep->phase = IDLE;
 	ep->xfer = NULL;
 	if (xfer && xfer->ux_status == USBD_IN_PROGRESS) {

CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:39:24 UTC 2019

Modified Files:
src/sys/dev/usb: motg.c

Log Message:
#ifdef DIAGNOSTIC / panic -> KASSERTMSG


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/dev/usb/motg.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/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:38:53 UTC 2019

Modified Files:
src/sys/dev/usb: if_aue.c

Log Message:
Update a comment


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/dev/usb/if_aue.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/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:38:28 UTC 2019

Modified Files:
src/sys/dev/usb: ulpt.c

Log Message:
Fix two comments


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/usb/ulpt.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/ulpt.c
diff -u src/sys/dev/usb/ulpt.c:1.100 src/sys/dev/usb/ulpt.c:1.101
--- src/sys/dev/usb/ulpt.c:1.100	Mon Sep  3 16:29:34 2018
+++ src/sys/dev/usb/ulpt.c	Tue Jan 22 06:38:28 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: ulpt.c,v 1.100 2018/09/03 16:29:34 riastradh Exp $	*/
+/*	$NetBSD: ulpt.c,v 1.101 2019/01/22 06:38:28 skrll Exp $	*/
 
 /*
  * Copyright (c) 1998, 2003 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.100 2018/09/03 16:29:34 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ulpt.c,v 1.101 2019/01/22 06:38:28 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -704,7 +704,7 @@ ulpt_do_read(struct ulpt_softc *sc, stru
 		}
 
 		/*
-		 * XXX Even with the short timeout, this will tsleep,
+		 * XXX Even with the short timeout, this will sleep,
 		 * but it should be adequately prompt in practice.
 		 */
 		n = nreq;
@@ -748,7 +748,7 @@ ulpt_do_read(struct ulpt_softc *sc, stru
 
 		case USBD_INTERRUPTED:
 			/*
-			 * The tsleep in usbd_bulk_transfer was
+			 * The sleep in usbd_bulk_transfer was
 			 * interrupted.  Reflect it to the caller so
 			 * that reading can be interrupted.
 			 */

CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:38:53 UTC 2019

Modified Files:
src/sys/dev/usb: if_aue.c

Log Message:
Update a comment


To generate a diff of this commit:
cvs rdiff -u -r1.146 -r1.147 src/sys/dev/usb/if_aue.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_aue.c
diff -u src/sys/dev/usb/if_aue.c:1.146 src/sys/dev/usb/if_aue.c:1.147
--- src/sys/dev/usb/if_aue.c:1.146	Tue Jan 22 03:42:28 2019
+++ src/sys/dev/usb/if_aue.c	Tue Jan 22 06:38:53 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_aue.c,v 1.146 2019/01/22 03:42:28 msaitoh Exp $	*/
+/*	$NetBSD: if_aue.c,v 1.147 2019/01/22 06:38:53 skrll Exp $	*/
 
 /*
  * Copyright (c) 1997, 1998, 1999, 2000
@@ -71,14 +71,13 @@
  * TODO:
  * better error messages from rxstat
  * split out if_auevar.h
- * add thread to avoid register reads from interrupt context
  * more error checks
  * investigate short rx problem
  * proper cleanup on errors
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.146 2019/01/22 03:42:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_aue.c,v 1.147 2019/01/22 06:38:53 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"

CVS commit: src/sys/dev/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:38:28 UTC 2019

Modified Files:
src/sys/dev/usb: ulpt.c

Log Message:
Fix two comments


To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/dev/usb/ulpt.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/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:37:55 UTC 2019

Modified Files:
src/sys/dev/usb: if_smsc.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/if_smsc.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/usb

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Tue Jan 22 06:37:55 UTC 2019

Modified Files:
src/sys/dev/usb: if_smsc.c

Log Message:
Whitespace


To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/usb/if_smsc.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_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.39 src/sys/dev/usb/if_smsc.c:1.40
--- src/sys/dev/usb/if_smsc.c:1.39	Tue Jan 22 03:42:28 2019
+++ src/sys/dev/usb/if_smsc.c	Tue Jan 22 06:37:54 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_smsc.c,v 1.39 2019/01/22 03:42:28 msaitoh Exp $	*/
+/*	$NetBSD: if_smsc.c,v 1.40 2019/01/22 06:37:54 skrll Exp $	*/
 
 /*	$OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $	*/
 /*	$FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -61,7 +61,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.39 2019/01/22 03:42:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_smsc.c,v 1.40 2019/01/22 06:37:54 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -1405,7 +1405,7 @@ smsc_rxeof(struct usbd_xfer *xfer, void 
 
 	if (status != USBD_NORMAL_COMPLETION) {
 		if (status == USBD_NOT_STARTED || status == USBD_CANCELLED) {
-			mutex_exit(>sc_rxlock);
+			mutex_exit(>sc_rxlock);
 			return;
 		}
 		if (usbd_ratecheck(>sc_rx_notice)) {

CVS commit: src/libexec/httpd

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jan 22 05:32:57 UTC 2019

Modified Files:
src/libexec/httpd: CHANGES auth-bozo.c bozohttpd.c bozohttpd.h
dir-index-bozo.c

Log Message:
o  don't display special files in the directory index.  they aren't
   served, but links to them are generated.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.22 -r1.23 src/libexec/httpd/auth-bozo.c
cvs rdiff -u -r1.110 -r1.111 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.57 -r1.58 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.30 -r1.31 src/libexec/httpd/dir-index-bozo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/libexec/httpd/CHANGES
diff -u src/libexec/httpd/CHANGES:1.36 src/libexec/httpd/CHANGES:1.37
--- src/libexec/httpd/CHANGES:1.36	Thu Jan 17 07:46:16 2019
+++ src/libexec/httpd/CHANGES	Tue Jan 22 05:32:57 2019
@@ -1,4 +1,8 @@
-$NetBSD: CHANGES,v 1.36 2019/01/17 07:46:16 mrg Exp $
+$NetBSD: CHANGES,v 1.37 2019/01/22 05:32:57 mrg Exp $
+
+changes in bozohttpd 20190121:
+	o  don't display special files in the directory index.  they aren't
+	   served, but links to them are generated.
 
 changes in bozohttpd 20190116:
 	o  fix CGI '+' parameter handling, some error checking, and a double

Index: src/libexec/httpd/auth-bozo.c
diff -u src/libexec/httpd/auth-bozo.c:1.22 src/libexec/httpd/auth-bozo.c:1.23
--- src/libexec/httpd/auth-bozo.c:1.22	Thu Nov 22 08:54:08 2018
+++ src/libexec/httpd/auth-bozo.c	Tue Jan 22 05:32:57 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: auth-bozo.c,v 1.22 2018/11/22 08:54:08 mrg Exp $	*/
+/*	$NetBSD: auth-bozo.c,v 1.23 2019/01/22 05:32:57 mrg Exp $	*/
 
 /*	$eterna: auth-bozo.c,v 1.17 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -64,7 +64,7 @@ bozo_auth_check(bozo_httpreq_t *request,
 		strcpy(dir, ".");
 	else {
 		*basename++ = '\0';
-		if (bozo_check_special_files(request, basename))
+		if (bozo_check_special_files(request, basename, true))
 			return 1;
 	}
 	request->hr_authrealm = bozostrdup(httpd, request, dir);

Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.110 src/libexec/httpd/bozohttpd.c:1.111
--- src/libexec/httpd/bozohttpd.c:1.110	Fri Jan 18 06:04:10 2019
+++ src/libexec/httpd/bozohttpd.c	Tue Jan 22 05:32:57 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: bozohttpd.c,v 1.110 2019/01/18 06:04:10 mrg Exp $	*/
+/*	$NetBSD: bozohttpd.c,v 1.111 2019/01/22 05:32:57 mrg Exp $	*/
 
 /*	$eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -109,7 +109,7 @@
 #define INDEX_HTML		"index.html"
 #endif
 #ifndef SERVER_SOFTWARE
-#define SERVER_SOFTWARE		"bozohttpd/20190116"
+#define SERVER_SOFTWARE		"bozohttpd/20190121"
 #endif
 #ifndef PUBLIC_HTML
 #define PUBLIC_HTML		"public_html"
@@ -140,7 +140,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -1461,7 +1460,7 @@ check_bzredirect(bozo_httpreq_t *request
 		*basename++ = '\0';
 		strcpy(path, dir);
 	}
-	if (bozo_check_special_files(request, basename))
+	if (bozo_check_special_files(request, basename, true))
 		return -1;
 
 	debug((httpd, DEBUG_FAT, "check_bzredirect: path %s", path));
@@ -1913,17 +1912,24 @@ bozo_process_request(bozo_httpreq_t *req
 
 /* make sure we're not trying to access special files */
 int
-bozo_check_special_files(bozo_httpreq_t *request, const char *name)
+bozo_check_special_files(bozo_httpreq_t *request, const char *name, bool doerror)
 {
 	bozohttpd_t *httpd = request->hr_httpd;
 	size_t i;
+	int error = 0;
 
-	for (i = 0; specials[i].file; i++)
-		if (strcmp(name, specials[i].file) == 0)
-			return bozo_http_error(httpd, 403, request,
+	for (i = 0; specials[i].file; i++) {
+		if (strcmp(name, specials[i].file) == 0) {
+			if (doerror) {
+error = bozo_http_error(httpd, 403, request,
 	   specials[i].name);
+			} else {
+error = -1;
+			}
+		}
+	}
 
-	return 0;
+	return error;
 }
 
 /* generic header printing routine */

Index: src/libexec/httpd/bozohttpd.h
diff -u src/libexec/httpd/bozohttpd.h:1.57 src/libexec/httpd/bozohttpd.h:1.58
--- src/libexec/httpd/bozohttpd.h:1.57	Sat Nov 24 13:02:46 2018
+++ src/libexec/httpd/bozohttpd.h	Tue Jan 22 05:32:57 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: bozohttpd.h,v 1.57 2018/11/24 13:02:46 christos Exp $	*/
+/*	$NetBSD: bozohttpd.h,v 1.58 2019/01/22 05:32:57 mrg Exp $	*/
 
 /*	$eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $	*/
 
@@ -34,6 +34,8 @@
 
 #include "netbsd_queue.h"
 
+#include 
+
 #include 
 
 #ifndef NO_LUA_SUPPORT
@@ -259,7 +261,7 @@ void	debug__(bozohttpd_t *, int, const c
 /* be sure to always return this error up */
 int	bozo_http_error(bozohttpd_t *, int, bozo_httpreq_t *, const char *);
 
-int	bozo_check_special_files(bozo_httpreq_t *, const char *) BOZO_CHECKRET;
+int	bozo_check_special_files(bozo_httpreq_t *, const char *, bool) B

CVS commit: src/libexec/httpd

[matthew green]

Module Name:src
Committed By:   mrg
Date:   Tue Jan 22 05:32:57 UTC 2019

Modified Files:
src/libexec/httpd: CHANGES auth-bozo.c bozohttpd.c bozohttpd.h
dir-index-bozo.c

Log Message:
o  don't display special files in the directory index.  they aren't
   served, but links to them are generated.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/libexec/httpd/CHANGES
cvs rdiff -u -r1.22 -r1.23 src/libexec/httpd/auth-bozo.c
cvs rdiff -u -r1.110 -r1.111 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.57 -r1.58 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.30 -r1.31 src/libexec/httpd/dir-index-bozo.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/kern

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Jan 22 03:44:45 UTC 2019

Modified Files:
src/sys/kern: core_elf32.c

Log Message:
Fix code generation for programs with a faulty process map

In case of any errors of scanning the segments reset
their content to a default value with zeros. This is
achieved with shortening the p_filesz parameter.

This allows to emit core(5) files for a process
regardless of its state of mappings, such as mapping
pages after EOF in a file.

Fixes PR lib/53343


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/kern/core_elf32.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tests/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Jan 22 03:47:45 UTC 2019

Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
Mark traceme_vfork_crash_bus as no longer failing

Fixed in src/sys/kern/core_elf32.c r. 1.58

Closes PR lib/53343


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/tests/lib/libc/sys/t_ptrace_wait.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tests/lib/libc/sys

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Jan 22 03:47:45 UTC 2019

Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c

Log Message:
Mark traceme_vfork_crash_bus as no longer failing

Fixed in src/sys/kern/core_elf32.c r. 1.58

Closes PR lib/53343


To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/tests/lib/libc/sys/t_ptrace_wait.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.68 src/tests/lib/libc/sys/t_ptrace_wait.c:1.69
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.68	Sun Jan 13 11:03:20 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c	Tue Jan 22 03:47:45 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: t_ptrace_wait.c,v 1.68 2019/01/13 11:03:20 gson Exp $	*/
+/*	$NetBSD: t_ptrace_wait.c,v 1.69 2019/01/22 03:47:45 kamil Exp $	*/
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.68 2019/01/13 11:03:20 gson Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.69 2019/01/22 03:47:45 kamil Exp $");
 
 #include 
 #include 
@@ -869,12 +869,6 @@ traceme_vfork_crash(int sig)
 	int status;
 #endif
 
-	if (sig == SIGBUS) {
-#ifndef TWAIT_WAITID
-		atf_tc_expect_fail("lib/53343");
-#endif
-	}
-
 	DPRINTF("Before forking process PID=%d\n", getpid());
 	SYSCALL_REQUIRE((child = vfork()) != -1);
 	if (child == 0) {

CVS commit: src/sys/kern

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Jan 22 03:44:45 UTC 2019

Modified Files:
src/sys/kern: core_elf32.c

Log Message:
Fix code generation for programs with a faulty process map

In case of any errors of scanning the segments reset
their content to a default value with zeros. This is
achieved with shortening the p_filesz parameter.

This allows to emit core(5) files for a process
regardless of its state of mappings, such as mapping
pages after EOF in a file.

Fixes PR lib/53343


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/sys/kern/core_elf32.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/kern/core_elf32.c
diff -u src/sys/kern/core_elf32.c:1.57 src/sys/kern/core_elf32.c:1.58
--- src/sys/kern/core_elf32.c:1.57	Mon Sep  3 16:29:35 2018
+++ src/sys/kern/core_elf32.c	Tue Jan 22 03:44:44 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: core_elf32.c,v 1.57 2018/09/03 16:29:35 riastradh Exp $	*/
+/*	$NetBSD: core_elf32.c,v 1.58 2019/01/22 03:44:44 kamil Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.57 2018/09/03 16:29:35 riastradh Exp $");
+__KERNEL_RCSID(1, "$NetBSD: core_elf32.c,v 1.58 2019/01/22 03:44:44 kamil Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_coredump.h"
@@ -313,8 +313,19 @@ ELFNAMEEND(coredump_getseghdrs)(struct u
 		int i;
 
 		end -= slen;
-		if ((error = copyin_proc(ws->p, (void *)end, buf, slen)) != 0)
-			return error;
+		if ((error = copyin_proc(ws->p, (void *)end, buf, slen)) != 0) {
+			/*
+			 * In case of any errors of scanning the segments reset
+			 * their content to a default value with zeros. This is
+			 * achieved with shortening the p_filesz parameter.
+			 *
+			 * This allows to emit core(5) files for a process
+			 * regardless of its state of mappings, such as mapping
+			 * pages after EOF in a file.
+			 */
+			realsize -= slen;
+			continue;
+		}
 
 		ep = (const long *) [slen / sizeof(buf[0])];
 		for (i = 0, ep--; buf <= ep; ep--, i++) {

CVS commit: src/sys

[SAITOH Masanobu]

Module Name:src
Committed By:   msaitoh
Date:   Tue Jan 22 03:42:28 UTC 2019

Modified Files:
src/sys/arch/arm/at91: at91emac.c
src/sys/arch/arm/ep93xx: epe.c
src/sys/arch/arm/gemini: gemini_gmac.c
src/sys/arch/arm/imx: if_enet.c
src/sys/arch/arm/omap: if_cpsw.c omapl1x_emac.c
src/sys/arch/arm/sunxi: sun4i_emac.c sunxi_emac.c
src/sys/arch/arm/ti: if_cpsw.c
src/sys/arch/arm/xscale: ixp425_if_npe.c
src/sys/arch/evbppc/virtex/dev: if_temac.c
src/sys/arch/macppc/dev: if_bm.c if_gm.c
src/sys/arch/mips/alchemy/dev: if_aumac.c
src/sys/arch/mips/atheros/dev: if_ae.c
src/sys/arch/mips/cavium/dev: if_cnmac.c octeon_smi.c octeon_smivar.h
src/sys/arch/mips/ralink: ralink_eth.c
src/sys/arch/mips/sibyte/dev: sbmac.c
src/sys/arch/playstation2/dev: emac3.c emac3var.h
src/sys/arch/powerpc/booke/dev: pq3etsec.c
src/sys/arch/powerpc/ibm4xx/dev: if_emac.c
src/sys/arch/sgimips/mace: if_mec.c
src/sys/dev/cadence: if_cemac.c
src/sys/dev/ic: aic6915.c ax88190.c dl10019.c dwc_gmac.c elink3.c
elinkxl.c gem.c hme.c i82557.c lan9118.c mtd803.c rtl8169.c
rtl81x9.c smc83c170.c smc91cxx.c tulip.c
src/sys/dev/marvell: if_gfe.c if_mvgbe.c if_mvxpe.c
src/sys/dev/mii: acphy.c amhphy.c atphy.c bmtphy.c brgphy.c ciphy.c
dmphy.c etphy.c exphy.c gentbi.c glxtphy.c gphyter.c icsphy.c
igphy.c igphyreg.h ihphy.c ikphy.c inphy.c iophy.c lxtphy.c
makphy.c mii.c mii_bitbang.c mii_bitbang.h mii_physubr.c miivar.h
nsphy.c nsphyter.c pnaphy.c qsphy.c rdcphy.c rgephy.c rlphy.c
sqphy.c tlphy.c tqphy.c ukphy.c ukphy_subr.c urlphy.c
src/sys/dev/pci: if_age.c if_alc.c if_ale.c if_bce.c if_bge.c if_bnx.c
if_cas.c if_et.c if_jme.c if_lii.c if_msk.c if_nfe.c if_pcn.c
if_sip.c if_sk.c if_ste.c if_stge.c if_tl.c if_vge.c if_vr.c
if_vte.c if_wm.c
src/sys/dev/pcmcia: if_xi.c
src/sys/dev/sbus: be.c
src/sys/dev/usb: if_aue.c if_axe.c if_axen.c if_mue.c if_smsc.c
if_udav.c if_url.c

Log Message:
 Change MII PHY read/write API from:

int (*mii_readreg_t)(device_t, int, int);
void (*mii_writereg_t)(device_t, int, int, int);
to:

int (*mii_readreg_t)(device_t, int, int, uint16_t *);
int (*mii_writereg_t)(device_t, int, int, uint16_t);

Now we can test if a read/write operation failed or not by the return value.

 In 802.3 spec says that the PHY shall not respond to read/write transaction
to the unimplemented register(22.2.4.3). Detecting timeout can be used to
check whether a register is implemented or not (if the register conforms to
the spec). ukphy(4) can be used this for MII_MMDACR and MII_MMDAADR.

 Note that I noticed that the following code do infinite loop in the
read/wirte function. If it accesses unimplemented PHY register, it will hang.
It should be fixed:

arm/at91/at91emac.c
arm/ep93xx/epe.c
arm/omap/omapl1x_emac.c
mips/ralink/ralink_eth.c
arch/powerpc/booke/dev/pq3etsec.c(read)
dev/cadence/if_cemac.c <- hkenken
dev/ic/lan9118.c

Tested with the following device:

axe+ukphy
axe+rgephy
axen+rgephy (tested by Andrius V)
wm+atphy
wm+ukphy
wm+igphy
wm+ihphy
wm+makphy
sk+makphy
sk+brgphy
sk+gentbi
msk+makphy
sip+icsphy
sip+ukphy
re+rgephy
bge+brgphy
bnx+brgphy
gsip+gphyter
rtk+rlphy
fxp+inphy   (tested by Andrius V)
tlp+acphy
ex+exphy
epic+qsphy
vge+ciphy   (tested by Andrius V)
vr+ukphy(tested by Andrius V)
vte+ukphy   (tested by Andrius V)

Not tested (MAC):
arm:at91emac
arm:cemac
arm:epe
arm:geminigmac
arm:enet
arm:cpsw
arm:emac(omac)
arm:emac(sunxi)
arm:npe
evbppc:temac
macppc:bm
macppc:gm
mips:aumac
mips:ae
mips:cnmac
mips:reth
mips:sbmac
playstation2:smap
powerpc:tsec
powerpc:emac(ibm4xx)
sgimips:mec
sparc:be
sf
ne(ax88190, dl10019)
awge
ep
gem
hme
smsh
mtd
sm
age
alc
ale
bce
cas
et
jme
lii
nfe
pcn
ste
stge
tl
xi
aue
mue
smsc
udav
url

Not tested (PHY):
amhphy
bmtphy
dmphy
etphy
glxtphy
ikphy
iophy
lxtphy
nsphyter
pnaphy
rdcphy
sqphy
tlphy
tqphy
urlphy


To generate a diff of 

CVS commit: src/distrib/sets/lists/xserver

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Jan 22 03:11:32 UTC 2019

Modified Files:
src/distrib/sets/lists/xserver: md.amd64 md.i386

Log Message:
Fix MKCATPAGES=yes build

Register vboxvideo.0 for i386 and amd64 sets.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.121 -r1.122 src/distrib/sets/lists/xserver/md.i386

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.104 src/distrib/sets/lists/xserver/md.amd64:1.105
--- src/distrib/sets/lists/xserver/md.amd64:1.104	Thu Jan 10 23:10:23 2019
+++ src/distrib/sets/lists/xserver/md.amd64	Tue Jan 22 03:11:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.104 2019/01/10 23:10:23 uwe Exp $
+# $NetBSD: md.amd64,v 1.105 2019/01/22 03:11:32 kamil Exp $
 ./usr/X11R7/bin/X	-unknown-	xorg
 ./usr/X11R7/bin/Xorg	-unknown-	xorg
 ./usr/X11R7/bin/cvt	-unknown-	xorg
@@ -343,6 +343,7 @@
 ./usr/X11R7/man/cat4/tdfx.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/trident.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/tseng.0-unknown-	.cat,xorg
+./usr/X11R7/man/cat4/vboxvideo.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/vesa.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/vga.0-unknown-	obsolete
 ./usr/X11R7/man/cat4/via.0-unknown-	obsolete

Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.121 src/distrib/sets/lists/xserver/md.i386:1.122
--- src/distrib/sets/lists/xserver/md.i386:1.121	Thu Jan 10 23:10:23 2019
+++ src/distrib/sets/lists/xserver/md.i386	Tue Jan 22 03:11:32 2019
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.121 2019/01/10 23:10:23 uwe Exp $
+# $NetBSD: md.i386,v 1.122 2019/01/22 03:11:32 kamil Exp $
 ./usr/X11R7/bin/X	-unknown-	xorg
 ./usr/X11R7/bin/Xorg	-unknown-	xorg
 ./usr/X11R7/bin/cvt	-unknown-	xorg
@@ -355,6 +355,7 @@
 ./usr/X11R7/man/cat4/tdfx.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/trident.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/tseng.0-unknown-	.cat,xorg
+./usr/X11R7/man/cat4/vboxvideo.0			-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/vesa.0-unknown-	.cat,xorg
 ./usr/X11R7/man/cat4/vga.0-unknown-	obsolete
 ./usr/X11R7/man/cat4/via.0-unknown-	obsolete

CVS commit: src/distrib/sets/lists/xserver

[Kamil Rytarowski]

Module Name:src
Committed By:   kamil
Date:   Tue Jan 22 03:11:32 UTC 2019

Modified Files:
src/distrib/sets/lists/xserver: md.amd64 md.i386

Log Message:
Fix MKCATPAGES=yes build

Register vboxvideo.0 for i386 and amd64 sets.


To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.121 -r1.122 src/distrib/sets/lists/xserver/md.i386

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

re: CVS commit: src/sys/rump/kern/lib/libsljit/arch/mips

[matthew green]

> Module Name:  src
> Committed By: alnsn
> Date: Tue Jan 22 01:25:53 UTC 2019
> 
> Modified Files:
>   src/sys/rump/kern/lib/libsljit/arch/mips: cache.c
> 
> Log Message:
> Cast register_t to uintptr_t before casting to void *.
> 
> Not sure what's going on here but evbmips64-el build fails
> without this cast.

on mips64 and the default userland, register_t is 64 bit
but uintptr_t and void * are both 32 bit.  your change
is right -- going via uintptr_t.


.mrg.

CVS commit: src/share/misc

[Hisashi T Fujinaka]

Module Name:src
Committed By:   htodd
Date:   Tue Jan 22 01:32:30 UTC 2019

Modified Files:
src/share/misc: acronyms.comp

Log Message:
EOIS, additional EOL, NRND added.


To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/share/misc/acronyms.comp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.224 src/share/misc/acronyms.comp:1.225
--- src/share/misc/acronyms.comp:1.224	Mon Jan 14 17:25:12 2019
+++ src/share/misc/acronyms.comp	Tue Jan 22 01:32:30 2019
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.224 2019/01/14 17:25:12 sevan Exp $
+$NetBSD: acronyms.comp,v 1.225 2019/01/22 01:32:30 htodd Exp $
 3WHS	three-way handshake
 8VSB	8-state vestigial side band modulation
 AA	anti-aliasing
@@ -468,6 +468,8 @@ EMR	electro-magnetic radiation
 EMACS	Editor MACroS
 EOF	end of file
 EOI	end of interrupt
+EOIS	end of interactive support
+EOL	end of life
 EOL	end of line
 EOT	end of transmission
 EPIC	explicitly parallel instruction computing
@@ -946,6 +948,7 @@ NOC	network operations center
 NOP	no operation
 NOS	network operating system
 NP	nondeterministic polynomial time
+NRND	not recommended for new designs
 NRZ	non-return to zero
 NSA	nation-state adversary
 NSA	no such agency

CVS commit: src/share/misc

[Hisashi T Fujinaka]

Module Name:src
Committed By:   htodd
Date:   Tue Jan 22 01:32:30 UTC 2019

Modified Files:
src/share/misc: acronyms.comp

Log Message:
EOIS, additional EOL, NRND added.


To generate a diff of this commit:
cvs rdiff -u -r1.224 -r1.225 src/share/misc/acronyms.comp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/rump/kern/lib/libsljit/arch/mips

[Alexander Nasonov]

Module Name:src
Committed By:   alnsn
Date:   Tue Jan 22 01:25:53 UTC 2019

Modified Files:
src/sys/rump/kern/lib/libsljit/arch/mips: cache.c

Log Message:
Cast register_t to uintptr_t before casting to void *.

Not sure what's going on here but evbmips64-el build fails
without this cast.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/kern/lib/libsljit/arch/mips/cache.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/rump/kern/lib/libsljit/arch/mips/cache.c
diff -u src/sys/rump/kern/lib/libsljit/arch/mips/cache.c:1.2 src/sys/rump/kern/lib/libsljit/arch/mips/cache.c:1.3
--- src/sys/rump/kern/lib/libsljit/arch/mips/cache.c:1.2	Tue Jan 22 00:36:02 2019
+++ src/sys/rump/kern/lib/libsljit/arch/mips/cache.c	Tue Jan 22 01:25:53 2019
@@ -1,4 +1,4 @@
-/*  $NetBSD: cache.c,v 1.2 2019/01/22 00:36:02 alnsn Exp $	*/
+/*  $NetBSD: cache.c,v 1.3 2019/01/22 01:25:53 alnsn Exp $	*/
 
 /*-
  * Copyright (c) 2014 Alexander Nasonov.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.2 2019/01/22 00:36:02 alnsn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.3 2019/01/22 01:25:53 alnsn Exp $");
 
 /*
  * Barebone implementation of mips cache routines for rump.
@@ -48,5 +48,5 @@ static void
 icache_sync_range(register_t va, vsize_t sz)
 {
 
-	(void)rumpcomp_sync_icache((void *)va, (uint64_t)sz);
+	(void)rumpcomp_sync_icache((void *)(uintptr_t)va, (uint64_t)sz);
 }

CVS commit: src/sys/rump/kern/lib/libsljit/arch/mips

[Alexander Nasonov]

Module Name:src
Committed By:   alnsn
Date:   Tue Jan 22 01:25:53 UTC 2019

Modified Files:
src/sys/rump/kern/lib/libsljit/arch/mips: cache.c

Log Message:
Cast register_t to uintptr_t before casting to void *.

Not sure what's going on here but evbmips64-el build fails
without this cast.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/kern/lib/libsljit/arch/mips/cache.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/rump/kern/lib/libsljit/arch/mips

[Alexander Nasonov]

Module Name:src
Committed By:   alnsn
Date:   Tue Jan 22 00:36:02 UTC 2019

Modified Files:
src/sys/rump/kern/lib/libsljit/arch/mips: cache.c

Log Message:
Sync the first argument type with mco_icache_sync_range.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/kern/lib/libsljit/arch/mips/cache.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/rump/kern/lib/libsljit/arch/mips/cache.c
diff -u src/sys/rump/kern/lib/libsljit/arch/mips/cache.c:1.1 src/sys/rump/kern/lib/libsljit/arch/mips/cache.c:1.2
--- src/sys/rump/kern/lib/libsljit/arch/mips/cache.c:1.1	Tue Jul 22 20:25:13 2014
+++ src/sys/rump/kern/lib/libsljit/arch/mips/cache.c	Tue Jan 22 00:36:02 2019
@@ -1,4 +1,4 @@
-/*  $NetBSD: cache.c,v 1.1 2014/07/22 20:25:13 alnsn Exp $	*/
+/*  $NetBSD: cache.c,v 1.2 2019/01/22 00:36:02 alnsn Exp $	*/
 
 /*-
  * Copyright (c) 2014 Alexander Nasonov.
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.1 2014/07/22 20:25:13 alnsn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.2 2019/01/22 00:36:02 alnsn Exp $");
 
 /*
  * Barebone implementation of mips cache routines for rump.
@@ -38,14 +38,14 @@ __KERNEL_RCSID(0, "$NetBSD: cache.c,v 1.
 
 #include "sljit_rump.h"
 
-static void icache_sync_range(vaddr_t, vsize_t);
+static void icache_sync_range(register_t, vsize_t);
 
 struct mips_cache_ops mips_cache_ops = {
 	.mco_icache_sync_range = _sync_range
 };
 
 static void
-icache_sync_range(vaddr_t va, vsize_t sz)
+icache_sync_range(register_t va, vsize_t sz)
 {
 
 	(void)rumpcomp_sync_icache((void *)va, (uint64_t)sz);

CVS commit: src/sys/rump/kern/lib/libsljit/arch/mips

[Alexander Nasonov]

Module Name:src
Committed By:   alnsn
Date:   Tue Jan 22 00:36:02 UTC 2019

Modified Files:
src/sys/rump/kern/lib/libsljit/arch/mips: cache.c

Log Message:
Sync the first argument type with mco_icache_sync_range.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/kern/lib/libsljit/arch/mips/cache.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tests/lib/libcurses

[Brett Lymn]

Module Name:src
Committed By:   blymn
Date:   Mon Jan 21 21:21:13 UTC 2019

Modified Files:
src/tests/lib/libcurses: debug_test

Log Message:
Fix script to use getopts instead of a hand rolled argument parser,
add option to set curses debug output file and other general fixes.
Thanks to k...@netbsd.org for comments and help with this.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/debug_test

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/tests/lib/libcurses

[Brett Lymn]

Module Name:src
Committed By:   blymn
Date:   Mon Jan 21 21:21:13 UTC 2019

Modified Files:
src/tests/lib/libcurses: debug_test

Log Message:
Fix script to use getopts instead of a hand rolled argument parser,
add option to set curses debug output file and other general fixes.
Thanks to k...@netbsd.org for comments and help with this.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/lib/libcurses/debug_test

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/lib/libcurses/debug_test
diff -u src/tests/lib/libcurses/debug_test:1.1 src/tests/lib/libcurses/debug_test:1.2
--- src/tests/lib/libcurses/debug_test:1.1	Fri Nov 30 04:57:02 2018
+++ src/tests/lib/libcurses/debug_test	Mon Jan 21 21:21:13 2019
@@ -1,13 +1,5 @@
 #!/bin/sh
 #
-# Set up the environment to run the test frame.  Option flags:
-#
-# -c : Set up curses tracing, assumes the curses lib has been built with
-#  debug enabled.  Default trace mask traces input, can be overridden
-#  by setting the trace mask in the environment before calling the
-#  script.
-# -s : Specify the slave command.  Defaults to "../slave/slave"
-# -v : Enable verbose output
 #
 BASEDIR="/usr/tests/lib/libcurses"
 CHECK_PATH="${BASEDIR}/check_files/"
@@ -15,15 +7,31 @@ export CHECK_PATH
 INCLUDE_PATH="${BASEDIR}/tests/"
 export INCLUDE_PATH
 #
+CURSES_TRACE_FILE="/tmp/ctrace"
 SLAVE="${BASEDIR}/slave"
+
+usage() {
+	echo "Set up the environment to run the test frame.  Option flags:"
+	echo
+	echo "-c : Set up curses tracing, assumes the curses lib has been built with"
+	echo " debug enabled.  Default trace mask traces input, can be overridden"
+	echo " by setting the trace mask in the environment before calling the"
+	echo " The trace file output goes to /tmp/ctrace"
+	echo " script."
+	echo "-f : Specify the file name for curses tracing the default is"
+	echo " ${CURSES_TRACE_FILE}"
+	echo "-s : Specify the slave command.  Defaults to \"../slave/slave\""
+	echo "-v : Enable verbose output"
+	echo
+}
+
 #
 ARGS=""
 #
-while /usr/bin/true
+while getopts cf:s:v opt
 do
-case $1 in
-	-c)
-	CURSES_TRACE_FILE="/tmp/ctrace"
+case "${opt}" in
+	c)
 	if [ "X$CURSES_TRACE_MASK" = "X" ]; then
 		CURSES_TRACE_MASK=0x0082
 	fi
@@ -31,21 +39,35 @@ do
 	export CURSES_TRACE_MASK
 	;;
 
-	-s)
-	SLAVE=$2
-	shift
+	f)
+	CURSES_TRACE_FILE=${OPTARG}
+	;;
+
+	s)
+	SLAVE=${OPTARG}
 	;;
 
-	-v)
+	v)
 	ARGS="-v"
 	;;
 
-	*)
-	break
+	\?)
+	usage
+	exit 1
 	;;
 esac
-
-shift
 done
 #
-exec ${BASEDIR}/director ${ARGS} -s ${SLAVE} ${INCLUDE_PATH}/$@
+shift $((OPTIND - 1))
+#
+if [ -z "${1}" ]
+then
+	echo
+	echo "A test name needs to be specified."
+	echo
+	usage
+	echo
+	exit 1
+fi
+#
+exec ${BASEDIR}/director ${ARGS} -s ${SLAVE} "${INCLUDE_PATH}/$1"

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jan 21 21:11:55 UTC 2019

Modified Files:
src/share/mk: bsd.dep.mk bsd.hostprog.mk bsd.info.mk bsd.kmodule.mk
bsd.lib.mk bsd.man.mk bsd.prog.mk bsd.sys.mk bsd.test.mk bsd.x11.mk
sys.mk

Log Message:
Most of the mv operations are to move temporary files to their final place.
Some use -f, others don't. This can lead to spurious build failures when
the user performing the build changes. Centralize, and always use -f.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.80 -r1.81 src/share/mk/bsd.hostprog.mk
cvs rdiff -u -r1.41 -r1.42 src/share/mk/bsd.info.mk
cvs rdiff -u -r1.59 -r1.60 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.378 -r1.379 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.119 -r1.120 src/share/mk/bsd.man.mk
cvs rdiff -u -r1.318 -r1.319 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.289 -r1.290 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.25 -r1.26 src/share/mk/bsd.test.mk
cvs rdiff -u -r1.127 -r1.128 src/share/mk/bsd.x11.mk
cvs rdiff -u -r1.137 -r1.138 src/share/mk/sys.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/share/mk

[Christos Zoulas]

Module Name:src
Committed By:   christos
Date:   Mon Jan 21 21:11:55 UTC 2019

Modified Files:
src/share/mk: bsd.dep.mk bsd.hostprog.mk bsd.info.mk bsd.kmodule.mk
bsd.lib.mk bsd.man.mk bsd.prog.mk bsd.sys.mk bsd.test.mk bsd.x11.mk
sys.mk

Log Message:
Most of the mv operations are to move temporary files to their final place.
Some use -f, others don't. This can lead to spurious build failures when
the user performing the build changes. Centralize, and always use -f.


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 src/share/mk/bsd.dep.mk
cvs rdiff -u -r1.80 -r1.81 src/share/mk/bsd.hostprog.mk
cvs rdiff -u -r1.41 -r1.42 src/share/mk/bsd.info.mk
cvs rdiff -u -r1.59 -r1.60 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.378 -r1.379 src/share/mk/bsd.lib.mk
cvs rdiff -u -r1.119 -r1.120 src/share/mk/bsd.man.mk
cvs rdiff -u -r1.318 -r1.319 src/share/mk/bsd.prog.mk
cvs rdiff -u -r1.289 -r1.290 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.25 -r1.26 src/share/mk/bsd.test.mk
cvs rdiff -u -r1.127 -r1.128 src/share/mk/bsd.x11.mk
cvs rdiff -u -r1.137 -r1.138 src/share/mk/sys.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/share/mk/bsd.dep.mk
diff -u src/share/mk/bsd.dep.mk:1.83 src/share/mk/bsd.dep.mk:1.84
--- src/share/mk/bsd.dep.mk:1.83	Tue Dec 20 22:00:51 2016
+++ src/share/mk/bsd.dep.mk	Mon Jan 21 16:11:54 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.dep.mk,v 1.83 2016/12/21 03:00:51 christos Exp $
+#	$NetBSD: bsd.dep.mk,v 1.84 2019/01/21 21:11:54 christos Exp $
 
 # Basic targets
 realdepend:	beforedepend .depend afterdepend
@@ -64,7 +64,7 @@ _MKDEP_FILEFLAGS=
 	${CFLAGS:M-std=*} ${CFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
 	${CPPFLAGS:N-Wp,-iremap,*} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
 	${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
-	mv ${.TARGET}.tmp ${.TARGET}
+	${MV} ${.TARGET}.tmp ${.TARGET}
 
 .m.d:
 	${_MKTARGET_CREATE}
@@ -72,7 +72,7 @@ _MKDEP_FILEFLAGS=
 	${OBJCFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
 	${CPPFLAGS:N-Wp,-iremap,*} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
 	${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
-	mv ${.TARGET}.tmp ${.TARGET}
+	${MV} ${.TARGET}.tmp ${.TARGET}
 
 .s.d .S.d:
 	${_MKTARGET_CREATE}
@@ -80,7 +80,7 @@ _MKDEP_FILEFLAGS=
 	${AFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
 	${CPPFLAGS:N-Wp,-iremap,*} ${AFLAGS.${.IMPSRC:T}} ${CPPFLAGS.${.IMPSRC:T}} \
 	${__acpp_flags} ${.IMPSRC} && \
-	mv ${.TARGET}.tmp ${.TARGET}
+	${MV} ${.TARGET}.tmp ${.TARGET}
 
 .C.d .cc.d .cpp.d .cxx.d:
 	${_MKTARGET_CREATE}
@@ -88,7 +88,7 @@ _MKDEP_FILEFLAGS=
 	${CXXFLAGS:M-std=*} ${CXXFLAGS:C/-([IDU])[  ]*/-\1/Wg:M-[IDU]*} \
 	${CPPFLAGS:N-Wp,-iremap,*} ${COPTS.${.IMPSRC:T}} ${CPUFLAGS.${.IMPSRC:T}} \
 	${CPPFLAGS.${.IMPSRC:T}} ${.IMPSRC} && \
-	mv ${.TARGET}.tmp ${.TARGET}
+	${MV} ${.TARGET}.tmp ${.TARGET}
 
 .endif # defined(SRCS) && !empty(SRCS)	# }
 

Index: src/share/mk/bsd.hostprog.mk
diff -u src/share/mk/bsd.hostprog.mk:1.80 src/share/mk/bsd.hostprog.mk:1.81
--- src/share/mk/bsd.hostprog.mk:1.80	Fri May  4 10:50:40 2018
+++ src/share/mk/bsd.hostprog.mk	Mon Jan 21 16:11:54 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.hostprog.mk,v 1.80 2018/05/04 14:50:40 christos Exp $
+#	$NetBSD: bsd.hostprog.mk,v 1.81 2019/01/21 21:11:54 christos Exp $
 #	@(#)bsd.prog.mk	8.2 (Berkeley) 4/2/94
 
 .include 
@@ -165,7 +165,7 @@ ${TARGETS}:	# ensure existence
 	echo '#include "nbtool_config.h"' >> ${.TARGET}.1
 	echo '#endif' >> ${.TARGET}.1
 	cat ${.TARGET} >> ${.TARGET}.1
-	mv ${.TARGET}.1 ${.TARGET}
+	${MV} ${.TARGET}.1 ${.TARGET}
 .y.c:
 	${_MKTARGET_YACC}
 	${YACC.y} -o ${.TARGET} ${.IMPSRC}
@@ -173,4 +173,4 @@ ${TARGETS}:	# ensure existence
 	echo '#include "nbtool_config.h"' >> ${.TARGET}.1
 	echo '#endif' >> ${.TARGET}.1
 	cat ${.TARGET} >> ${.TARGET}.1
-	mv ${.TARGET}.1 ${.TARGET}
+	${MV} ${.TARGET}.1 ${.TARGET}

Index: src/share/mk/bsd.info.mk
diff -u src/share/mk/bsd.info.mk:1.41 src/share/mk/bsd.info.mk:1.42
--- src/share/mk/bsd.info.mk:1.41	Fri Dec 18 13:57:56 2015
+++ src/share/mk/bsd.info.mk	Mon Jan 21 16:11:54 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.info.mk,v 1.41 2015/12/18 18:57:56 christos Exp $
+#	$NetBSD: bsd.info.mk,v 1.42 2019/01/21 21:11:54 christos Exp $
 
 .include 
 
@@ -48,7 +48,7 @@ __infoinstall: .USE
 	${TOOL_INSTALL_INFO} -d ${INFODIRFILE} -r ${.TARGET} 2> /dev/null; \
 	${TOOL_INSTALL_INFO} -d ${INFODIRFILE} ${.TARGET};		\
 	${TOOL_SORTINFO} < ${INFODIRFILE} > ${INFODIRFILE}.tmp;		\
-	mv -f ${INFODIRFILE}.tmp ${INFODIRFILE};			\
+	${MV} ${INFODIRFILE}.tmp ${INFODIRFILE};			\
 	rm -f ${INFODIRFILE}.lock
 
 

Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.59 src/share/mk/bsd.kmodule.mk:1.60
--- src/share/mk/bsd.kmodule.mk:1.59	Wed Jan 11 07:19:43 2017
+++ src/share/mk/bsd.kmodule.mk	Mon Jan 21 16:11:54 2019
@@ -1,4 +1,4 @@
-#	$NetBSD: 

CVS commit: src/sys/sys

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Jan 21 20:29:27 UTC 2019

Modified Files:
src/sys/sys: common_limits.h

Log Message:
Fix wrong scoping of {U,}LLONG_MAX. Final case, I think.
PR 53298 from Roberto E. Vargas Caballero.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/sys/common_limits.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/sys/common_limits.h
diff -u src/sys/sys/common_limits.h:1.2 src/sys/sys/common_limits.h:1.3
--- src/sys/sys/common_limits.h:1.2	Tue Aug 19 15:46:46 2014
+++ src/sys/sys/common_limits.h	Mon Jan 21 20:29:27 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: common_limits.h,v 1.2 2014/08/19 15:46:46 matt Exp $	*/
+/*	$NetBSD: common_limits.h,v 1.3 2019/01/21 20:29:27 dholland Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -50,10 +50,6 @@
 #define	LONG_MAX	__LONG_MAX__		/* max value for a long */
 #define	ULONG_MAX	(2UL*LONG_MAX+1UL)	/* max unsigned long */
 
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
-defined(_NETBSD_SOURCE)
-#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
-
 #if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
 defined(_NETBSD_SOURCE)
 #define	LLONG_MIN	(-__LONG_LONG_MAX__-1LL) /* min signed long long */
@@ -61,6 +57,10 @@
 #define	ULLONG_MAX	(2ULL*LLONG_MAX+1ULL)	/* max unsigned long long */
 #endif
 
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+defined(_NETBSD_SOURCE)
+#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
+
 #if defined(_NETBSD_SOURCE)
 #define	SSIZE_MIN	LONG_MIN	/* min value for a ssize_t */
 #define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */

CVS commit: src/sys/sys

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Jan 21 20:29:27 UTC 2019

Modified Files:
src/sys/sys: common_limits.h

Log Message:
Fix wrong scoping of {U,}LLONG_MAX. Final case, I think.
PR 53298 from Roberto E. Vargas Caballero.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/sys/common_limits.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

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Jan 21 20:28:18 UTC 2019

Modified Files:
src/sys/arch/alpha/include: limits.h
src/sys/arch/arm/include: limits.h
src/sys/arch/hppa/include: limits.h
src/sys/arch/i386/include: limits.h
src/sys/arch/ia64/include: limits.h
src/sys/arch/m68k/include: limits.h
src/sys/arch/mips/include: limits.h
src/sys/arch/powerpc/include: limits.h
src/sys/arch/sh3/include: limits.h
src/sys/arch/sparc/include: limits.h
src/sys/arch/vax/include: limits.h

Log Message:
Fix wrong scoping of {U,}LLONG_MAX. More cases, not just amd64.
PR 53298 from Roberto E. Vargas Caballero.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/include/limits.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/include/limits.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/include/limits.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/include/limits.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/include/limits.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/m68k/include/limits.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mips/include/limits.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/include/limits.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sh3/include/limits.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc/include/limits.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/include/limits.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/usr.bin/msgc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jan 21 20:28:09 UTC 2019

Modified Files:
src/usr.bin/msgc: msg_sys.def

Log Message:
msg_prompt_win: if the default string fits, show it separately even
in fixed size windows. Previously it would only show up when auto-sizing
prompts figured it would fit (probably an oversight).


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/msgc/msg_sys.def

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Jan 21 20:28:18 UTC 2019

Modified Files:
src/sys/arch/alpha/include: limits.h
src/sys/arch/arm/include: limits.h
src/sys/arch/hppa/include: limits.h
src/sys/arch/i386/include: limits.h
src/sys/arch/ia64/include: limits.h
src/sys/arch/m68k/include: limits.h
src/sys/arch/mips/include: limits.h
src/sys/arch/powerpc/include: limits.h
src/sys/arch/sh3/include: limits.h
src/sys/arch/sparc/include: limits.h
src/sys/arch/vax/include: limits.h

Log Message:
Fix wrong scoping of {U,}LLONG_MAX. More cases, not just amd64.
PR 53298 from Roberto E. Vargas Caballero.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/alpha/include/limits.h
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/include/limits.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/hppa/include/limits.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/i386/include/limits.h
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/include/limits.h
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/m68k/include/limits.h
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mips/include/limits.h
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/include/limits.h
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sh3/include/limits.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sparc/include/limits.h
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/vax/include/limits.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/alpha/include/limits.h
diff -u src/sys/arch/alpha/include/limits.h:1.16 src/sys/arch/alpha/include/limits.h:1.17
--- src/sys/arch/alpha/include/limits.h:1.16	Mon Apr 21 10:53:47 2014
+++ src/sys/arch/alpha/include/limits.h	Mon Jan 21 20:28:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: limits.h,v 1.16 2014/04/21 10:53:47 matt Exp $ */
+/* $NetBSD: limits.h,v 1.17 2019/01/21 20:28:17 dholland Exp $ */
 
 /*
  * Copyright (c) 1988, 1993
@@ -64,10 +64,6 @@
 #define	LONG_MAX	0x7fffL	/* max for a long */
 #define	LONG_MIN	(-0x7fffL-1) /* min for a long */
 
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
-defined(_NETBSD_SOURCE)
-#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
-
 #if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
 defined(_NETBSD_SOURCE)
 #define	ULLONG_MAX	0xULL	/* max unsigned long long */
@@ -75,6 +71,10 @@
 #define	LLONG_MIN	(-0x7fffLL-1) /* min signed long long */
 #endif
 
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+defined(_NETBSD_SOURCE)
+#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
+
 #if defined(_NETBSD_SOURCE)
 #define	SSIZE_MIN	LONG_MIN	/* min value for a ssize_t */
 #define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */

Index: src/sys/arch/arm/include/limits.h
diff -u src/sys/arch/arm/include/limits.h:1.18 src/sys/arch/arm/include/limits.h:1.19
--- src/sys/arch/arm/include/limits.h:1.18	Mon Feb 24 16:57:57 2014
+++ src/sys/arch/arm/include/limits.h	Mon Jan 21 20:28:17 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: limits.h,v 1.18 2014/02/24 16:57:57 christos Exp $	*/
+/*	$NetBSD: limits.h,v 1.19 2019/01/21 20:28:17 dholland Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -60,10 +60,6 @@
 #define	LONG_MIN	(-0x7fffL-1)	/* min value for a long */
 #endif
 
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
-defined(_NETBSD_SOURCE)
-#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
-
 #if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
 defined(_NETBSD_SOURCE)
 #define	ULLONG_MAX	0xULL	/* max unsigned long long */
@@ -71,6 +67,10 @@
 #define	LLONG_MIN	(-0x7fffLL-1) /* min signed long long */
 #endif
 
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+defined(_NETBSD_SOURCE)
+#define	SSIZE_MAX	LONG_MAX	/* max value for a ssize_t */
+
 #if defined(_NETBSD_SOURCE)
 #define	SSIZE_MIN	LONG_MIN	/* min value for a ssize_t */
 #define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */

Index: src/sys/arch/hppa/include/limits.h
diff -u src/sys/arch/hppa/include/limits.h:1.15 src/sys/arch/hppa/include/limits.h:1.16
--- src/sys/arch/hppa/include/limits.h:1.15	Thu Apr 11 00:57:34 2013
+++ src/sys/arch/hppa/include/limits.h	Mon Jan 21 20:28:17 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: limits.h,v 1.15 2013/04/11 00:57:34 christos Exp $	*/
+/*	$NetBSD: limits.h,v 1.16 2019/01/21 20:28:17 dholland Exp $	*/
 
 /*	$OpenBSD: limits.h,v 1.2 2000/07/31 20:06:02 millert Exp $	*/
 
@@ -89,10 +89,6 @@
 #define	LONG_MAX	0x7fffL	/* max value for a long */
 #define	LONG_MIN	(-0x7fffL-1)	/* min value for a long */
 
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
-defined(_NETBSD_SOURCE)
-#define	SSIZE_MAX	INT_MAX		/* max value for a ssize_t */
-
 #if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 

CVS commit: src/usr.bin/msgc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jan 21 20:28:09 UTC 2019

Modified Files:
src/usr.bin/msgc: msg_sys.def

Log Message:
msg_prompt_win: if the default string fits, show it separately even
in fixed size windows. Previously it would only show up when auto-sizing
prompts figured it would fit (probably an oversight).


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/usr.bin/msgc/msg_sys.def

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/msgc/msg_sys.def
diff -u src/usr.bin/msgc/msg_sys.def:1.41 src/usr.bin/msgc/msg_sys.def:1.42
--- src/usr.bin/msgc/msg_sys.def:1.41	Tue Mar  6 16:26:01 2012
+++ src/usr.bin/msgc/msg_sys.def	Mon Jan 21 20:28:08 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg_sys.def,v 1.41 2012/03/06 16:26:01 mbalmer Exp $	*/
+/*	$NetBSD: msg_sys.def,v 1.42 2019/01/21 20:28:08 martin Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -505,6 +505,10 @@ msg_prompt_win(msg msg_no, int x, int y,
 			}
 			w = maxx;
 		}
+	} else if (w > 0 && def != NULL && *def != 0) {
+		size_t tl = strlen(def);
+		if (tl + 1 + 2 + val_buf_len + 1 < (unsigned)w)
+			msg_flags &= ~MSG_PROMPT_HIDE_DFLT;
 	}
 
 	if (x == -1)

CVS commit: src/sys/arch/amd64/include

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Jan 21 20:22:48 UTC 2019

Modified Files:
src/sys/arch/amd64/include: limits.h

Log Message:
Fix wrong scoping of {U,}LLONG_MAX.
PR 53298 from Roberto E. Vargas Caballero.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/include/limits.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/amd64/include/limits.h
diff -u src/sys/arch/amd64/include/limits.h:1.14 src/sys/arch/amd64/include/limits.h:1.15
--- src/sys/arch/amd64/include/limits.h:1.14	Mon Apr 21 10:53:47 2014
+++ src/sys/arch/amd64/include/limits.h	Mon Jan 21 20:22:48 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: limits.h,v 1.14 2014/04/21 10:53:47 matt Exp $	*/
+/*	$NetBSD: limits.h,v 1.15 2019/01/21 20:22:48 dholland Exp $	*/
 
 /*
  * Copyright (c) 1988 The Regents of the University of California.
@@ -56,10 +56,6 @@
 #define	LONG_MAX	0x7fffL	/* max value for a long */
 #define	LONG_MIN	(-0x7fffL-1)	/* min value for a long */
 
-#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
-defined(_NETBSD_SOURCE)
-#define	SSIZE_MAX	LONG_MAX		/* max value for a ssize_t */
-
 #if defined(_ISOC99_SOURCE) || (__STDC_VERSION__ - 0) >= 199901L || \
 defined(_NETBSD_SOURCE)
 #define	ULLONG_MAX	0xULL	/* max unsigned long long */
@@ -67,6 +63,10 @@
 #define	LLONG_MIN	(-0x7fffLL-1) /* min signed long long */
 #endif
 
+#if defined(_POSIX_C_SOURCE) || defined(_XOPEN_SOURCE) || \
+defined(_NETBSD_SOURCE)
+#define	SSIZE_MAX	LONG_MAX		/* max value for a ssize_t */
+
 #if defined(_NETBSD_SOURCE)
 #define	SSIZE_MIN	LONG_MIN		/* min value for a ssize_t */
 #define	SIZE_T_MAX	ULONG_MAX	/* max value for a size_t */

CVS commit: src/sys/arch/amd64/include

[David A. Holland]

Module Name:src
Committed By:   dholland
Date:   Mon Jan 21 20:22:48 UTC 2019

Modified Files:
src/sys/arch/amd64/include: limits.h

Log Message:
Fix wrong scoping of {U,}LLONG_MAX.
PR 53298 from Roberto E. Vargas Caballero.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/amd64/include/limits.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jan 21 20:12:40 UTC 2019

Modified Files:
src/doc [netbsd-8]: CHANGES-8.1

Log Message:
Ticket #1166


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.91 -r1.1.2.92 src/doc/CHANGES-8.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/doc/CHANGES-8.1
diff -u src/doc/CHANGES-8.1:1.1.2.91 src/doc/CHANGES-8.1:1.1.2.92
--- src/doc/CHANGES-8.1:1.1.2.91	Sun Jan 20 15:35:24 2019
+++ src/doc/CHANGES-8.1	Mon Jan 21 20:12:40 2019
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.1,v 1.1.2.91 2019/01/20 15:35:24 martin Exp $
+# $NetBSD: CHANGES-8.1,v 1.1.2.92 2019/01/21 20:12:40 martin Exp $
 
 A complete list of changes from the NetBSD 8.0 release to the NetBSD 8.1
 release:
@@ -2263,3 +2263,8 @@ sys/external/bsd/drm2/pci/drm_pci.c		1.3
 	Don't try to interpret the second half of a 64-bit BAR as another one.
 	[dholland, ticket #1165]
 
+sys/arch/xen/xen/if_xennet_xenbus.c		1.74
+
+	Don't call xennet_softstart from hard interrupt; schedule softint.
+	[bouyer, ticket #1166]
+

CVS commit: [netbsd-8] src/sys/arch/xen/xen

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jan 21 20:12:15 UTC 2019

Modified Files:
src/sys/arch/xen/xen [netbsd-8]: if_xennet_xenbus.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1166):

sys/arch/xen/xen/if_xennet_xenbus.c: revision 1.74

Don't call xennet_softstart from hard interrupt; schedule softint.

Fixes panic in bpf_mtap which expects to be called only in softint.


To generate a diff of this commit:
cvs rdiff -u -r1.70.6.1 -r1.70.6.2 src/sys/arch/xen/xen/if_xennet_xenbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/xen/xen/if_xennet_xenbus.c
diff -u src/sys/arch/xen/xen/if_xennet_xenbus.c:1.70.6.1 src/sys/arch/xen/xen/if_xennet_xenbus.c:1.70.6.2
--- src/sys/arch/xen/xen/if_xennet_xenbus.c:1.70.6.1	Thu Jul 26 23:55:29 2018
+++ src/sys/arch/xen/xen/if_xennet_xenbus.c	Mon Jan 21 20:12:15 2019
@@ -1,4 +1,4 @@
-/*  $NetBSD: if_xennet_xenbus.c,v 1.70.6.1 2018/07/26 23:55:29 snj Exp $  */
+/*  $NetBSD: if_xennet_xenbus.c,v 1.70.6.2 2019/01/21 20:12:15 martin Exp $  */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -85,7 +85,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.70.6.1 2018/07/26 23:55:29 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_xennet_xenbus.c,v 1.70.6.2 2019/01/21 20:12:15 martin Exp $");
 
 #include "opt_xen.h"
 #include "opt_nfs_boot.h"
@@ -953,7 +953,7 @@ again:
 end:
 	if (ifp->if_flags & IFF_OACTIVE) {
 		ifp->if_flags &= ~IFF_OACTIVE;
-		xennet_softstart(sc);
+		softint_schedule(sc->sc_softintr);
 	}
 }
 

CVS commit: [netbsd-8] src/sys/arch/xen/xen

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jan 21 20:12:15 UTC 2019

Modified Files:
src/sys/arch/xen/xen [netbsd-8]: if_xennet_xenbus.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1166):

sys/arch/xen/xen/if_xennet_xenbus.c: revision 1.74

Don't call xennet_softstart from hard interrupt; schedule softint.

Fixes panic in bpf_mtap which expects to be called only in softint.


To generate a diff of this commit:
cvs rdiff -u -r1.70.6.1 -r1.70.6.2 src/sys/arch/xen/xen/if_xennet_xenbus.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: [netbsd-8] src/doc

[Martin Husemann]

Module Name:src
Committed By:   martin
Date:   Mon Jan 21 20:12:40 UTC 2019

Modified Files:
src/doc [netbsd-8]: CHANGES-8.1

Log Message:
Ticket #1166


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.91 -r1.1.2.92 src/doc/CHANGES-8.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/games/fortune/datfiles

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Mon Jan 21 16:58:47 UTC 2019

Modified Files:
src/games/fortune/datfiles: fortunes

Log Message:
Add Alfred North Whitehead quote.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/games/fortune/datfiles/fortunes

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/games/fortune/datfiles/fortunes
diff -u src/games/fortune/datfiles/fortunes:1.77 src/games/fortune/datfiles/fortunes:1.78
--- src/games/fortune/datfiles/fortunes:1.77	Sun Jan 13 17:55:03 2019
+++ src/games/fortune/datfiles/fortunes	Mon Jan 21 16:58:47 2019
@@ -16253,3 +16253,7 @@ I never saw a Purple Cow;		I'm sorry
 I never hope to see one;		But I can tell you, anyhow,
 But I can tell you, anyhow,		I'll kill you if you quote it!
 I'd rather see than be one.-- Gelett Burgess
+%
+Civilization advances by extending the number of important operations which we
+can perform without thinking about them.
+		-- Alfred North Whitehead, An Introduction to Mathematics (1911)

CVS commit: src/games/fortune/datfiles

[Sevan Janiyan]

Module Name:src
Committed By:   sevan
Date:   Mon Jan 21 16:58:47 UTC 2019

Modified Files:
src/games/fortune/datfiles: fortunes

Log Message:
Add Alfred North Whitehead quote.


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/games/fortune/datfiles/fortunes

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/distrib/utils/embedded/conf

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 21 16:28:39 UTC 2019

Modified Files:
src/distrib/utils/embedded/conf: armv7.conf

Log Message:
No need to specify root and console bootargs on amlogic


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/distrib/utils/embedded/conf/armv7.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/utils/embedded/conf/armv7.conf
diff -u src/distrib/utils/embedded/conf/armv7.conf:1.29 src/distrib/utils/embedded/conf/armv7.conf:1.30
--- src/distrib/utils/embedded/conf/armv7.conf:1.29	Sun Jan 20 10:18:03 2019
+++ src/distrib/utils/embedded/conf/armv7.conf	Mon Jan 21 16:28:39 2019
@@ -1,4 +1,4 @@
-# $NetBSD: armv7.conf,v 1.29 2019/01/20 10:18:03 skrll Exp $
+# $NetBSD: armv7.conf,v 1.30 2019/01/21 16:28:39 jmcneill Exp $
 # ARMv7 customization script used by mkimage
 #
 board=armv7
@@ -100,7 +100,7 @@ populate_amlogic() {
 	cat >> "${mnt}/boot/boot.ini" << EOF
 ODROIDC-UBOOT-CONFIG
 
-setenv bootargs "root=ld0a awge0.mac-address=\${ethaddr} console=${console}"
+setenv bootargs "awge0.mac-address=\${ethaddr}"
 setenv bootcmd "fatload mmc 0:1 0x2100 ${odroidc1_kernelimg}; fatload mmc 0:1 0x2000 meson8b-odroidc1.dtb; bootm 0x2100 - 0x2000"
 run bootcmd
 EOF

CVS commit: src/distrib/utils/embedded/conf

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 21 16:28:39 UTC 2019

Modified Files:
src/distrib/utils/embedded/conf: armv7.conf

Log Message:
No need to specify root and console bootargs on amlogic


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/distrib/utils/embedded/conf/armv7.conf

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch/arm/amlogic

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 21 16:27:48 UTC 2019

Modified Files:
src/sys/arch/arm/amlogic: meson_platform.c

Log Message:
Auto-detect root device on Meson8b


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/meson_platform.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/amlogic/meson_platform.c
diff -u src/sys/arch/arm/amlogic/meson_platform.c:1.2 src/sys/arch/arm/amlogic/meson_platform.c:1.3
--- src/sys/arch/arm/amlogic/meson_platform.c:1.2	Sun Jan 20 16:02:32 2019
+++ src/sys/arch/arm/amlogic/meson_platform.c	Mon Jan 21 16:27:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meson_platform.c,v 1.2 2019/01/20 16:02:32 jmcneill Exp $ */
+/* $NetBSD: meson_platform.c,v 1.3 2019/01/21 16:27:48 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill 
@@ -33,7 +33,7 @@
 #include "arml2cc.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.2 2019/01/20 16:02:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: meson_platform.c,v 1.3 2019/01/21 16:27:48 jmcneill Exp $");
 
 #include 
 #include 
@@ -197,6 +197,57 @@ meson_platform_device_register(device_t 
 	}
 }
 
+#if defined(SOC_MESON8B)
+#define	MESON8B_BOOTINFO_REG	0xd901ff04
+static int
+meson8b_get_boot_id(void)
+{
+	static int boot_id = -1;
+	bus_space_tag_t bst = _generic_bs_tag;
+	bus_space_handle_t bsh;
+
+	if (boot_id == -1) {
+		if (bus_space_map(bst, MESON8B_BOOTINFO_REG, 4, 0, ) != 0)
+			return -1;
+
+		boot_id = (int)bus_space_read_4(bst, bsh, 0);
+
+		bus_space_unmap(bst, bsh, 4);
+	}
+
+	return boot_id;
+}
+
+static void
+meson8b_platform_device_register(device_t self, void *aux)
+{
+	device_t parent = device_parent(self);
+	char *ptr;
+
+	if (device_is_a(self, "ld") &&
+	device_is_a(parent, "sdmmc") &&
+	(device_is_a(device_parent(parent), "mesonsdhc") ||
+	 device_is_a(device_parent(parent), "mesonsdio"))) {
+
+		const int boot_id = meson8b_get_boot_id();
+		const bool has_rootdev = get_bootconf_option(boot_args, "root", BOOTOPT_TYPE_STRING, ) != 0;
+
+		if (!has_rootdev) {
+			char rootarg[64];
+			snprintf(rootarg, sizeof(rootarg), " root=%sa", device_xname(self));
+
+			/* Assume that SDIO is used for SD cards and SDHC is used for eMMC */
+			if (device_is_a(device_parent(parent), "mesonsdhc") && boot_id == 0)
+strcat(boot_args, rootarg);
+			else if (device_is_a(device_parent(parent), "mesonsdio") && boot_id != 0)
+strcat(boot_args, rootarg);
+		}
+	}
+			
+	meson_platform_device_register(self, aux);
+}
+#endif
+
 static u_int
 meson_platform_uart_freq(void)
 {
@@ -386,7 +437,7 @@ static const struct arm_platform meson8b
 	.ap_devmap = meson_platform_devmap,
 	.ap_bootstrap = meson8b_platform_bootstrap,
 	.ap_init_attach_args = meson_platform_init_attach_args,
-	.ap_device_register = meson_platform_device_register,
+	.ap_device_register = meson8b_platform_device_register,
 	.ap_reset = meson_platform_reset,
 	.ap_delay = a9tmr_delay,
 	.ap_uart_freq = meson_platform_uart_freq,

CVS commit: src/sys/arch/arm/amlogic

[Jared D. McNeill]

Module Name:src
Committed By:   jmcneill
Date:   Mon Jan 21 16:27:48 UTC 2019

Modified Files:
src/sys/arch/arm/amlogic: meson_platform.c

Log Message:
Auto-detect root device on Meson8b


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/meson_platform.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Jan 21 14:29:12 UTC 2019

Modified Files:
src/bin/sh: error.c shell.h show.c

Log Message:
DEBUG mode shell cleanups (NFC for any normal shell).

Add an error DEBUG trace in exraise() (when the shell has detected
some error or signal, and is aborting what it is doing)

Fix an arith error in DEBUG bit assignments (harmless as we haven't
reached the limit of flags yet), and add some missing (recently added)
debug flags so they are turned on when the user (ie: me) asks for
"everything".


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/bin/sh/error.c
cvs rdiff -u -r1.27 -r1.28 src/bin/sh/shell.h
cvs rdiff -u -r1.50 -r1.51 src/bin/sh/show.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Jan 21 14:29:12 UTC 2019

Modified Files:
src/bin/sh: error.c shell.h show.c

Log Message:
DEBUG mode shell cleanups (NFC for any normal shell).

Add an error DEBUG trace in exraise() (when the shell has detected
some error or signal, and is aborting what it is doing)

Fix an arith error in DEBUG bit assignments (harmless as we haven't
reached the limit of flags yet), and add some missing (recently added)
debug flags so they are turned on when the user (ie: me) asks for
"everything".


To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/bin/sh/error.c
cvs rdiff -u -r1.27 -r1.28 src/bin/sh/shell.h
cvs rdiff -u -r1.50 -r1.51 src/bin/sh/show.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/error.c
diff -u src/bin/sh/error.c:1.41 src/bin/sh/error.c:1.42
--- src/bin/sh/error.c:1.41	Mon Jul 24 12:35:12 2017
+++ src/bin/sh/error.c	Mon Jan 21 14:29:12 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: error.c,v 1.41 2017/07/24 12:35:12 kre Exp $	*/
+/*	$NetBSD: error.c,v 1.42 2019/01/21 14:29:12 kre Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)error.c	8.2 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: error.c,v 1.41 2017/07/24 12:35:12 kre Exp $");
+__RCSID("$NetBSD: error.c,v 1.42 2019/01/21 14:29:12 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -82,6 +82,7 @@ static void exverror(int, const char *, 
 void
 exraise(int e)
 {
+	CTRACE(DBG_ERRS, ("exraise(%d)\n", e));
 	if (handler == NULL)
 		abort();
 	exception = e;

Index: src/bin/sh/shell.h
diff -u src/bin/sh/shell.h:1.27 src/bin/sh/shell.h:1.28
--- src/bin/sh/shell.h:1.27	Thu Oct 18 05:28:45 2018
+++ src/bin/sh/shell.h	Mon Jan 21 14:29:12 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: shell.h,v 1.27 2018/10/18 05:28:45 kre Exp $	*/
+/*	$NetBSD: shell.h,v 1.28 2019/01/21 14:29:12 kre Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -97,7 +97,7 @@ extern	int		ShNest;
  * be increased, but that both limits the maximum value tha can be
  * used with DBG_EXTRAS(), and causes problems with verbose option naming.
  */
-#define	DBG_VBOSE_SHIFT		26
+#define	DBG_VBOSE_SHIFT		27
 #define	DBG_EXTRAS(n)	((DBG_VBOSE_SHIFT * 2) + (n))
 
 /*
@@ -188,22 +188,22 @@ extern	int		ShNest;
 	/* use VTRACE(DBG_ALWAYS, (...)) to test this one */
 #define	DBG_VERBOSE	(1LL << DBG_VBOSE_SHIFT)
 
-	/* DBG_EXTRAS 0 .. 11 (max) only  - non-alpha options (no VTRACE !!) */
+	/* DBG_EXTRAS 0 .. 9 (max) only  - non-alpha options (no VTRACE !!) */
 #define	DBG_U0		(1LL << DBG_EXTRAS(0))	/* 0 - ad-hoc extra flags */
 #define	DBG_U1		(1LL << DBG_EXTRAS(1))	/* 1 - for short term */
-#define	DBG_U2		(1LL << DBG_EXTRAS(2))	/* 2 - extra tracing*/
+#define	DBG_U2		(1LL << DBG_EXTRAS(2))	/* 2 - extra tracing */
+#define	DBG_U3		(1LL << DBG_EXTRAS(3))	/* 3 - when needed */
+	/* 4, 5, & 6 currently free */
+#define	DBG_LINE	(1LL << DBG_EXTRAS(7))	/* @ ($LINENO) */
+#define	DBG_PID		(1LL << DBG_EXTRAS(8))	/* $ ($$) */
+#define	DBG_NEST	(1LL << DBG_EXTRAS(9))	/* ^ */
 
-#define	DBG_LINE	(1LL << DBG_EXTRAS(9))	/* @ ($LINENO) */
-#define	DBG_PID		(1LL << DBG_EXTRAS(10))	/* $ ($$) */
-#define	DBG_NEST	(1LL << DBG_EXTRAS(11))	/* ^ */
+/* 26 lower case, 26 upper case, always, verbose, and 10 extras: 64 bits */
 
 extern void set_debug(const char *, int);
 
 #else	/* DEBUG */
 
-#define TRACE(param)			/* historic normal trace */
-#define TRACEV(param)			/* historic varargs trace */
-
 #define CTRACE(when, param)		/* conditional normal trace */
 #define CCTRACE(when, cond, param)	/* more conditional normal trace */
 #define CTRACEV(when, param)		/* conditional varargs trace */

Index: src/bin/sh/show.c
diff -u src/bin/sh/show.c:1.50 src/bin/sh/show.c:1.51
--- src/bin/sh/show.c:1.50	Thu Oct 18 04:44:27 2018
+++ src/bin/sh/show.c	Mon Jan 21 14:29:12 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: show.c,v 1.50 2018/10/18 04:44:27 kre Exp $	*/
+/*	$NetBSD: show.c,v 1.51 2019/01/21 14:29:12 kre Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -39,7 +39,7 @@
 #if 0
 static char sccsid[] = "@(#)show.c	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: show.c,v 1.50 2018/10/18 04:44:27 kre Exp $");
+__RCSID("$NetBSD: show.c,v 1.51 2019/01/21 14:29:12 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -1077,20 +1077,21 @@ static struct debug_flag {
 	{ '0',	DBG_U0		},	/* ad-hoc temp debug flag #0 */
 	{ '1',	DBG_U1		},	/* ad-hoc temp debug flag #1 */
 	{ '2',	DBG_U2		},	/* ad-hoc temp debug flag #2 */
+	{ '3',	DBG_U3		},	/* ad-hoc temp debug flag #3 */
  
 	{ '@',	DBG_LINE	},	/* prefix trace lines with line# */
 	{ '$',	DBG_PID		},	/* prefix trace lines with sh pid */
 	{ '^',	DBG_NEST	},	/* show shell nesting level */
 
 			/* alpha options only */
-	{ '_',	DBG_PARSE | DBG_EVAL | DBG_EXPAND | DBG_JOBS |
+	{ '_',	DBG_PARSE | DBG_EVAL | DBG_EXPAND | DBG_JOBS | DBG_SIG |
 		DBG_PROCS | DBG_REDIR | DBG_CMDS | DBG_ERRS |
-		

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Jan 21 14:24:44 UTC 2019

Modified Files:
src/bin/sh: parser.c

Log Message:
Fix an amazing crazy botch (of mine) when expanding prompt strings
(PS1 etc) which, if the shell were already exiting, and a prompt
were to be expanded (which only really happens if -x is enabled,
and an exit trap is set, so the commands in the trap need PS4
expanded and written, last thing, before the shell exits) the shell
would instead simply exit when it finished expanding PS4 (before
even writing it, or the xtrace output).

There were more conditions required to set up the environment for
this to actually occur (it seems to only happen when the exit trap
is set in a function, called in a command substitution) but that's
unimportant, the code was nonsense.

Problem noticed by Martijn Dekker.

XXX pullup -8


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/bin/sh/parser.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/parser.c
diff -u src/bin/sh/parser.c:1.161 src/bin/sh/parser.c:1.162
--- src/bin/sh/parser.c:1.161	Tue Jan 15 14:17:49 2019
+++ src/bin/sh/parser.c	Mon Jan 21 14:24:44 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: parser.c,v 1.161 2019/01/15 14:17:49 kre Exp $	*/
+/*	$NetBSD: parser.c,v 1.162 2019/01/21 14:24:44 kre Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)parser.c	8.7 (Berkeley) 5/16/95";
 #else
-__RCSID("$NetBSD: parser.c,v 1.161 2019/01/15 14:17:49 kre Exp $");
+__RCSID("$NetBSD: parser.c,v 1.162 2019/01/21 14:24:44 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -2484,23 +2484,26 @@ expandonstack(char *ps, int cmdsub, int 
 			expandarg(, NULL, 0);
 			result = stackblock();
 		}
-		INTOFF;
+	} else {
+		psp.v_current_parser = saveparser;
+		xflag = save_x;
+		popfilesupto(savetopfile);
+		handler = savehandler;
+
+		if (exception == EXEXIT)
+			longjmp(handler->loc, 1);
+		if (exception == EXINT)
+			exraise(SIGINT);
+		return ps;
 	}
 	psp.v_current_parser = saveparser;
 	xflag = save_x;
 	popfilesupto(savetopfile);
 	handler = savehandler;
 
-	if (exception == EXEXIT)
-		longjmp(handler->loc, 1);
 
-	if (result != NULL) {
-		INTON;
-	} else {
-		if (exception == EXINT)
-			exraise(SIGINT);
+	if (result == NULL)
 		result = ps;
-	}
 
 	return result;
 }

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Jan 21 14:24:44 UTC 2019

Modified Files:
src/bin/sh: parser.c

Log Message:
Fix an amazing crazy botch (of mine) when expanding prompt strings
(PS1 etc) which, if the shell were already exiting, and a prompt
were to be expanded (which only really happens if -x is enabled,
and an exit trap is set, so the commands in the trap need PS4
expanded and written, last thing, before the shell exits) the shell
would instead simply exit when it finished expanding PS4 (before
even writing it, or the xtrace output).

There were more conditions required to set up the environment for
this to actually occur (it seems to only happen when the exit trap
is set in a function, called in a command substitution) but that's
unimportant, the code was nonsense.

Problem noticed by Martijn Dekker.

XXX pullup -8


To generate a diff of this commit:
cvs rdiff -u -r1.161 -r1.162 src/bin/sh/parser.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Jan 21 14:18:59 UTC 2019

Modified Files:
src/bin/sh: eval.c

Log Message:
When we are about to execute something, and the traps are invalid
(which means this is the very first execution in a new subshell)
clear the traps completely, unless the command is "trap".   We were
allowing any special builtin, which was probably harmless, but not
intended.

Also (though not required) permit "command trap" and "eval trap"
and combinations thereof, because they might be useful, and there is
no particular reason why not.   This is all a part of making t=$(trap)
work as POSIX requires, but almost nothing beyond that.  The "trap"
command must be alone (modulo eval and command) in the subshell for
the exception to apply, no t=$(trap; echo) or anything like that.

Martijn Dekker asked for "command trap" to work (no idea why though,
it converts "trap" from being a special builtin, to a normal one,
which means an error won't cause the shell to exit ... if there's
an error, the "trap" command won't do anything useful, and as we
permit no more commands (for this special treatment) the shell is
going to exit anyway, this difference is not really significant.


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/bin/sh/eval.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Jan 21 14:18:59 UTC 2019

Modified Files:
src/bin/sh: eval.c

Log Message:
When we are about to execute something, and the traps are invalid
(which means this is the very first execution in a new subshell)
clear the traps completely, unless the command is "trap".   We were
allowing any special builtin, which was probably harmless, but not
intended.

Also (though not required) permit "command trap" and "eval trap"
and combinations thereof, because they might be useful, and there is
no particular reason why not.   This is all a part of making t=$(trap)
work as POSIX requires, but almost nothing beyond that.  The "trap"
command must be alone (modulo eval and command) in the subshell for
the exception to apply, no t=$(trap; echo) or anything like that.

Martijn Dekker asked for "command trap" to work (no idea why though,
it converts "trap" from being a special builtin, to a normal one,
which means an error won't cause the shell to exit ... if there's
an error, the "trap" command won't do anything useful, and as we
permit no more commands (for this special treatment) the shell is
going to exit anyway, this difference is not really significant.


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/bin/sh/eval.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/eval.c
diff -u src/bin/sh/eval.c:1.169 src/bin/sh/eval.c:1.170
--- src/bin/sh/eval.c:1.169	Wed Jan  9 10:57:43 2019
+++ src/bin/sh/eval.c	Mon Jan 21 14:18:59 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: eval.c,v 1.169 2019/01/09 10:57:43 kre Exp $	*/
+/*	$NetBSD: eval.c,v 1.170 2019/01/21 14:18:59 kre Exp $	*/
 
 /*-
  * Copyright (c) 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)eval.c	8.9 (Berkeley) 6/8/95";
 #else
-__RCSID("$NetBSD: eval.c,v 1.169 2019/01/09 10:57:43 kre Exp $");
+__RCSID("$NetBSD: eval.c,v 1.170 2019/01/21 14:18:59 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -1031,7 +1031,28 @@ evalcommand(union node *cmd, int flgs, s
 			cmdentry.cmdtype = CMDBUILTIN;
 	}
 
-	if (traps_invalid && cmdentry.cmdtype != CMDSPLBLTIN)
+	/*
+	 * When traps are invalid, we permit the following:
+	 *	trap
+	 *	command trap
+	 *	eval trap
+	 *	command eval trap
+	 *	eval command trap
+	 * without zapping the traps completely, in all other cases we do.
+	 *
+	 * The test here permits eval "anything" but when evalstring() comes
+	 * back here again, the "anything" will be validated.
+	 * This means we can actually do:
+	 *	eval eval eval command eval eval command trap
+	 * as long as we end up with just "trap"
+	 *
+	 * We permit "command" by allowing CMDBUILTIN as well as CMDSPLBLTIN
+	 *
+	 * trapcmd() takes care of doing free_traps() if it is needed there.
+	 */
+	if (traps_invalid &&
+	((cmdentry.cmdtype!=CMDSPLBLTIN && cmdentry.cmdtype!=CMDBUILTIN) ||
+	 (cmdentry.u.bltin != trapcmd && cmdentry.u.bltin != evalcmd)))
 		free_traps();
 
 	/* Fork off a child process if necessary. */

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Jan 21 14:09:24 UTC 2019

Modified Files:
src/bin/sh: sh.1

Log Message:
Add an explanation of the error (warning)
RANDOM initialisation failed
when the shell might print after RANDOM has been reseeded
(which includes at sh startup) the next time RANDOM is accessed.
It indicates that /dev/urandom was not available or did not
provide data - in that case, sh uses a (weak) seed made out of
the pid and time (but otherwise nothing else changes).


To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/bin/sh/sh.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Jan 21 14:09:24 UTC 2019

Modified Files:
src/bin/sh: sh.1

Log Message:
Add an explanation of the error (warning)
RANDOM initialisation failed
when the shell might print after RANDOM has been reseeded
(which includes at sh startup) the next time RANDOM is accessed.
It indicates that /dev/urandom was not available or did not
provide data - in that case, sh uses a (weak) seed made out of
the pid and time (but otherwise nothing else changes).


To generate a diff of this commit:
cvs rdiff -u -r1.216 -r1.217 src/bin/sh/sh.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/sh.1
diff -u src/bin/sh/sh.1:1.216 src/bin/sh/sh.1:1.217
--- src/bin/sh/sh.1:1.216	Wed Dec 12 20:22:43 2018
+++ src/bin/sh/sh.1	Mon Jan 21 14:09:24 2019
@@ -1,4 +1,4 @@
-.\"	$NetBSD: sh.1,v 1.216 2018/12/12 20:22:43 kre Exp $
+.\"	$NetBSD: sh.1,v 1.217 2019/01/21 14:09:24 kre Exp $
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -4254,6 +4254,14 @@ This is also how the initial seed is gen
 assigned before
 .Ev RANDOM
 is first accessed after shell initialization.
+Should the error message
+.Dq "RANDOM initialisation failed"
+appear on standard error, it indicates that the source
+of good random numbers was not available, and
+.Ev RANDOM
+has instead been seeded with a more predictable value.
+The following sequence of random numbers will
+not be as unpredictable as they otherwise would be.
 .It Ev SECONDS
 Returns the number of seconds since the current shell was started.
 If unset, it remains unset, and returns nothing, unless set again.

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Jan 21 13:27:29 UTC 2019

Modified Files:
src/bin/sh: var.c

Log Message:
Fix an off by one buffer length problem.   Fortunately, it was off by
one in the "safe" way (it was ensuring the buffer always ended in 2 \0
characters ... one is enough.)   This could affect the expansions of
LINENO RANDOM and SECONDS, though only if they have at least 8 digits
(and then, only sometimes).   RANDOM thus is safe, as it never produces
a number with more than 5 digits, you'd need a script with 1000
lines before there might be an issue with LINENO (and even autoconf
generated scripts don't generally get that bit) and a shell would need
to be running for almost 4 months for SECONDS to climb that high.

Nevertheless: XXX pullup -8.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/bin/sh/var.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/bin/sh

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Jan 21 13:27:29 UTC 2019

Modified Files:
src/bin/sh: var.c

Log Message:
Fix an off by one buffer length problem.   Fortunately, it was off by
one in the "safe" way (it was ensuring the buffer always ended in 2 \0
characters ... one is enough.)   This could affect the expansions of
LINENO RANDOM and SECONDS, though only if they have at least 8 digits
(and then, only sometimes).   RANDOM thus is safe, as it never produces
a number with more than 5 digits, you'd need a script with 1000
lines before there might be an issue with LINENO (and even autoconf
generated scripts don't generally get that bit) and a shell would need
to be running for almost 4 months for SECONDS to climb that high.

Nevertheless: XXX pullup -8.


To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/bin/sh/var.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/bin/sh/var.c
diff -u src/bin/sh/var.c:1.74 src/bin/sh/var.c:1.75
--- src/bin/sh/var.c:1.74	Wed Dec 12 11:51:33 2018
+++ src/bin/sh/var.c	Mon Jan 21 13:27:29 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: var.c,v 1.74 2018/12/12 11:51:33 kre Exp $	*/
+/*	$NetBSD: var.c,v 1.75 2019/01/21 13:27:29 kre Exp $	*/
 
 /*-
  * Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
 #if 0
 static char sccsid[] = "@(#)var.c	8.3 (Berkeley) 5/4/95";
 #else
-__RCSID("$NetBSD: var.c,v 1.74 2018/12/12 11:51:33 kre Exp $");
+__RCSID("$NetBSD: var.c,v 1.75 2019/01/21 13:27:29 kre Exp $");
 #endif
 #endif /* not lint */
 
@@ -1378,7 +1378,7 @@ get_lineno(struct var *vp)
 		return vp->text;
 #endif
 
-	snprintf(result, length - 1, "%.*s=%d", vp->name_len, vp->text, ln);
+	snprintf(result, length, "%.*s=%d", vp->name_len, vp->text, ln);
 	return result;
 }
 #undef result
@@ -1485,7 +1485,7 @@ get_seconds(struct var *vp)
 	if (!make_space(, vp->name_len + 2 + digits_in(secs)))
 		return vp->text;
 
-	snprintf(buf.b, buf.len-1, "%.*s=%jd", vp->name_len, vp->text, secs);
+	snprintf(buf.b, buf.len, "%.*s=%jd", vp->name_len, vp->text, secs);
 	return buf.b;
 }
 
@@ -1571,7 +1571,7 @@ get_random(struct var *vp)
 	if (!make_space(, vp->name_len + 2 + digits_in(random_val)))
 		return vp->text;
 
-	snprintf(buf.b, buf.len-1, "%.*s=%jd", vp->name_len, vp->text,
+	snprintf(buf.b, buf.len, "%.*s=%jd", vp->name_len, vp->text,
 	random_val);
 
 	if (buf.b != vp->text && (vp->flags & (VTEXTFIXED|VSTACK)) == 0)

CVS commit: src/tests/bin/sleep

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Jan 21 13:19:18 UTC 2019

Modified Files:
src/tests/bin/sleep: t_sleep.sh

Log Message:
Add subtests to verify that both "sleep 0.2" and "sleep 0,2" work
when the locale is ru_RU.UTF-8 (which has ',' as its decimal radix char).
Inspired by a problem with rc.subr experiened by ru_RU.UTF-8 reported on
netbsd-users.  These are in the "fraction" test case.

While here, add some more (sub-)tests of invalid input, to make sure they
fail (in the "nonnumeric" test case), and for fun, a couple of subtests
testing hex input fractional delays (in the "hex" test case).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/sleep/t_sleep.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/tests/bin/sleep/t_sleep.sh
diff -u src/tests/bin/sleep/t_sleep.sh:1.1 src/tests/bin/sleep/t_sleep.sh:1.2
--- src/tests/bin/sleep/t_sleep.sh:1.1	Fri Mar 30 09:27:10 2012
+++ src/tests/bin/sleep/t_sleep.sh	Mon Jan 21 13:19:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: t_sleep.sh,v 1.1 2012/03/30 09:27:10 jruoho Exp $
+# $NetBSD: t_sleep.sh,v 1.2 2019/01/21 13:19:18 kre Exp $
 #
 # Copyright (c) 2012 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -39,6 +39,13 @@ fraction_body() {
 	atf_check -s exit:0 -o empty -e empty -x "sleep 0.1"
 	atf_check -s exit:0 -o empty -e empty -x "sleep 0.2"
 	atf_check -s exit:0 -o empty -e empty -x "sleep 0.3"
+
+	# check that '.' as the radix works, even when the
+	# locale is one which uses something different
+	atf_check -s exit:0 -o empty -e empty -x "LC_ALL=ru_RU.UTF-8 sleep 0.2"
+
+	# and that it is possible to use the locale's radix char (',' here)
+	atf_check -s exit:0 -o empty -e empty -x "LC_ALL=ru_RU.UTF-8 sleep 0,2"
 }
 
 atf_test_case hex
@@ -49,6 +56,8 @@ hex_head() {
 hex_body() {
 
 	atf_check -s exit:0 -o empty -e empty -x "sleep 0x01"
+	atf_check -s exit:0 -o empty -e empty -x "sleep 0x0.F"
+	atf_check -s exit:0 -o empty -e empty -x "sleep 0x.B"
 }
 
 atf_test_case nonnumeric
@@ -62,6 +71,17 @@ nonnumeric_body() {
 	atf_check -s not-exit:0 -o empty -e not-empty -x "sleep xyz"
 	atf_check -s not-exit:0 -o empty -e not-empty -x "sleep x21"
 	atf_check -s not-exit:0 -o empty -e not-empty -x "sleep  /3"
+	atf_check -s not-exit:0 -o empty -e not-empty -x "sleep 3+1"
+	atf_check -s not-exit:0 -o empty -e not-empty -x "sleep 0xFG"
+
+	# This includes using an invalid radix char for the locale in use
+	atf_check -s not-exit:0 -o empty -e not-empty -x "LC_ALL=C sleep 3,1"
+
+	# no arg at all (that's non-numeric, right?)
+	atf_check -s not-exit:0 -o empty -e not-empty -x "sleep"
+
+	# and giving 2 or more args is also invalid, even if they are numeric
+	atf_check -s not-exit:0 -o empty -e not-empty -x "sleep 1 2"
 }
 
 atf_init_test_cases() {

CVS commit: src/tests/bin/sleep

[Robert Elz]

Module Name:src
Committed By:   kre
Date:   Mon Jan 21 13:19:18 UTC 2019

Modified Files:
src/tests/bin/sleep: t_sleep.sh

Log Message:
Add subtests to verify that both "sleep 0.2" and "sleep 0,2" work
when the locale is ru_RU.UTF-8 (which has ',' as its decimal radix char).
Inspired by a problem with rc.subr experiened by ru_RU.UTF-8 reported on
netbsd-users.  These are in the "fraction" test case.

While here, add some more (sub-)tests of invalid input, to make sure they
fail (in the "nonnumeric" test case), and for fun, a couple of subtests
testing hex input fractional delays (in the "hex" test case).


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/bin/sleep/t_sleep.sh

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

CVS commit: src/sys/arch

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Jan 21 08:04:26 UTC 2019

Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c
src/sys/arch/arm/fdt: pmu_fdt.c
src/sys/arch/mips/mips: cpu_subr.c

Log Message:
Use ci_{package,core,smt}_id instead of ci_data.cpu_{package,core,smt}_id

NFC


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/fdt/pmu_fdt.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mips/mips/cpu_subr.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

[Nick Hudson]

Module Name:src
Committed By:   skrll
Date:   Mon Jan 21 08:04:26 UTC 2019

Modified Files:
src/sys/arch/aarch64/aarch64: cpu.c
src/sys/arch/arm/fdt: pmu_fdt.c
src/sys/arch/mips/mips: cpu_subr.c

Log Message:
Use ci_{package,core,smt}_id instead of ci_data.cpu_{package,core,smt}_id

NFC


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/aarch64/aarch64/cpu.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/fdt/pmu_fdt.c
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mips/mips/cpu_subr.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/aarch64/aarch64/cpu.c
diff -u src/sys/arch/aarch64/aarch64/cpu.c:1.15 src/sys/arch/aarch64/aarch64/cpu.c:1.16
--- src/sys/arch/aarch64/aarch64/cpu.c:1.15	Fri Dec 21 08:01:01 2018
+++ src/sys/arch/aarch64/aarch64/cpu.c	Mon Jan 21 08:04:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.15 2018/12/21 08:01:01 ryo Exp $ */
+/* $NetBSD: cpu.c,v 1.16 2019/01/21 08:04:26 skrll Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.15 2018/12/21 08:01:01 ryo Exp $");
+__KERNEL_RCSID(1, "$NetBSD: cpu.c,v 1.16 2019/01/21 08:04:26 skrll Exp $");
 
 #include "locators.h"
 #include "opt_arm_debug.h"
@@ -144,12 +144,12 @@ cpu_attach(device_t dv, cpuid_t id)
 
 	mpidr = ci->ci_id.ac_mpidr;
 	if (mpidr & MPIDR_MT) {
-		ci->ci_data.cpu_smt_id = __SHIFTOUT(mpidr, MPIDR_AFF0);
-		ci->ci_data.cpu_core_id = __SHIFTOUT(mpidr, MPIDR_AFF1);
-		ci->ci_data.cpu_package_id = __SHIFTOUT(mpidr, MPIDR_AFF2);
+		ci->ci_smt_id = __SHIFTOUT(mpidr, MPIDR_AFF0);
+		ci->ci_core_id = __SHIFTOUT(mpidr, MPIDR_AFF1);
+		ci->ci_package_id = __SHIFTOUT(mpidr, MPIDR_AFF2);
 	} else {
-		ci->ci_data.cpu_core_id = __SHIFTOUT(mpidr, MPIDR_AFF0);
-		ci->ci_data.cpu_package_id = __SHIFTOUT(mpidr, MPIDR_AFF1);
+		ci->ci_core_id = __SHIFTOUT(mpidr, MPIDR_AFF0);
+		ci->ci_package_id = __SHIFTOUT(mpidr, MPIDR_AFF1);
 	}
 
 	ci->ci_dev = dv;

Index: src/sys/arch/arm/fdt/pmu_fdt.c
diff -u src/sys/arch/arm/fdt/pmu_fdt.c:1.4 src/sys/arch/arm/fdt/pmu_fdt.c:1.5
--- src/sys/arch/arm/fdt/pmu_fdt.c:1.4	Sun Aug 12 18:39:59 2018
+++ src/sys/arch/arm/fdt/pmu_fdt.c	Mon Jan 21 08:04:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmu_fdt.c,v 1.4 2018/08/12 18:39:59 jmcneill Exp $ */
+/* $NetBSD: pmu_fdt.c,v 1.5 2019/01/21 08:04:26 skrll Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmu_fdt.c,v 1.4 2018/08/12 18:39:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmu_fdt.c,v 1.5 2019/01/21 08:04:26 skrll Exp $");
 
 #include 
 #include 
@@ -184,8 +184,8 @@ pmu_fdt_intr_distribute(const int phandl
 			return ENXIO;
 		for (CPU_INFO_FOREACH(cii, ci)) {
 			const uint32_t ci_mpidr =
-			__SHIFTIN(ci->ci_data.cpu_core_id, MPIDR_AFF0) |
-			__SHIFTIN(ci->ci_data.cpu_package_id, MPIDR_AFF1);
+			__SHIFTIN(ci->ci_core_id, MPIDR_AFF0) |
+			__SHIFTIN(ci->ci_package_id, MPIDR_AFF1);
 			if (ci_mpidr == mpidr) {
 kcpuset_set(set, cpu_index(ci));
 break;

Index: src/sys/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.33 src/sys/arch/mips/mips/cpu_subr.c:1.34
--- src/sys/arch/mips/mips/cpu_subr.c:1.33	Sun Aug 20 11:06:35 2017
+++ src/sys/arch/mips/mips/cpu_subr.c	Mon Jan 21 08:04:26 2019
@@ -1,4 +1,4 @@
-/*	$NetBSD: cpu_subr.c,v 1.33 2017/08/20 11:06:35 maxv Exp $	*/
+/*	$NetBSD: cpu_subr.c,v 1.34 2019/01/21 08:04:26 skrll Exp $	*/
 
 /*-
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.33 2017/08/20 11:06:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.34 2019/01/21 08:04:26 skrll Exp $");
 
 #include "opt_cputype.h"
 #include "opt_ddb.h"
@@ -182,9 +182,9 @@ cpu_info_alloc(struct pmap_tlb_info *ti,
 	KASSERT(cpu_id != 0);
 	ci->ci_cpuid = cpu_id;
 	ci->ci_pmap_kern_segtab = _kern_segtab,
-	ci->ci_data.cpu_package_id = cpu_package_id;
-	ci->ci_data.cpu_core_id = cpu_core_id;
-	ci->ci_data.cpu_smt_id = cpu_smt_id;
+	ci->ci_package_id = cpu_package_id;
+	ci->ci_core_id = cpu_core_id;
+	ci->ci_smt_id = cpu_smt_id;
 	ci->ci_cpu_freq = cpu_info_store.ci_cpu_freq;
 	ci->ci_cctr_freq = cpu_info_store.ci_cctr_freq;
 	ci->ci_cycles_per_hz = cpu_info_store.ci_cycles_per_hz;