CVS commit: src/sys/sys

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Tue Nov  1 06:47:41 UTC 2022

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

Log Message:
Define the mount program for zfs.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/sys/disklabel.h

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



CVS commit: src/sys/sys

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Tue Nov  1 06:47:41 UTC 2022

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

Log Message:
Define the mount program for zfs.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/sys/sys/disklabel.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/disklabel.h
diff -u src/sys/sys/disklabel.h:1.126 src/sys/sys/disklabel.h:1.127
--- src/sys/sys/disklabel.h:1.126	Mon Mar 28 12:33:59 2022
+++ src/sys/sys/disklabel.h	Tue Nov  1 06:47:41 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: disklabel.h,v 1.126 2022/03/28 12:33:59 riastradh Exp $	*/
+/*	$NetBSD: disklabel.h,v 1.127 2022/11/01 06:47:41 simonb Exp $	*/
 
 /*
  * Copyright (c) 1987, 1988, 1993
@@ -399,7 +399,7 @@ x(MINIXFS3,29, "MINIX FSv3", NULL,   NUL
 x(VMKCORE, 30, "VMware vmkcore", NULL, NULL)  /* VMware vmkcore */ \
 x(VMFS,31, "VMware VMFS", NULL,  NULL)/* VMware VMFS */ \
 x(VMWRESV, 32, "VMware Reserved", NULL, NULL) /* VMware reserved */ \
-x(ZFS, 33, "ZFS",NULL,   NULL)/* ZFS */
+x(ZFS, 33, "ZFS",NULL,   "zfs")   /* ZFS */
 
 
 #ifndef _LOCORE



CVS commit: src/sys/dev/fdt

2022-10-31 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Tue Nov  1 00:57:39 UTC 2022

Modified Files:
src/sys/dev/fdt: arasan_sdhc_fdt.c

Log Message:
Disable ADMA2 on the Arasan SDHCI 8.9A found in the Xilinx Zinq-7000 due
to sporadic transfer errors until the root cause for the errors is found.
In the meantime, SDMA works fine on this platform.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/fdt/arasan_sdhc_fdt.c

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

Modified files:

Index: src/sys/dev/fdt/arasan_sdhc_fdt.c
diff -u src/sys/dev/fdt/arasan_sdhc_fdt.c:1.11 src/sys/dev/fdt/arasan_sdhc_fdt.c:1.12
--- src/sys/dev/fdt/arasan_sdhc_fdt.c:1.11	Wed Oct 26 20:54:52 2022
+++ src/sys/dev/fdt/arasan_sdhc_fdt.c	Tue Nov  1 00:57:39 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: arasan_sdhc_fdt.c,v 1.11 2022/10/26 20:54:52 jmcneill Exp $ */
+/* $NetBSD: arasan_sdhc_fdt.c,v 1.12 2022/11/01 00:57:39 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2019 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.11 2022/10/26 20:54:52 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_fdt.c,v 1.12 2022/11/01 00:57:39 jmcneill Exp $");
 
 #include 
 #include 
@@ -53,8 +53,8 @@ __KERNEL_RCSID(0, "$NetBSD: arasan_sdhc_
 #define	 RK3399_CORECFG_CLOCKMULTIPLIER		__BITS(7,0)
 
 enum arasan_sdhc_type {
-	AS_TYPE_GENERIC = 0,
 	AS_TYPE_RK3399 = 1,
+	AS_TYPE_SDHCI_8_9A,
 };
 
 struct arasan_sdhc_softc {
@@ -78,7 +78,7 @@ static const struct device_compatible_en
 	  .value = AS_TYPE_RK3399 },
 
 	{ .compat = "arasan,sdhci-8.9a",
-	  .value = AS_TYPE_GENERIC },
+	  .value = AS_TYPE_SDHCI_8_9A },
 
 	DEVICE_COMPAT_EOL
 };
@@ -296,8 +296,16 @@ arasan_sdhc_attach(device_t parent, devi
 			   SDHC_FLAG_32BIT_ACCESS |
 			   SDHC_FLAG_USE_DMA |
 			   SDHC_FLAG_STOP_WITH_TC;
-	if (bus_width == 8)
+	if (sc->sc_type == AS_TYPE_SDHCI_8_9A) {
+		/*
+		 * Workaround for sporadic transfer errors on the Arasan SDHCI
+		 * found in the Xilinx Zynq-7000 SoC.
+		 */
+		sc->sc_base.sc_flags |= SDHC_FLAG_BROKEN_ADMA;
+	}
+	if (bus_width == 8) {
 		sc->sc_base.sc_flags |= SDHC_FLAG_8BIT_MODE;
+	}
 	sc->sc_base.sc_clkbase = clk_get_rate(sc->sc_clk_xin) / 1000;
 	sc->sc_base.sc_vendor_bus_clock = arasan_sdhc_bus_clock_pre;
 	sc->sc_base.sc_vendor_bus_clock_post = arasan_sdhc_bus_clock_post;



CVS commit: src/sys/dev/fdt

2022-10-31 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Tue Nov  1 00:57:39 UTC 2022

Modified Files:
src/sys/dev/fdt: arasan_sdhc_fdt.c

Log Message:
Disable ADMA2 on the Arasan SDHCI 8.9A found in the Xilinx Zinq-7000 due
to sporadic transfer errors until the root cause for the errors is found.
In the meantime, SDMA works fine on this platform.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/fdt/arasan_sdhc_fdt.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/arm/xilinx

2022-10-31 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Oct 31 23:04:50 UTC 2022

Modified Files:
src/sys/arch/arm/xilinx: zynq_gpio.c

Log Message:
Fix MASK_DATA logic in previous commit -- the upper 16-bits are a mask
of pin states to preserve, not to set.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/xilinx/zynq_gpio.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/arm/xilinx

2022-10-31 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Oct 31 23:04:50 UTC 2022

Modified Files:
src/sys/arch/arm/xilinx: zynq_gpio.c

Log Message:
Fix MASK_DATA logic in previous commit -- the upper 16-bits are a mask
of pin states to preserve, not to set.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/xilinx/zynq_gpio.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/xilinx/zynq_gpio.c
diff -u src/sys/arch/arm/xilinx/zynq_gpio.c:1.3 src/sys/arch/arm/xilinx/zynq_gpio.c:1.4
--- src/sys/arch/arm/xilinx/zynq_gpio.c:1.3	Sat Oct 29 01:19:36 2022
+++ src/sys/arch/arm/xilinx/zynq_gpio.c	Mon Oct 31 23:04:50 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: zynq_gpio.c,v 1.3 2022/10/29 01:19:36 jmcneill Exp $ */
+/* $NetBSD: zynq_gpio.c,v 1.4 2022/10/31 23:04:50 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2022 Jared McNeill 
@@ -27,7 +27,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zynq_gpio.c,v 1.3 2022/10/29 01:19:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_gpio.c,v 1.4 2022/10/31 23:04:50 jmcneill Exp $");
 
 #include 
 #include 
@@ -46,8 +46,6 @@ __KERNEL_RCSID(0, "$NetBSD: zynq_gpio.c,
 #define	ZYNQ_GPIO_NPINS		(4 * 32)
 
 #define	MASK_DATA_REG(pin)	(0x000 + 0x4 * ((pin) / 16))
-#define	MASK_DATA_SET(pin, val)	\
-	((1 << (((pin) % 16) + 16)) | ((val) << ((pin) % 16)))
 #define	DATA_RO_REG(pin)	(0x060 + 0x4 * ((pin) / 32))
 #define	DATA_RO_BIT(pin)	__BIT((pin) % 32)
 #define	DIRM_REG(pin)		(0x204 + 0x40 * ((pin) / 32))
@@ -94,17 +92,21 @@ CFATTACH_DECL_NEW(zynqgpio, sizeof(struc
 static int
 zynq_gpio_ctl(struct zynq_gpio_softc *sc, u_int pin, int flags)
 {
-	uint32_t val;
+	uint32_t dirm, oen;
 
 	KASSERT(mutex_owned(&sc->sc_lock));
 
-	val = RD4(sc, OEN_REG(pin));
+	dirm = RD4(sc, DIRM_REG(pin));
+	oen = RD4(sc, OEN_REG(pin));
 	if ((flags & GPIO_PIN_INPUT) != 0) {
-		val &= ~OEN_BIT(pin);
+		dirm &= ~DIRM_BIT(pin);
+		oen &= ~OEN_BIT(pin);
 	} else if ((flags & GPIO_PIN_OUTPUT) != 0) {
-		val |= OEN_BIT(pin);
+		dirm |= DIRM_BIT(pin);
+		oen |= OEN_BIT(pin);
 	}
-	WR4(sc, OEN_REG(pin), val);
+	WR4(sc, OEN_REG(pin), oen);
+	WR4(sc, DIRM_REG(pin), dirm);
 
 	return 0;
 }
@@ -211,10 +213,15 @@ static void
 zynq_gpio_pin_write(void *priv, int pin, int val)
 {
 	struct zynq_gpio_softc * const sc = priv;
+	uint32_t mask_data;
 
 	KASSERT(pin < __arraycount(sc->sc_pins));
 
-	WR4(sc, MASK_DATA_REG(pin), MASK_DATA_SET(pin, val));
+	mask_data = (0x & ~__BIT(pin % 16)) << 16;
+	if (val) {
+		mask_data |= __BIT(pin % 16);
+	}
+	WR4(sc, MASK_DATA_REG(pin), mask_data);
 }
 
 static void



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

2022-10-31 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Oct 31 22:45:39 UTC 2022

Modified Files:
src/sys/arch/evbarm/conf: GENERIC

Log Message:
Add micphy(4)


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/evbarm/conf/GENERIC

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/conf/GENERIC
diff -u src/sys/arch/evbarm/conf/GENERIC:1.112 src/sys/arch/evbarm/conf/GENERIC:1.113
--- src/sys/arch/evbarm/conf/GENERIC:1.112	Sat Oct 29 13:59:57 2022
+++ src/sys/arch/evbarm/conf/GENERIC	Mon Oct 31 22:45:38 2022
@@ -1,5 +1,5 @@
 #
-#	$NetBSD: GENERIC,v 1.112 2022/10/29 13:59:57 jmcneill Exp $
+#	$NetBSD: GENERIC,v 1.113 2022/10/31 22:45:38 jmcneill Exp $
 #
 #	GENERIC ARM (aarch32) kernel
 #
@@ -327,6 +327,7 @@ inphy* 		at mii? phy ?		# Intel 82555 PH
 iophy* 		at mii? phy ?		# Intel 82553 PHYs
 lxtphy* 	at mii? phy ?		# Level One LXT-970 PHYs
 makphy* 	at mii? phy ?		# Marvell Semiconductor 88E1000 PHYs
+micphy*		at mii? phy ?		# Micrel KSZ[89]xxx PHYs
 nsphy* 		at mii? phy ?		# NS83840 PHYs
 nsphyter* 	at mii? phy ?		# NS83843 PHYs
 pnaphy* 	at mii? phy ?		# generic HomePNA PHYs



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

2022-10-31 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Oct 31 22:45:39 UTC 2022

Modified Files:
src/sys/arch/evbarm/conf: GENERIC

Log Message:
Add micphy(4)


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/evbarm/conf/GENERIC

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



CVS commit: src/sys/dev/mii

2022-10-31 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Oct 31 22:45:13 UTC 2022

Modified Files:
src/sys/dev/mii: micphy.c

Log Message:
fix blank printf at attach


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/mii/micphy.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/mii

2022-10-31 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Oct 31 22:45:13 UTC 2022

Modified Files:
src/sys/dev/mii: micphy.c

Log Message:
fix blank printf at attach


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/mii/micphy.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/mii/micphy.c
diff -u src/sys/dev/mii/micphy.c:1.14 src/sys/dev/mii/micphy.c:1.15
--- src/sys/dev/mii/micphy.c:1.14	Sat Mar 28 18:37:18 2020
+++ src/sys/dev/mii/micphy.c	Mon Oct 31 22:45:13 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: micphy.c,v 1.14 2020/03/28 18:37:18 thorpej Exp $	*/
+/*	$NetBSD: micphy.c,v 1.15 2022/10/31 22:45:13 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: micphy.c,v 1.14 2020/03/28 18:37:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: micphy.c,v 1.15 2022/10/31 22:45:13 jmcneill Exp $");
 
 #include "opt_mii.h"
 
@@ -244,9 +244,7 @@ micphyattach(device_t parent, device_t s
 
 	mii_unlock(mii);
 
-	aprint_normal_dev(self, "");
 	mii_phy_add_media(sc);
-	aprint_normal("\n");
 }
 
 static void



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

2022-10-31 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Oct 31 22:23:39 UTC 2022

Modified Files:
src/sys/arch/arm/xilinx: zynq_platform.c

Log Message:
Implement zynq_platform_reset()


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/xilinx/zynq_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/xilinx/zynq_platform.c
diff -u src/sys/arch/arm/xilinx/zynq_platform.c:1.9 src/sys/arch/arm/xilinx/zynq_platform.c:1.10
--- src/sys/arch/arm/xilinx/zynq_platform.c:1.9	Fri Oct 28 20:37:03 2022
+++ src/sys/arch/arm/xilinx/zynq_platform.c	Mon Oct 31 22:23:38 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: zynq_platform.c,v 1.9 2022/10/28 20:37:03 jmcneill Exp $	*/
+/*	$NetBSD: zynq_platform.c,v 1.10 2022/10/31 22:23:38 jmcneill Exp $	*/
 
 /*-
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
 #include "arml2cc.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: zynq_platform.c,v 1.9 2022/10/28 20:37:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zynq_platform.c,v 1.10 2022/10/31 22:23:38 jmcneill Exp $");
 
 #include 
 #include 
@@ -69,7 +69,11 @@ __KERNEL_RCSID(0, "$NetBSD: zynq_platfor
 #define	ZYNQ_IOREG_PBASE	0xe000
 #define ZYNQ_IOREG_SIZE		0x0020
 
-#define ZYNQ_GPV_VBASE		(ZYNQ_IOREG_VBASE + ZYNQ_IOREG_SIZE)
+#define	ZYNQ_SLCR_VBASE		(ZYNQ_IOREG_VBASE + ZYNQ_IOREG_SIZE)
+#define	ZYNQ_SLCR_PBASE		0xf800
+#define	ZYNQ_SLCR_SIZE		0x0010
+
+#define ZYNQ_GPV_VBASE		(ZYNQ_SLCR_VBASE + ZYNQ_SLCR_SIZE)
 #define ZYNQ_GPV_PBASE		0xf890
 #define ZYNQ_GPV_SIZE		0x0010
 
@@ -87,6 +91,12 @@ __KERNEL_RCSID(0, "$NetBSD: zynq_platfor
 #define	ZYNQ7000_CPU1_ENTRY	0xfff0
 #define	ZYNQ7000_CPU1_ENTRY_SZ	4
 
+/* SLCR registers */
+#define	SLCR_UNLOCK		0x008
+#define	 UNLOCK_KEY		0xdf0d
+#define	PSS_RST_CTRL		0x200
+#define	 SOFT_RST		__BIT(0)
+
 extern struct bus_space arm_generic_bs_tag;
 extern struct arm32_bus_dma_tag arm_generic_dma_tag;
 
@@ -99,6 +109,9 @@ zynq_platform_devmap(void)
 		DEVMAP_ENTRY(ZYNQ_IOREG_VBASE,
 			 ZYNQ_IOREG_PBASE,
 			 ZYNQ_IOREG_SIZE),
+		DEVMAP_ENTRY(ZYNQ_SLCR_VBASE,
+			 ZYNQ_SLCR_PBASE,
+			 ZYNQ_SLCR_SIZE),
 		DEVMAP_ENTRY(ZYNQ_GPV_VBASE,
 			 ZYNQ_GPV_PBASE,
 			 ZYNQ_GPV_SIZE),
@@ -232,7 +245,11 @@ zynq_platform_bootstrap(void)
 static void
 zynq_platform_reset(void)
 {
+	bus_space_tag_t bst = &arm_generic_bs_tag;
+	bus_space_handle_t bsh = ZYNQ_SLCR_VBASE;
 
+	bus_space_write_4(bst, bsh, SLCR_UNLOCK, UNLOCK_KEY);
+	bus_space_write_4(bst, bsh, PSS_RST_CTRL, SOFT_RST);
 }
 
 static const struct arm_platform zynq_platform = {



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

2022-10-31 Thread Jared D. McNeill
Module Name:src
Committed By:   jmcneill
Date:   Mon Oct 31 22:23:39 UTC 2022

Modified Files:
src/sys/arch/arm/xilinx: zynq_platform.c

Log Message:
Implement zynq_platform_reset()


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/xilinx/zynq_platform.c

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



CVS commit: src

2022-10-31 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Oct 31 21:22:06 UTC 2022

Modified Files:
src/bin/ksh: path.c
src/sbin/route: route_rumpops.c
src/sys/arch/arm/xscale: pxa2x0_apm.c pxa2x0_intr.c
src/sys/dev/usb: if_mue.c
src/sys/fs/udf: udf_subr.c
src/usr.bin/rump_dhcpclient: configure.c

Log Message:
fix various typos in comments and one output message.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/bin/ksh/path.c
cvs rdiff -u -r1.3 -r1.4 src/sbin/route/route_rumpops.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/xscale/pxa2x0_apm.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/xscale/pxa2x0_intr.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/usb/if_mue.c
cvs rdiff -u -r1.171 -r1.172 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/rump_dhcpclient/configure.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/ksh/path.c
diff -u src/bin/ksh/path.c:1.13 src/bin/ksh/path.c:1.14
--- src/bin/ksh/path.c:1.13	Fri Jun 30 03:56:12 2017
+++ src/bin/ksh/path.c	Mon Oct 31 21:22:05 2022
@@ -1,8 +1,8 @@
-/*	$NetBSD: path.c,v 1.13 2017/06/30 03:56:12 kamil Exp $	*/
+/*	$NetBSD: path.c,v 1.14 2022/10/31 21:22:05 andvar Exp $	*/
 #include 
 
 #ifndef lint
-__RCSID("$NetBSD: path.c,v 1.13 2017/06/30 03:56:12 kamil Exp $");
+__RCSID("$NetBSD: path.c,v 1.14 2022/10/31 21:22:05 andvar Exp $");
 #endif
 
 #include 
@@ -296,7 +296,7 @@ main(argc, argv)
 			rv = make_path(pwd, file, &cp, result, sizeof(result));
 			printf("make_path returns (%d), \"%s\" ", rv, result);
 			simplify_path(result);
-			printf("(simpifies to \"%s\")\n", result);
+			printf("(simplifies to \"%s\")\n", result);
 		} while (cp);
 	}
 }

Index: src/sbin/route/route_rumpops.c
diff -u src/sbin/route/route_rumpops.c:1.3 src/sbin/route/route_rumpops.c:1.4
--- src/sbin/route/route_rumpops.c:1.3	Fri Apr  3 16:20:52 2020
+++ src/sbin/route/route_rumpops.c	Mon Oct 31 21:22:05 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: route_rumpops.c,v 1.3 2020/04/03 16:20:52 martin Exp $	*/
+/*	$NetBSD: route_rumpops.c,v 1.4 2022/10/31 21:22:05 andvar Exp $	*/
 
 /*
  * Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: route_rumpops.c,v 1.3 2020/04/03 16:20:52 martin Exp $");
+__RCSID("$NetBSD: route_rumpops.c,v 1.4 2022/10/31 21:22:05 andvar Exp $");
 #endif /* !lint */
 
 #include 
@@ -60,7 +60,7 @@ const struct prog_ops prog_ops = {
 
 	/*
 	 * The following are only indirected through ops because
-	 * santizers get confused otherwise.
+	 * sanitizers get confused otherwise.
 	 */
 	.op_sysctlbyname =	sysctlbyname,
 

Index: src/sys/arch/arm/xscale/pxa2x0_apm.c
diff -u src/sys/arch/arm/xscale/pxa2x0_apm.c:1.8 src/sys/arch/arm/xscale/pxa2x0_apm.c:1.9
--- src/sys/arch/arm/xscale/pxa2x0_apm.c:1.8	Sat Feb 12 15:51:28 2022
+++ src/sys/arch/arm/xscale/pxa2x0_apm.c	Mon Oct 31 21:22:05 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_apm.c,v 1.8 2022/02/12 15:51:28 thorpej Exp $	*/
+/*	$NetBSD: pxa2x0_apm.c,v 1.9 2022/10/31 21:22:05 andvar Exp $	*/
 /*	$OpenBSD: pxa2x0_apm.c,v 1.28 2007/03/29 18:42:38 uwe Exp $	*/
 
 /*-
@@ -1398,7 +1398,7 @@ struct {
 	int maxspeed;
 	int numspeeds;
 	int hz [6];
-	int rate [6]; /* could this be simplfied by not having 100% in table? */
+	int rate [6]; /* could this be simplified by not having 100% in table? */
 }
 	speedtables[] = {
 		{ 91, 1, { 91 }, { 100 }},

Index: src/sys/arch/arm/xscale/pxa2x0_intr.c
diff -u src/sys/arch/arm/xscale/pxa2x0_intr.c:1.24 src/sys/arch/arm/xscale/pxa2x0_intr.c:1.25
--- src/sys/arch/arm/xscale/pxa2x0_intr.c:1.24	Tue Sep 27 06:36:43 2022
+++ src/sys/arch/arm/xscale/pxa2x0_intr.c	Mon Oct 31 21:22:05 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pxa2x0_intr.c,v 1.24 2022/09/27 06:36:43 skrll Exp $	*/
+/*	$NetBSD: pxa2x0_intr.c,v 1.25 2022/10/31 21:22:05 andvar Exp $	*/
 
 /*
  * Copyright (c) 2002  Genetec Corporation.  All rights reserved.
@@ -39,7 +39,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.24 2022/09/27 06:36:43 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pxa2x0_intr.c,v 1.25 2022/10/31 21:22:05 andvar Exp $");
 
 #include 
 #include 
@@ -162,7 +162,7 @@ pxa2x0_irq_handler(void *arg)
 	irqbits = read_icu(SAIPIC_IP);
 
 	while ((irqno = find_first_bit(irqbits)) >= 0) {
-		/* XXX: Shuould we handle IRQs in priority order? */
+		/* XXX: Should we handle IRQs in priority order? */
 
 		/* raise spl to stop interrupts of lower priorities */
 		if (saved_spl_level < extirq_level[irqno])

Index: src/sys/dev/usb/if_mue.c
diff -u src/sys/dev/usb/if_mue.c:1.82 src/sys/dev/usb/if_mue.c:1.83
--- src/sys/dev/usb/if_mue.c:1.82	Sat Aug 20 14:08:59 2022
+++ src/sys/dev/usb/if_mue.c	Mon Oct 31 21:22:06 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mue.c,v 1.82 2022/08/20 14:08:59 riastradh Exp $	*/
+/*	$NetBSD: if_mue.c,v 1.83 2022/10/31 21:22:06 andvar Exp $	*/
 /*	$OpenBSD: if_mue.c,v 1.3 2018/08/0

CVS commit: src

2022-10-31 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Oct 31 21:22:06 UTC 2022

Modified Files:
src/bin/ksh: path.c
src/sbin/route: route_rumpops.c
src/sys/arch/arm/xscale: pxa2x0_apm.c pxa2x0_intr.c
src/sys/dev/usb: if_mue.c
src/sys/fs/udf: udf_subr.c
src/usr.bin/rump_dhcpclient: configure.c

Log Message:
fix various typos in comments and one output message.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/bin/ksh/path.c
cvs rdiff -u -r1.3 -r1.4 src/sbin/route/route_rumpops.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/xscale/pxa2x0_apm.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/xscale/pxa2x0_intr.c
cvs rdiff -u -r1.82 -r1.83 src/sys/dev/usb/if_mue.c
cvs rdiff -u -r1.171 -r1.172 src/sys/fs/udf/udf_subr.c
cvs rdiff -u -r1.1 -r1.2 src/usr.bin/rump_dhcpclient/configure.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

2022-10-31 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Oct 31 20:35:02 UTC 2022

Modified Files:
src/sys/dev: midictl.c

Log Message:
s/singled/single/


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/midictl.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/midictl.c
diff -u src/sys/dev/midictl.c:1.9 src/sys/dev/midictl.c:1.10
--- src/sys/dev/midictl.c:1.9	Thu Jun  1 02:45:09 2017
+++ src/sys/dev/midictl.c	Mon Oct 31 20:35:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: midictl.c,v 1.9 2017/06/01 02:45:09 chs Exp $ */
+/* $NetBSD: midictl.c,v 1.10 2022/10/31 20:35:02 andvar Exp $ */
 
 /*-
  * Copyright (c) 2006, 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include 
-__KERNEL_RCSID(0, "$NetBSD: midictl.c,v 1.9 2017/06/01 02:45:09 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: midictl.c,v 1.10 2022/10/31 20:35:02 andvar Exp $");
 
 /*
  * See midictl.h for an overview of the purpose and use of this module.
@@ -688,7 +688,7 @@ store_rehash(midictl_store *s)
 	 * If s->lgcapacity is changed from what we saved int oldlgcap
 	 * then someone else has already done this for us.
 	 * XXXMRG but only function changes s->lgcapacity from its
-	 * initial value, and it is called singled threaded from the
+	 * initial value, and it is called single threaded from the
 	 * main store_thread(), so this code seems dead to me.
 	 */
 	if (oldlgcap != s->lgcapacity) {



CVS commit: src/sys/dev

2022-10-31 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Oct 31 20:35:02 UTC 2022

Modified Files:
src/sys/dev: midictl.c

Log Message:
s/singled/single/


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/dev/midictl.c

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



CVS commit: src/sys

2022-10-31 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Oct 31 20:30:23 UTC 2022

Modified Files:
src/sys/arch/arm/marvell: dovereg.h kirkwoodreg.h mv78xx0reg.h
src/sys/arch/mac68k/dev: if_mcreg.h
src/sys/arch/macppc/dev: am79c950reg.h
src/sys/arch/news68k/dev: kb_hbreg.h kbcreg.h ms_hbreg.h
src/sys/arch/vax/vax: subr.S
src/sys/dev/sbus: spifvar.h

Log Message:
s/interrut/interrupt/ and s/accelelerator/accelerator/ in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/marvell/dovereg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/marvell/kirkwoodreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/marvell/mv78xx0reg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mac68k/dev/if_mcreg.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/macppc/dev/am79c950reg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/news68k/dev/kb_hbreg.h \
src/sys/arch/news68k/dev/kbcreg.h src/sys/arch/news68k/dev/ms_hbreg.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/vax/vax/subr.S
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/sbus/spifvar.h

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



CVS commit: src/sys

2022-10-31 Thread Andrius Varanavicius
Module Name:src
Committed By:   andvar
Date:   Mon Oct 31 20:30:23 UTC 2022

Modified Files:
src/sys/arch/arm/marvell: dovereg.h kirkwoodreg.h mv78xx0reg.h
src/sys/arch/mac68k/dev: if_mcreg.h
src/sys/arch/macppc/dev: am79c950reg.h
src/sys/arch/news68k/dev: kb_hbreg.h kbcreg.h ms_hbreg.h
src/sys/arch/vax/vax: subr.S
src/sys/dev/sbus: spifvar.h

Log Message:
s/interrut/interrupt/ and s/accelelerator/accelerator/ in comments.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/marvell/dovereg.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/marvell/kirkwoodreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/marvell/mv78xx0reg.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mac68k/dev/if_mcreg.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/macppc/dev/am79c950reg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/news68k/dev/kb_hbreg.h \
src/sys/arch/news68k/dev/kbcreg.h src/sys/arch/news68k/dev/ms_hbreg.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/vax/vax/subr.S
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/sbus/spifvar.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/arm/marvell/dovereg.h
diff -u src/sys/arch/arm/marvell/dovereg.h:1.1 src/sys/arch/arm/marvell/dovereg.h:1.2
--- src/sys/arch/arm/marvell/dovereg.h:1.1	Sat Jan  7 16:19:28 2017
+++ src/sys/arch/arm/marvell/dovereg.h	Mon Oct 31 20:30:22 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: dovereg.h,v 1.1 2017/01/07 16:19:28 kiyohara Exp $	*/
+/*	$NetBSD: dovereg.h,v 1.2 2022/10/31 20:30:22 andvar Exp $	*/
 /*
  * Copyright (c) 2016 KIYOHARA Takashi
  * All rights reserved.
@@ -33,7 +33,7 @@
 #define DOVE_UNITID_DDR			MVSOC_UNITID_DDR
 #define DOVE_UNITID_DEVBUS		MVSOC_UNITID_DEVBUS
 #define DOVE_UNITID_DB			0x2	/* Downstream Bridge reg */
-#define DOVE_UNITID_SA			0x3	/* Security Accelelerator reg */
+#define DOVE_UNITID_SA			0x3	/* Security Accelerator reg */
 #define DOVE_UNITID_PEX			MVSOC_UNITID_PEX
 #define DOVE_UNITID_USB			0x5
 #define DOVE_UNITID_XOR			0x6
@@ -233,8 +233,8 @@
 #define DOVE_PMU_CPUCDC0R_XPRATIO(x)		(((x) >> 16) & 0x3f) /* L2C */
 #define DOVE_PMU_CPUCDC0R_BPRATIO(x)		(((x) >> 8) & 0x3f) /* AXI DS */
 #define DOVE_PMU_CPUCDC0R_PPRATIO(x)		(((x) >> 0) & 0x3f) /* CPU */
-#define DOVE_PMU_PMUICR			0x50	/* PMU Interruts Cause reg */
-#define DOVE_PMU_PMUIMR			0x54	/* PMU Interruts Mask reg */
+#define DOVE_PMU_PMUICR			0x50	/* PMU Interrupts Cause reg */
+#define DOVE_PMU_PMUIMR			0x54	/* PMU Interrupts Mask reg */
 #define DOVE_PMU_PMUI_DFSDONE			(1 << 0) /* DFS Done */
 #define DOVE_PMU_PMUI_DVSDONE			(1 << 1) /* DVS Done */
 #define DOVE_PMU_PMUI_THERMCOOLING		(1 << 3) /* Thermal Cooling */

Index: src/sys/arch/arm/marvell/kirkwoodreg.h
diff -u src/sys/arch/arm/marvell/kirkwoodreg.h:1.6 src/sys/arch/arm/marvell/kirkwoodreg.h:1.7
--- src/sys/arch/arm/marvell/kirkwoodreg.h:1.6	Mon Dec 23 02:52:47 2013
+++ src/sys/arch/arm/marvell/kirkwoodreg.h	Mon Oct 31 20:30:22 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: kirkwoodreg.h,v 1.6 2013/12/23 02:52:47 kiyohara Exp $	*/
+/*	$NetBSD: kirkwoodreg.h,v 1.7 2022/10/31 20:30:22 andvar Exp $	*/
 /*
  * Copyright (c) 2007, 2008 KIYOHARA Takashi
  * All rights reserved.
@@ -46,7 +46,7 @@
 #define KIRKWOOD_UNITID_DEVBUS		MVSOC_UNITID_DEVBUS
 #define KIRKWOOD_UNITID_MLMB		MVSOC_UNITID_MLMB
 #define KIRKWOOD_UNITID_CRYPT		0x3	/* Cryptographic Engine reg */
-#define KIRKWOOD_UNITID_SA		0x3	/* Security Accelelerator reg */
+#define KIRKWOOD_UNITID_SA		0x3	/* Security Accelerator reg */
 #define KIRKWOOD_UNITID_PEX		MVSOC_UNITID_PEX
 #define KIRKWOOD_UNITID_USB		0x5	/* USB registers */
 #define KIRKWOOD_UNITID_IDMA		0x6	/* IDMA registers */

Index: src/sys/arch/arm/marvell/mv78xx0reg.h
diff -u src/sys/arch/arm/marvell/mv78xx0reg.h:1.2 src/sys/arch/arm/marvell/mv78xx0reg.h:1.3
--- src/sys/arch/arm/marvell/mv78xx0reg.h:1.2	Mon Sep 30 13:21:10 2013
+++ src/sys/arch/arm/marvell/mv78xx0reg.h	Mon Oct 31 20:30:22 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: mv78xx0reg.h,v 1.2 2013/09/30 13:21:10 kiyohara Exp $	*/
+/*	$NetBSD: mv78xx0reg.h,v 1.3 2022/10/31 20:30:22 andvar Exp $	*/
 /*
  * Copyright (c) 2010 KIYOHARA Takashi
  * All rights reserved.
@@ -48,7 +48,7 @@
 #define MV78XX0_UNITID_GBE01		0x7	/* Gigabit Ethernet registers */
 #define MV78XX0_UNITID_PEX1		0x8
 #define MV78XX0_UNITID_CRYPT		0x9	/* Cryptographic Engine reg */
-#define MV78XX0_UNITID_SA		0x9	/* Security Accelelerator reg */
+#define MV78XX0_UNITID_SA		0x9	/* Security Accelerator reg */
 #define MV78XX0_UNITID_SATA		0xa	/* SATA registers */
 #define MV78XX0_UNITID_TDM		0xb	/* TDM registers */
 

Index: src/sys/arch/mac68k/dev/if_mcreg.h
diff -u src/sys/arch/mac68k/dev/if_mcreg.h:1.4 src/sys/arch/mac68k/dev/if_mcreg.h:1.5
--- src/sys/arch/mac68k/dev/if_mcreg.h:1.4	Sun Dec 11 12:18:02 2005
+++ src/sys/arch/mac68k/dev/if_mcreg.h	Mon Oct 31 20:30:23 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_mcreg.h,v 1.4 2005/12/11 12:18:02 christos Exp $	*/

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

2022-10-31 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Oct 31 15:57:52 UTC 2022

Modified Files:
src/sys/arch/landisk/include: pci_machdep.h

Log Message:
Remove declaration of landisk_pci_intr_setattr - macro magic later
creates one from the MI declaration instead.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/landisk/include/pci_machdep.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/landisk/include

2022-10-31 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Oct 31 15:57:52 UTC 2022

Modified Files:
src/sys/arch/landisk/include: pci_machdep.h

Log Message:
Remove declaration of landisk_pci_intr_setattr - macro magic later
creates one from the MI declaration instead.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/landisk/include/pci_machdep.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/landisk/include/pci_machdep.h
diff -u src/sys/arch/landisk/include/pci_machdep.h:1.6 src/sys/arch/landisk/include/pci_machdep.h:1.7
--- src/sys/arch/landisk/include/pci_machdep.h:1.6	Sat Oct 29 11:04:23 2022
+++ src/sys/arch/landisk/include/pci_machdep.h	Mon Oct 31 15:57:52 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: pci_machdep.h,v 1.6 2022/10/29 11:04:23 riastradh Exp $	*/
+/*	$NetBSD: pci_machdep.h,v 1.7 2022/10/31 15:57:52 martin Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -58,8 +58,6 @@ struct pci_attach_args;
 void landisk_pci_attach_hook(device_t, device_t,
 struct pcibus_attach_args *);
 int landisk_pci_intr_map(const struct pci_attach_args *, pci_intr_handle_t *);
-int landisk_pci_intr_setattr(const struct pci_attach_args *,
-pci_intr_handle_t *, int, uint64_t);
 const char *landisk_pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t,
 char *, size_t);
 const struct evcnt *landisk_pci_intr_evcnt(pci_chipset_tag_t,pci_intr_handle_t);



CVS commit: src/sys/arch/landisk/landisk

2022-10-31 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Oct 31 15:56:40 UTC 2022

Modified Files:
src/sys/arch/landisk/landisk: shpcic_machdep.c

Log Message:
Fix signature of landisk_pci_intr_setattr


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/landisk/landisk/shpcic_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/landisk/landisk/shpcic_machdep.c
diff -u src/sys/arch/landisk/landisk/shpcic_machdep.c:1.8 src/sys/arch/landisk/landisk/shpcic_machdep.c:1.9
--- src/sys/arch/landisk/landisk/shpcic_machdep.c:1.8	Sat Oct 29 11:04:23 2022
+++ src/sys/arch/landisk/landisk/shpcic_machdep.c	Mon Oct 31 15:56:40 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: shpcic_machdep.c,v 1.8 2022/10/29 11:04:23 riastradh Exp $	*/
+/*	$NetBSD: shpcic_machdep.c,v 1.9 2022/10/31 15:56:40 martin Exp $	*/
 
 /*
  * Copyright (c) 1996 Christopher G. Demetriou.  All rights reserved.
@@ -35,7 +35,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: shpcic_machdep.c,v 1.8 2022/10/29 11:04:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: shpcic_machdep.c,v 1.9 2022/10/31 15:56:40 martin Exp $");
 
 #include 
 #include 
@@ -118,7 +118,7 @@ bad:
 }
 
 int
-landisk_pci_intr_setattr(const struct pci_attach_args *pa,
+landisk_pci_intr_setattr(pci_chipset_tag_t pc,
 pci_intr_handle_t *ihp, int attr, uint64_t data)
 {
 



CVS commit: src/sys/arch/landisk/landisk

2022-10-31 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Mon Oct 31 15:56:40 UTC 2022

Modified Files:
src/sys/arch/landisk/landisk: shpcic_machdep.c

Log Message:
Fix signature of landisk_pci_intr_setattr


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/landisk/landisk/shpcic_machdep.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/wsfont

2022-10-31 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Mon Oct 31 13:24:58 UTC 2022

Modified Files:
src/sys/dev/wsfont: files.wsfont wsfont.c
Added Files:
src/sys/dev/wsfont: term14.h

Log Message:
This is X11's 75dpi/term14.bdf, use if you want your console to look like an
xterm. Unlike QVSS this font contains accented characters, umlauts etc.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/wsfont/files.wsfont
cvs rdiff -u -r0 -r1.1 src/sys/dev/wsfont/term14.h
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/wsfont/wsfont.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/wsfont/files.wsfont
diff -u src/sys/dev/wsfont/files.wsfont:1.30 src/sys/dev/wsfont/files.wsfont:1.31
--- src/sys/dev/wsfont/files.wsfont:1.30	Sat Nov 20 00:08:23 2021
+++ src/sys/dev/wsfont/files.wsfont	Mon Oct 31 13:24:58 2022
@@ -1,4 +1,4 @@
-# 	$NetBSD: files.wsfont,v 1.30 2021/11/20 00:08:23 rin Exp $
+# 	$NetBSD: files.wsfont,v 1.31 2022/10/31 13:24:58 macallan Exp $
 
 defpseudo wsfont
 
@@ -37,5 +37,6 @@ defflag	opt_wsfont.h		FONT_BOLD8x16
 FONT_SPLEEN16x32
 FONT_SPLEEN32x64
 FONT_LIBERATION_MONO12x21
+FONT_TERMINAL8x13
 
 file	dev/wsfont/wsfontdev.c	wsfont needs-flag

Index: src/sys/dev/wsfont/wsfont.c
diff -u src/sys/dev/wsfont/wsfont.c:1.78 src/sys/dev/wsfont/wsfont.c:1.79
--- src/sys/dev/wsfont/wsfont.c:1.78	Wed Jun  8 19:47:10 2022
+++ src/sys/dev/wsfont/wsfont.c	Mon Oct 31 13:24:58 2022
@@ -1,4 +1,4 @@
-/* 	$NetBSD: wsfont.c,v 1.78 2022/06/08 19:47:10 uwe Exp $	*/
+/* 	$NetBSD: wsfont.c,v 1.79 2022/10/31 13:24:58 macallan Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000, 2001, 2002 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.78 2022/06/08 19:47:10 uwe Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1.79 2022/10/31 13:24:58 macallan Exp $");
 
 #include "opt_wsfont.h"
 
@@ -195,6 +195,11 @@ __KERNEL_RCSID(0, "$NetBSD: wsfont.c,v 1
 #include 
 #endif
 
+#ifdef FONT_TERMINAL8x13
+#define HAVE_FONT 1
+#include 
+#endif
+
 /* Make sure we always have at least one bitmap font. */
 #ifndef HAVE_FONT
 #define HAVE_FONT 1
@@ -317,6 +322,9 @@ static struct font builtin_fonts[] = {
 #ifdef FONT_LIBERATION_MONO12x21
 	{ { NULL, NULL }, &Liberation_Mono_12x21, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
 #endif
+#ifdef FONT_TERMINAL8x13
+	{ { NULL, NULL }, &Terminal_8x13, 0, 0, WSFONT_STATIC | WSFONT_BUILTIN },
+#endif
 	{ { NULL, NULL }, NULL, 0, 0, 0 },
 };
 

Added files:

Index: src/sys/dev/wsfont/term14.h
diff -u /dev/null src/sys/dev/wsfont/term14.h:1.1
--- /dev/null	Mon Oct 31 13:24:58 2022
+++ src/sys/dev/wsfont/term14.h	Mon Oct 31 13:24:58 2022
@@ -0,0 +1,3175 @@
+/*
+
++
+ Copyright (c) 1987, 1994 Digital Equipment Corporation
+
+ The X Consortium, and any party obtaining a copy of these files from
+ the X Consortium, directly or indirectly, is granted, free of charge, a
+ full and unrestricted irrevocable, world-wide, paid up, royalty-free,
+ nonexclusive right and license to deal in this software and
+ documentation files (the "Software"), including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons who receive
+ copies from any such party to do so.  This license includes without
+ limitation a license to do the foregoing actions under any patents of
+ the party supplying this software to the X Consortium.
+
+ Digital Equipment Corporation make no representations about the
+ suitability of this software for any purpose.  It is provided "as
+ is" without express or implied warranty.
+-
+*/
+
+static u_char Terminal_8x13_data[];
+
+static struct wsdisplay_font Terminal_8x13 = {
+	"Terminal",			/* typeface name */
+	32,/* firstchar */
+	224,/* numchars */
+	0,/* encoding */
+	8,/* fontwidth */
+	13,/* fontheight */
+	1,/* stride */
+	WSDISPLAY_FONTORDER_L2R,	/* bit order */
+	WSDISPLAY_FONTORDER_L2R,	/* byte order */
+	Terminal_8x13_data		/* data */
+};
+
+static u_char Terminal_8x13_data[] = {
+	/* 32 space */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+	/* 33 exclam */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+0x10, /* . . . []. . . .  */
+0x10, /* . . . []. . . .  */
+0x10, /* . . . []. . . .  */
+0x10, /* . . . []. . . .  */
+0x10, /* . . . []. . . .  */
+0x00, /* . . . . . . . .  */
+0x10, /* . . . []. . . .  */
+0x10, /* . . . []. . . .  */
+0x00, /* . . . . . . . .  */
+0x00, /* . . . . . . . .  */
+

CVS commit: src/sys/dev/wsfont

2022-10-31 Thread Michael Lorenz
Module Name:src
Committed By:   macallan
Date:   Mon Oct 31 13:24:58 UTC 2022

Modified Files:
src/sys/dev/wsfont: files.wsfont wsfont.c
Added Files:
src/sys/dev/wsfont: term14.h

Log Message:
This is X11's 75dpi/term14.bdf, use if you want your console to look like an
xterm. Unlike QVSS this font contains accented characters, umlauts etc.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/dev/wsfont/files.wsfont
cvs rdiff -u -r0 -r1.1 src/sys/dev/wsfont/term14.h
cvs rdiff -u -r1.78 -r1.79 src/sys/dev/wsfont/wsfont.c

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



CVS commit: src/sys/dev/pci

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Oct 31 13:00:34 UTC 2022

Modified Files:
src/sys/dev/pci: virtio.c

Log Message:
Use PRIx64 in a debug print macro to print a uint64_t.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/pci/virtio.c

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



CVS commit: src/sys/dev/pci

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Oct 31 13:00:34 UTC 2022

Modified Files:
src/sys/dev/pci: virtio.c

Log Message:
Use PRIx64 in a debug print macro to print a uint64_t.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/pci/virtio.c

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

Modified files:

Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.62 src/sys/dev/pci/virtio.c:1.63
--- src/sys/dev/pci/virtio.c:1.62	Tue Oct 18 04:20:56 2022
+++ src/sys/dev/pci/virtio.c	Mon Oct 31 13:00:34 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: virtio.c,v 1.62 2022/10/18 04:20:56 skrll Exp $	*/
+/*	$NetBSD: virtio.c,v 1.63 2022/10/31 13:00:34 simonb Exp $	*/
 
 /*
  * Copyright (c) 2020 The NetBSD Foundation, Inc.
@@ -28,7 +28,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.62 2022/10/18 04:20:56 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.63 2022/10/31 13:00:34 simonb Exp $");
 
 #include 
 #include 
@@ -244,7 +244,7 @@ virtio_read_device_config_8(struct virti
 	if (BYTE_ORDER != sc->sc_struct_endian)
 		val = bswap64(val);
 
-	DPRINTFR("read_8", "%08lx", val, index, 8);
+	DPRINTFR("read_8", "%08"PRIx64, val, index, 8);
 	DPRINTFR2("read_8 low ", "%08x",
 	bus_space_read_stream_4(sc->sc_devcfg_iot, sc->sc_devcfg_ioh,
 		index),



CVS commit: src/sys/arch/riscv/riscv

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Oct 31 12:50:49 UTC 2022

Modified Files:
src/sys/arch/riscv/riscv: bus_space_generic.S

Log Message:
In bus_space_write_{1,2,4,8} store the correct register in write to device.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/riscv/bus_space_generic.S

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

Modified files:

Index: src/sys/arch/riscv/riscv/bus_space_generic.S
diff -u src/sys/arch/riscv/riscv/bus_space_generic.S:1.2 src/sys/arch/riscv/riscv/bus_space_generic.S:1.3
--- src/sys/arch/riscv/riscv/bus_space_generic.S:1.2	Mon Oct 31 12:49:18 2022
+++ src/sys/arch/riscv/riscv/bus_space_generic.S	Mon Oct 31 12:50:49 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_space_generic.S,v 1.2 2022/10/31 12:49:18 simonb Exp $	*/
+/*	$NetBSD: bus_space_generic.S,v 1.3 2022/10/31 12:50:49 simonb Exp $	*/
 
 /*-
  * Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #include 
 #include "assym.h"
 
-RCSID("$NetBSD: bus_space_generic.S,v 1.2 2022/10/31 12:49:18 simonb Exp $")
+RCSID("$NetBSD: bus_space_generic.S,v 1.3 2022/10/31 12:50:49 simonb Exp $")
 
 
 /* void bs_c_1(a0: tag, a1: src, srcoffset, dst, dstoffset, count); */
@@ -245,7 +245,7 @@ ENTRY_NP(generic_bs_w_1)
 	PTR_L	a5, BS_STRIDE(a0)	/* stride */
 	PTR_SLL	a2, a2, a5		/* offset <<= stride */
 	PTR_ADD	a2, a2, a1		/* add to address */
-	sb	a0, 0(a2)		/* store 8-bit */
+	sb	a3, 0(a2)		/* store 8-bit */
 	ret
 END(generic_bs_w_1)
 
@@ -255,7 +255,7 @@ ENTRY_NP(generic_bs_w_2)
 	PTR_L	a5, BS_STRIDE(a0)	/* stride */
 	PTR_SLL	a2, a2, a5		/* offset <<= stride */
 	PTR_ADD	a2, a2, a1		/* add to address */
-	sh	a0 ,0(a2)		/* store 16-bit */
+	sh	a3 ,0(a2)		/* store 16-bit */
 	ret
 END(generic_bs_w_2)
 
@@ -265,7 +265,7 @@ ENTRY_NP(generic_bs_w_4)
 	PTR_L	a5, BS_STRIDE(a0)	/* stride */
 	PTR_SLL	a2, a2, a5		/* offset <<= stride */
 	PTR_ADD	a2, a2, a1		/* add to address */
-	sw	a0, 0(a2)		/* store 32-bit */
+	sw	a3, 0(a2)		/* store 32-bit */
 	ret
 END(generic_bs_w_4)
 
@@ -276,7 +276,7 @@ ENTRY_NP(generic_bs_w_8)
 	PTR_L	a5, BS_STRIDE(a0)	/* stride */
 	PTR_SLL	a2, a2, a5		/* offset <<= stride */
 	PTR_ADD	a2, a2, a1		/* add to address */
-	sd	a0, 0(a2)		/* store 64-bit */
+	sd	a3, 0(a2)		/* store 64-bit */
 	ret
 END(generic_bs_w_8)
 #endif



CVS commit: src/sys/arch/riscv/riscv

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Oct 31 12:50:49 UTC 2022

Modified Files:
src/sys/arch/riscv/riscv: bus_space_generic.S

Log Message:
In bus_space_write_{1,2,4,8} store the correct register in write to device.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/riscv/riscv/bus_space_generic.S

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



CVS commit: src/sys/arch/riscv/riscv

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Oct 31 12:49:18 UTC 2022

Modified Files:
src/sys/arch/riscv/riscv: bus_space_generic.S

Log Message:
Fix tyop in END for generic_bs_r_8.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/riscv/bus_space_generic.S

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



CVS commit: src/sys/arch/riscv/riscv

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Oct 31 12:49:18 UTC 2022

Modified Files:
src/sys/arch/riscv/riscv: bus_space_generic.S

Log Message:
Fix tyop in END for generic_bs_r_8.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/riscv/riscv/bus_space_generic.S

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

Modified files:

Index: src/sys/arch/riscv/riscv/bus_space_generic.S
diff -u src/sys/arch/riscv/riscv/bus_space_generic.S:1.1 src/sys/arch/riscv/riscv/bus_space_generic.S:1.2
--- src/sys/arch/riscv/riscv/bus_space_generic.S:1.1	Sun Sep 11 15:31:12 2022
+++ src/sys/arch/riscv/riscv/bus_space_generic.S	Mon Oct 31 12:49:18 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: bus_space_generic.S,v 1.1 2022/09/11 15:31:12 skrll Exp $	*/
+/*	$NetBSD: bus_space_generic.S,v 1.2 2022/10/31 12:49:18 simonb Exp $	*/
 
 /*-
  * Copyright (c) 2022 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
 #include 
 #include "assym.h"
 
-RCSID("$NetBSD: bus_space_generic.S,v 1.1 2022/09/11 15:31:12 skrll Exp $")
+RCSID("$NetBSD: bus_space_generic.S,v 1.2 2022/10/31 12:49:18 simonb Exp $")
 
 
 /* void bs_c_1(a0: tag, a1: src, srcoffset, dst, dstoffset, count); */
@@ -85,7 +85,7 @@ ENTRY_NP(generic_bs_r_8)
 	PTR_ADD	a2, a2, a1		/* add to address */
 	ld	a0, 0(a2)		/* load 64-bit */
 	ret
-END(generic_bs_r_4)
+END(generic_bs_r_8)
 #endif
 
 



CVS commit: src/external/cddl/osnet/dist/uts/common/os

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Oct 31 10:44:29 UTC 2022

Modified Files:
src/external/cddl/osnet/dist/uts/common/os: list.c

Log Message:
Provide an empty ASSERT macro ifdef _STANDALONE.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/cddl/osnet/dist/uts/common/os/list.c

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

Modified files:

Index: src/external/cddl/osnet/dist/uts/common/os/list.c
diff -u src/external/cddl/osnet/dist/uts/common/os/list.c:1.1.1.1 src/external/cddl/osnet/dist/uts/common/os/list.c:1.2
--- src/external/cddl/osnet/dist/uts/common/os/list.c:1.1.1.1	Fri Aug  7 18:33:45 2009
+++ src/external/cddl/osnet/dist/uts/common/os/list.c	Mon Oct 31 10:44:29 2022
@@ -35,6 +35,10 @@
 #include 
 #include 
 
+#ifdef _STANDALONE
+#define	ASSERT(x)	/* nothing */
+#endif
+
 #define	list_d2l(a, obj) ((list_node_t *)(((char *)obj) + (a)->list_offset))
 #define	list_object(a, node) ((void *)(((char *)node) - (a)->list_offset))
 #define	list_empty(a) ((a)->list_head.list_next == &(a)->list_head)



CVS commit: src/external/cddl/osnet/dist/uts/common/os

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Oct 31 10:44:29 UTC 2022

Modified Files:
src/external/cddl/osnet/dist/uts/common/os: list.c

Log Message:
Provide an empty ASSERT macro ifdef _STANDALONE.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/cddl/osnet/dist/uts/common/os/list.c

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



CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Oct 31 10:32:28 UTC 2022

Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_ioctl.c

Log Message:
Whitespace nit.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c

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

Modified files:

Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.24 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.25
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.24	Mon Mar 28 12:33:20 2022
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c	Mon Oct 31 10:32:28 2022
@@ -3077,7 +3077,7 @@ zfs_get_vfs(const char *resource)
 		mtx_unlock(&mountlist_mtx);
 #endif
 #ifdef __NetBSD__
-mount_iterator_t *iter;
+	mount_iterator_t *iter;
 
 	mountlist_iterator_init(&iter);
 	while ((vfsp = mountlist_iterator_next(iter)) != NULL) {



CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Oct 31 10:32:28 UTC 2022

Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_ioctl.c

Log Message:
Whitespace nit.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c

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



CVS commit: src/external/bsd/mdocml/bin/mandoc

2022-10-31 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Mon Oct 31 09:37:37 UTC 2022

Modified Files:
src/external/bsd/mdocml/bin/mandoc: Makefile

Log Message:
mdocml: stop building (empty) compat replacement file for reallocarray


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/mdocml/bin/mandoc/Makefile

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

Modified files:

Index: src/external/bsd/mdocml/bin/mandoc/Makefile
diff -u src/external/bsd/mdocml/bin/mandoc/Makefile:1.19 src/external/bsd/mdocml/bin/mandoc/Makefile:1.20
--- src/external/bsd/mdocml/bin/mandoc/Makefile:1.19	Sun Oct 13 07:28:06 2019
+++ src/external/bsd/mdocml/bin/mandoc/Makefile	Mon Oct 31 09:37:37 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2019/10/13 07:28:06 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2022/10/31 09:37:37 wiz Exp $
 
 .include 
 
@@ -41,7 +41,7 @@ CPPFLAGS+=	-DUSE_WCHAR
 .else
 SRCS.libmandoc!=cd ${.PARSEDIR}/../../lib/libmandoc && ${MAKE} -v SRCS
 
-SRCS+=		${SRCS.libmandoc} compat_strtonum.c compat_reallocarray.c
+SRCS+=		${SRCS.libmandoc} compat_strtonum.c
 .endif
 
 COPTS.man_term.c+= -Wno-error=array-bounds



CVS commit: src/external/bsd/mdocml/bin/mandoc

2022-10-31 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Mon Oct 31 09:37:37 UTC 2022

Modified Files:
src/external/bsd/mdocml/bin/mandoc: Makefile

Log Message:
mdocml: stop building (empty) compat replacement file for reallocarray


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/external/bsd/mdocml/bin/mandoc/Makefile

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



CVS commit: src/external/bsd/libpcap/sbin/rpcapd

2022-10-31 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Mon Oct 31 09:30:43 UTC 2022

Modified Files:
src/external/bsd/libpcap/sbin/rpcapd: Makefile

Log Message:
remove (AFAIKT) unused _OPENBSD_SOURCE


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libpcap/sbin/rpcapd/Makefile

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

Modified files:

Index: src/external/bsd/libpcap/sbin/rpcapd/Makefile
diff -u src/external/bsd/libpcap/sbin/rpcapd/Makefile:1.1 src/external/bsd/libpcap/sbin/rpcapd/Makefile:1.2
--- src/external/bsd/libpcap/sbin/rpcapd/Makefile:1.1	Sun Mar 29 17:12:45 2020
+++ src/external/bsd/libpcap/sbin/rpcapd/Makefile	Mon Oct 31 09:30:43 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2020/03/29 17:12:45 christos Exp $
+# $NetBSD: Makefile,v 1.2 2022/10/31 09:30:43 wiz Exp $
 
 USE_FORT?=	yes	# network server
 
@@ -30,7 +30,7 @@ FILESDIR=	/usr/share/examples/rpcapd
 CPPFLAGS+=	-pthread
 LDFLAGS+=	-pthread
 CPPFLAGS+=	-I${SRCDIR} -I${.CURDIR}/../../include
-CPPFLAGS+=	-DHAVE_CONFIG_H -D_OPENBSD_SOURCE
+CPPFLAGS+=	-DHAVE_CONFIG_H
 CPPFLAGS+=	-DPCAP_DONT_INCLUDE_PCAP_BPF_H
 
 PROGDPLIBS+=	pcap ${.CURDIR}/../../lib \



CVS commit: src/external/bsd/libpcap/sbin/rpcapd

2022-10-31 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Mon Oct 31 09:30:43 UTC 2022

Modified Files:
src/external/bsd/libpcap/sbin/rpcapd: Makefile

Log Message:
remove (AFAIKT) unused _OPENBSD_SOURCE


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/libpcap/sbin/rpcapd/Makefile

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



CVS commit: src/external/bsd/dhcpcd/sbin/dhcpcd

2022-10-31 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Mon Oct 31 09:27:24 UTC 2022

Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile

Log Message:
dhcpcd: _OPENBSD_SOURCE does not need to be defined any longer

reallocarray() is in the public namespace now


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile

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

Modified files:

Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.56 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.57
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.56	Fri Oct 22 13:25:58 2021
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile	Mon Oct 31 09:27:23 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2021/10/22 13:25:58 roy Exp $
+# $NetBSD: Makefile,v 1.57 2022/10/31 09:27:23 wiz Exp $
 #
 
 WARNS?=		6
@@ -21,7 +21,7 @@ SRCS+=		privsep.c privsep-root.c privsep
 SRCS+=		privsep-bsd.c
 .endif
 
-CPPFLAGS+=	-DHAVE_CONFIG_H -D_OPENBSD_SOURCE
+CPPFLAGS+=	-DHAVE_CONFIG_H
 
 USE_INET?=	yes
 



CVS commit: src/external/bsd/dhcpcd/sbin/dhcpcd

2022-10-31 Thread Thomas Klausner
Module Name:src
Committed By:   wiz
Date:   Mon Oct 31 09:27:24 UTC 2022

Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile

Log Message:
dhcpcd: _OPENBSD_SOURCE does not need to be defined any longer

reallocarray() is in the public namespace now


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile

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



CVS commit: src/sys/kern

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Oct 31 09:14:18 UTC 2022

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

Log Message:
Fix (invalid) gcc uninitialised warning with i386 gcc using -Os.


To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 src/sys/kern/subr_prf.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/subr_prf.c
diff -u src/sys/kern/subr_prf.c:1.195 src/sys/kern/subr_prf.c:1.196
--- src/sys/kern/subr_prf.c:1.195	Wed Oct 26 23:28:42 2022
+++ src/sys/kern/subr_prf.c	Mon Oct 31 09:14:18 2022
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr_prf.c,v 1.195 2022/10/26 23:28:42 riastradh Exp $	*/
+/*	$NetBSD: subr_prf.c,v 1.196 2022/10/31 09:14:18 simonb Exp $	*/
 
 /*-
  * Copyright (c) 1986, 1988, 1991, 1993
@@ -37,7 +37,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.195 2022/10/26 23:28:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_prf.c,v 1.196 2022/10/31 09:14:18 simonb Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_ddb.h"
@@ -402,6 +402,8 @@ putone(int c, int flags, struct tty *tp)
 	struct tty *ctp;
 	int s;
 
+	ctp = NULL;	/* XXX gcc i386 -Os */
+
 	/*
 	 * Ensure whatever constty points to can't go away while we're
 	 * trying to use it.



CVS commit: src/sys/kern

2022-10-31 Thread Simon Burge
Module Name:src
Committed By:   simonb
Date:   Mon Oct 31 09:14:18 UTC 2022

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

Log Message:
Fix (invalid) gcc uninitialised warning with i386 gcc using -Os.


To generate a diff of this commit:
cvs rdiff -u -r1.195 -r1.196 src/sys/kern/subr_prf.c

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