CVS commit: src/sys/arch

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 06:36:03 UTC 2023

Modified Files:
src/sys/arch/algor/dev: mainbus.c
src/sys/arch/amd64/amd64: netbsd32_machdep_13.c netbsd32_machdep_16.c
src/sys/arch/amigappc/amigappc: mainbus.c
src/sys/arch/arc/arc: bus_space.c bus_space_large.c bus_space_sparse.c
machdep.c wired_map_machdep.c
src/sys/arch/arc/dti: btl.c
src/sys/arch/arc/isa: isadma.c isapnp_machdep.c
src/sys/arch/arc/jazz: if_sn_jazzio.c jazzdmatlb.c oosiop_jazzio.c
osiop_jazzio.c vga_jazzio.c
src/sys/arch/bebox/bebox: autoconf.c
src/sys/arch/cobalt/dev: gt.c
src/sys/arch/cobalt/pci: pcib.c
src/sys/arch/dreamcast/dev/g1: g1bus.c wdc_g1.c
src/sys/arch/dreamcast/dev/g2: g2bus.c gapspci.c
src/sys/arch/emips/ebus: ace_ebus.c flash_ebus.c if_le_ebus.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/algor/dev/mainbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amd64/amd64/netbsd32_machdep_13.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amigappc/amigappc/mainbus.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arc/arc/bus_space.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arc/arc/bus_space_large.c \
src/sys/arch/arc/arc/wired_map_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arc/arc/bus_space_sparse.c
cvs rdiff -u -r1.132 -r1.133 src/sys/arch/arc/arc/machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arc/dti/btl.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/isa/isadma.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arc/isa/isapnp_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arc/jazz/if_sn_jazzio.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arc/jazz/jazzdmatlb.c \
src/sys/arch/arc/jazz/vga_jazzio.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arc/jazz/oosiop_jazzio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arc/jazz/osiop_jazzio.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/bebox/bebox/autoconf.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/cobalt/dev/gt.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/cobalt/pci/pcib.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/dreamcast/dev/g1/g1bus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/dreamcast/dev/g1/wdc_g1.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/dreamcast/dev/g2/g2bus.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/dreamcast/dev/g2/gapspci.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/emips/ebus/ace_ebus.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/emips/ebus/flash_ebus.c \
src/sys/arch/emips/ebus/if_le_ebus.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/algor/dev/mainbus.c
diff -u src/sys/arch/algor/dev/mainbus.c:1.30 src/sys/arch/algor/dev/mainbus.c:1.31
--- src/sys/arch/algor/dev/mainbus.c:1.30	Sat Aug  7 16:18:40 2021
+++ src/sys/arch/algor/dev/mainbus.c	Wed Dec 20 06:36:01 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: mainbus.c,v 1.30 2021/08/07 16:18:40 thorpej Exp $	*/
+/*	$NetBSD: mainbus.c,v 1.31 2023/12/20 06:36:01 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.30 2021/08/07 16:18:40 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.31 2023/12/20 06:36:01 thorpej Exp $");
 
 #include "opt_algor_p4032.h"
 #include "opt_algor_p5064.h"
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 

Index: src/sys/arch/amd64/amd64/netbsd32_machdep_13.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep_13.c:1.4 src/sys/arch/amd64/amd64/netbsd32_machdep_13.c:1.5
--- src/sys/arch/amd64/amd64/netbsd32_machdep_13.c:1.4	Sun Jul 19 13:55:09 2020
+++ src/sys/arch/amd64/amd64/netbsd32_machdep_13.c	Wed Dec 20 06:36:01 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep_13.c,v 1.4 2020/07/19 13:55:09 maxv Exp $	*/
+/*	$NetBSD: netbsd32_machdep_13.c,v 1.5 2023/12/20 06:36:01 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_13.c,v 1.4 2020/07/19 13:55:09 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_13.c,v 1.5 2023/12/20 06:36:01 thorpej Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: netbsd32_mac
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Index: src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.7 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.8
--- src/sys/arch/amd64/amd64/netbsd32_machdep_16.c:1.7	Sat Nov  6 20:42:56 2021
+++ src/sys/arch/amd64/amd64/netbsd32_machdep_16.c	Wed Dec 20 06:36:01 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_machdep_16.c,v 1.7 2021/11/06 20:42:56 thorpej Exp $	*/
+/*	$NetBSD: 

CVS commit: src/sys/arch

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 06:36:03 UTC 2023

Modified Files:
src/sys/arch/algor/dev: mainbus.c
src/sys/arch/amd64/amd64: netbsd32_machdep_13.c netbsd32_machdep_16.c
src/sys/arch/amigappc/amigappc: mainbus.c
src/sys/arch/arc/arc: bus_space.c bus_space_large.c bus_space_sparse.c
machdep.c wired_map_machdep.c
src/sys/arch/arc/dti: btl.c
src/sys/arch/arc/isa: isadma.c isapnp_machdep.c
src/sys/arch/arc/jazz: if_sn_jazzio.c jazzdmatlb.c oosiop_jazzio.c
osiop_jazzio.c vga_jazzio.c
src/sys/arch/bebox/bebox: autoconf.c
src/sys/arch/cobalt/dev: gt.c
src/sys/arch/cobalt/pci: pcib.c
src/sys/arch/dreamcast/dev/g1: g1bus.c wdc_g1.c
src/sys/arch/dreamcast/dev/g2: g2bus.c gapspci.c
src/sys/arch/emips/ebus: ace_ebus.c flash_ebus.c if_le_ebus.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/algor/dev/mainbus.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amd64/amd64/netbsd32_machdep_13.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/amd64/amd64/netbsd32_machdep_16.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amigappc/amigappc/mainbus.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arc/arc/bus_space.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arc/arc/bus_space_large.c \
src/sys/arch/arc/arc/wired_map_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arc/arc/bus_space_sparse.c
cvs rdiff -u -r1.132 -r1.133 src/sys/arch/arc/arc/machdep.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arc/dti/btl.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arc/isa/isadma.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arc/isa/isapnp_machdep.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arc/jazz/if_sn_jazzio.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arc/jazz/jazzdmatlb.c \
src/sys/arch/arc/jazz/vga_jazzio.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arc/jazz/oosiop_jazzio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arc/jazz/osiop_jazzio.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/bebox/bebox/autoconf.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/cobalt/dev/gt.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/cobalt/pci/pcib.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/dreamcast/dev/g1/g1bus.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/dreamcast/dev/g1/wdc_g1.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/dreamcast/dev/g2/g2bus.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/dreamcast/dev/g2/gapspci.c
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/emips/ebus/ace_ebus.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/emips/ebus/flash_ebus.c \
src/sys/arch/emips/ebus/if_le_ebus.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

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 06:13:59 UTC 2023

Modified Files:
src/sys/arch/aarch64/aarch64: vm_machdep.c
src/sys/arch/acorn32/acorn32: autoconf.c
src/sys/arch/acorn32/eb7500atx: rside.c
src/sys/arch/acorn32/mainbus: atppc_pioc.c wdc_pioc.c
src/sys/arch/acorn32/podulebus: icside.c if_ie.c netslot.c rapide.c
sbicvar.h simide.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/aarch64/aarch64/vm_machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/acorn32/acorn32/autoconf.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/acorn32/eb7500atx/rside.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/acorn32/mainbus/atppc_pioc.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/acorn32/mainbus/wdc_pioc.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/acorn32/podulebus/icside.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/acorn32/podulebus/netslot.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/acorn32/podulebus/rapide.c \
src/sys/arch/acorn32/podulebus/simide.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/acorn32/podulebus/sbicvar.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/aarch64/aarch64/vm_machdep.c
diff -u src/sys/arch/aarch64/aarch64/vm_machdep.c:1.14 src/sys/arch/aarch64/aarch64/vm_machdep.c:1.15
--- src/sys/arch/aarch64/aarch64/vm_machdep.c:1.14	Sat Feb 25 08:00:35 2023
+++ src/sys/arch/aarch64/aarch64/vm_machdep.c	Wed Dec 20 06:13:58 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: vm_machdep.c,v 1.14 2023/02/25 08:00:35 skrll Exp $ */
+/* $NetBSD: vm_machdep.c,v 1.15 2023/12/20 06:13:58 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,12 +33,11 @@
 #include "opt_ddb.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.14 2023/02/25 08:00:35 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.15 2023/12/20 06:13:58 thorpej Exp $");
 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Index: src/sys/arch/acorn32/acorn32/autoconf.c
diff -u src/sys/arch/acorn32/acorn32/autoconf.c:1.19 src/sys/arch/acorn32/acorn32/autoconf.c:1.20
--- src/sys/arch/acorn32/acorn32/autoconf.c:1.19	Fri Jun 16 18:17:41 2017
+++ src/sys/arch/acorn32/acorn32/autoconf.c	Wed Dec 20 06:13:59 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.19 2017/06/16 18:17:41 jdolecek Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.20 2023/12/20 06:13:59 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -43,7 +43,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.19 2017/06/16 18:17:41 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.20 2023/12/20 06:13:59 thorpej Exp $");
 
 #include "opt_md.h"
 
@@ -54,7 +54,6 @@ __KERNEL_RCSID(0, "$NetBSD: autoconf.c,v
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 

Index: src/sys/arch/acorn32/eb7500atx/rside.c
diff -u src/sys/arch/acorn32/eb7500atx/rside.c:1.16 src/sys/arch/acorn32/eb7500atx/rside.c:1.17
--- src/sys/arch/acorn32/eb7500atx/rside.c:1.16	Fri Oct 20 07:06:05 2017
+++ src/sys/arch/acorn32/eb7500atx/rside.c	Wed Dec 20 06:13:59 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: rside.c,v 1.16 2017/10/20 07:06:05 jdolecek Exp $	*/
+/*	$NetBSD: rside.c,v 1.17 2023/12/20 06:13:59 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2004 Christopher Gilbert
@@ -56,13 +56,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: rside.c,v 1.16 2017/10/20 07:06:05 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rside.c,v 1.17 2023/12/20 06:13:59 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 

Index: src/sys/arch/acorn32/mainbus/atppc_pioc.c
diff -u src/sys/arch/acorn32/mainbus/atppc_pioc.c:1.6 src/sys/arch/acorn32/mainbus/atppc_pioc.c:1.7
--- src/sys/arch/acorn32/mainbus/atppc_pioc.c:1.6	Tue Jul 19 15:59:53 2011
+++ src/sys/arch/acorn32/mainbus/atppc_pioc.c	Wed Dec 20 06:13:59 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: atppc_pioc.c,v 1.6 2011/07/19 15:59:53 dyoung Exp $ */
+/* $NetBSD: atppc_pioc.c,v 1.7 2023/12/20 06:13:59 thorpej Exp $ */
 
 /*-
  * Copyright (c) 2001 Alcove - Nicolas Souchu
@@ -32,11 +32,10 @@
 #include "opt_atppc.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: atppc_pioc.c,v 1.6 2011/07/19 15:59:53 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atppc_pioc.c,v 1.7 2023/12/20 06:13:59 thorpej Exp $");
 
 #include 
 #include 
-#include 
 #include 
 #include 
 

Index: src/sys/arch/acorn32/mainbus/wdc_pioc.c
diff -u src/sys/arch/acorn32/mainbus/wdc_pioc.c:1.30 src/sys/arch/acorn32/mainbus/wdc_pioc.c:1.31
--- src/sys/arch/acorn32/mainbus/wdc_pioc.c:1.30	Fri Oct 20 07:06:06 2017
+++ src/sys/arch/acorn32/mainbus/wdc_pioc.c	Wed Dec 20 06:13:59 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: wdc_pioc.c,v 1.30 2017/10/20 07:06:06 jdolecek Exp $	*/
+/*	$NetBSD: wdc_pioc.c,v 1.31 2023/12/20 06:13:59 thorpej Exp $	*/
 

CVS commit: src/sys/arch

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 06:13:59 UTC 2023

Modified Files:
src/sys/arch/aarch64/aarch64: vm_machdep.c
src/sys/arch/acorn32/acorn32: autoconf.c
src/sys/arch/acorn32/eb7500atx: rside.c
src/sys/arch/acorn32/mainbus: atppc_pioc.c wdc_pioc.c
src/sys/arch/acorn32/podulebus: icside.c if_ie.c netslot.c rapide.c
sbicvar.h simide.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/aarch64/aarch64/vm_machdep.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/acorn32/acorn32/autoconf.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/acorn32/eb7500atx/rside.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/acorn32/mainbus/atppc_pioc.c
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/acorn32/mainbus/wdc_pioc.c
cvs rdiff -u -r1.35 -r1.36 src/sys/arch/acorn32/podulebus/icside.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/acorn32/podulebus/if_ie.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/acorn32/podulebus/netslot.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/acorn32/podulebus/rapide.c \
src/sys/arch/acorn32/podulebus/simide.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/acorn32/podulebus/sbicvar.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/sparc64

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 05:33:59 UTC 2023

Modified Files:
src/sys/arch/sparc64/dev: auxio.c auxio_ebus.c auxio_sbus.c ffb.c gfb.c
iommu.c ldc.c mkclock.c pci_machdep.c tadpmu.c
src/sys/arch/sparc64/sparc64: autoconf.c mdesc.c pmap.c sunos_machdep.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc64/dev/auxio.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc64/dev/auxio_ebus.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/auxio_sbus.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/sparc64/dev/ffb.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/dev/gfb.c
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/sparc64/dev/iommu.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc64/dev/ldc.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc64/dev/mkclock.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/sparc64/dev/pci_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/dev/tadpmu.c
cvs rdiff -u -r1.239 -r1.240 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc64/sparc64/mdesc.c
cvs rdiff -u -r1.317 -r1.318 src/sys/arch/sparc64/sparc64/pmap.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sparc64/sparc64/sunos_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/sparc64/dev/auxio.c
diff -u src/sys/arch/sparc64/dev/auxio.c:1.26 src/sys/arch/sparc64/dev/auxio.c:1.27
--- src/sys/arch/sparc64/dev/auxio.c:1.26	Fri Oct 14 11:33:08 2016
+++ src/sys/arch/sparc64/dev/auxio.c	Wed Dec 20 05:33:58 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: auxio.c,v 1.26 2016/10/14 11:33:08 mlelstv Exp $	*/
+/*	$NetBSD: auxio.c,v 1.27 2023/12/20 05:33:58 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001, 2015 Matthew R. Green
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: auxio.c,v 1.26 2016/10/14 11:33:08 mlelstv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auxio.c,v 1.27 2023/12/20 05:33:58 thorpej Exp $");
 
 #include "opt_auxio.h"
 
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: auxio.c,v 1.
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 

Index: src/sys/arch/sparc64/dev/auxio_ebus.c
diff -u src/sys/arch/sparc64/dev/auxio_ebus.c:1.6 src/sys/arch/sparc64/dev/auxio_ebus.c:1.7
--- src/sys/arch/sparc64/dev/auxio_ebus.c:1.6	Tue Oct  6 16:40:36 2015
+++ src/sys/arch/sparc64/dev/auxio_ebus.c	Wed Dec 20 05:33:58 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: auxio_ebus.c,v 1.6 2015/10/06 16:40:36 martin Exp $	*/
+/*	$NetBSD: auxio_ebus.c,v 1.7 2023/12/20 05:33:58 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001, 2015 Matthew R. Green
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: auxio_ebus.c,v 1.6 2015/10/06 16:40:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auxio_ebus.c,v 1.7 2023/12/20 05:33:58 thorpej Exp $");
 
 #include "opt_auxio.h"
 
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: auxio_ebus.c
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 

Index: src/sys/arch/sparc64/dev/auxio_sbus.c
diff -u src/sys/arch/sparc64/dev/auxio_sbus.c:1.1 src/sys/arch/sparc64/dev/auxio_sbus.c:1.2
--- src/sys/arch/sparc64/dev/auxio_sbus.c:1.1	Tue Oct  6 16:40:36 2015
+++ src/sys/arch/sparc64/dev/auxio_sbus.c	Wed Dec 20 05:33:58 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: auxio_sbus.c,v 1.1 2015/10/06 16:40:36 martin Exp $	*/
+/*	$NetBSD: auxio_sbus.c,v 1.2 2023/12/20 05:33:58 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000, 2001, 2015 Matthew R. Green
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: auxio_sbus.c,v 1.1 2015/10/06 16:40:36 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auxio_sbus.c,v 1.2 2023/12/20 05:33:58 thorpej Exp $");
 
 #include "opt_auxio.h"
 
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: auxio_sbus.c
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 

Index: src/sys/arch/sparc64/dev/ffb.c
diff -u src/sys/arch/sparc64/dev/ffb.c:1.67 src/sys/arch/sparc64/dev/ffb.c:1.68
--- src/sys/arch/sparc64/dev/ffb.c:1.67	Sat Aug  7 16:19:05 2021
+++ src/sys/arch/sparc64/dev/ffb.c	Wed Dec 20 05:33:58 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: ffb.c,v 1.67 2021/08/07 16:19:05 thorpej Exp $	*/
+/*	$NetBSD: ffb.c,v 1.68 2023/12/20 05:33:58 thorpej Exp $	*/
 /*	$OpenBSD: creator.c,v 1.20 2002/07/30 19:48:15 jason Exp $	*/
 
 /*
@@ -33,7 +33,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.67 2021/08/07 16:19:05 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.68 2023/12/20 05:33:58 thorpej Exp $");
 
 #include 
 #include 
@@ -42,7 +42,6 @@ __KERNEL_RCSID(0, "$NetBSD: ffb.c,v 1.67
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 

Index: src/sys/arch/sparc64/dev/gfb.c
diff -u src/sys/arch/sparc64/dev/gfb.c:1.11 src/sys/arch/sparc64/dev/gfb.c:1.12
--- src/sys/arch/sparc64/dev/gfb.c:1.11	Sat Aug  7 16:19:05 2021
+++ src/sys/arch/sparc64/dev/gfb.c	Wed Dec 20 05:33:58 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: gfb.c,v 1.11 

CVS commit: src/sys/arch/sparc64

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 05:33:59 UTC 2023

Modified Files:
src/sys/arch/sparc64/dev: auxio.c auxio_ebus.c auxio_sbus.c ffb.c gfb.c
iommu.c ldc.c mkclock.c pci_machdep.c tadpmu.c
src/sys/arch/sparc64/sparc64: autoconf.c mdesc.c pmap.c sunos_machdep.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc64/dev/auxio.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc64/dev/auxio_ebus.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc64/dev/auxio_sbus.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/sparc64/dev/ffb.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/sparc64/dev/gfb.c
cvs rdiff -u -r1.118 -r1.119 src/sys/arch/sparc64/dev/iommu.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc64/dev/ldc.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc64/dev/mkclock.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/sparc64/dev/pci_machdep.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/sparc64/dev/tadpmu.c
cvs rdiff -u -r1.239 -r1.240 src/sys/arch/sparc64/sparc64/autoconf.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/sparc64/sparc64/mdesc.c
cvs rdiff -u -r1.317 -r1.318 src/sys/arch/sparc64/sparc64/pmap.c
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sparc64/sparc64/sunos_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/arch/sparc

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 05:33:19 UTC 2023

Modified Files:
src/sys/arch/sparc/dev: bwtwo_obio.c cgeight.c cgfour.c cgfourteen.c
cgsix_obio.c cgtwo.c dma_obio.c if_ie_obio.c obio.c rtc.c sx.c
ts102.c
src/sys/arch/sparc/sparc: autoconf.c core_machdep.c pci_machdep.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc/dev/bwtwo_obio.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/sparc/dev/cgeight.c \
src/sys/arch/sparc/dev/cgfour.c
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/sparc/dev/cgfourteen.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc/dev/cgsix_obio.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/sparc/dev/cgtwo.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/dev/dma_obio.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/sparc/dev/if_ie_obio.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/sparc/dev/obio.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc/dev/rtc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/dev/sx.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/dev/ts102.c
cvs rdiff -u -r1.271 -r1.272 src/sys/arch/sparc/sparc/autoconf.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/sparc/core_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/sparc/pci_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/sparc/dev/bwtwo_obio.c
diff -u src/sys/arch/sparc/dev/bwtwo_obio.c:1.17 src/sys/arch/sparc/dev/bwtwo_obio.c:1.18
--- src/sys/arch/sparc/dev/bwtwo_obio.c:1.17	Sat Sep 19 04:52:44 2009
+++ src/sys/arch/sparc/dev/bwtwo_obio.c	Wed Dec 20 05:33:18 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: bwtwo_obio.c,v 1.17 2009/09/19 04:52:44 tsutsui Exp $ */
+/*	$NetBSD: bwtwo_obio.c,v 1.18 2023/12/20 05:33:18 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -79,13 +79,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bwtwo_obio.c,v 1.17 2009/09/19 04:52:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo_obio.c,v 1.18 2023/12/20 05:33:18 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Index: src/sys/arch/sparc/dev/cgeight.c
diff -u src/sys/arch/sparc/dev/cgeight.c:1.50 src/sys/arch/sparc/dev/cgeight.c:1.51
--- src/sys/arch/sparc/dev/cgeight.c:1.50	Sat Oct 18 08:33:26 2014
+++ src/sys/arch/sparc/dev/cgeight.c	Wed Dec 20 05:33:18 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgeight.c,v 1.50 2014/10/18 08:33:26 snj Exp $	*/
+/*	$NetBSD: cgeight.c,v 1.51 2023/12/20 05:33:18 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -102,14 +102,13 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cgeight.c,v 1.50 2014/10/18 08:33:26 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgeight.c,v 1.51 2023/12/20 05:33:18 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Index: src/sys/arch/sparc/dev/cgfour.c
diff -u src/sys/arch/sparc/dev/cgfour.c:1.50 src/sys/arch/sparc/dev/cgfour.c:1.51
--- src/sys/arch/sparc/dev/cgfour.c:1.50	Sat Oct 18 08:33:26 2014
+++ src/sys/arch/sparc/dev/cgfour.c	Wed Dec 20 05:33:18 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgfour.c,v 1.50 2014/10/18 08:33:26 snj Exp $	*/
+/*	$NetBSD: cgfour.c,v 1.51 2023/12/20 05:33:18 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -102,14 +102,13 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cgfour.c,v 1.50 2014/10/18 08:33:26 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgfour.c,v 1.51 2023/12/20 05:33:18 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Index: src/sys/arch/sparc/dev/cgfourteen.c
diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.95 src/sys/arch/sparc/dev/cgfourteen.c:1.96
--- src/sys/arch/sparc/dev/cgfourteen.c:1.95	Tue Jun 13 10:11:17 2023
+++ src/sys/arch/sparc/dev/cgfourteen.c	Wed Dec 20 05:33:18 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgfourteen.c,v 1.95 2023/06/13 10:11:17 macallan Exp $ */
+/*	$NetBSD: cgfourteen.c,v 1.96 2023/12/20 05:33:18 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -67,7 +67,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Index: src/sys/arch/sparc/dev/cgsix_obio.c
diff -u src/sys/arch/sparc/dev/cgsix_obio.c:1.27 src/sys/arch/sparc/dev/cgsix_obio.c:1.28
--- src/sys/arch/sparc/dev/cgsix_obio.c:1.27	Thu Apr 21 17:59:18 2016
+++ src/sys/arch/sparc/dev/cgsix_obio.c	Wed Dec 20 05:33:18 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: cgsix_obio.c,v 1.27 2016/04/21 17:59:18 macallan Exp $ */
+/*	$NetBSD: cgsix_obio.c,v 1.28 2023/12/20 05:33:18 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -34,14 +34,13 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.27 2016/04/21 17:59:18 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cgsix_obio.c,v 1.28 2023/12/20 05:33:18 thorpej Exp 

CVS commit: src/sys/arch/sparc

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 05:33:19 UTC 2023

Modified Files:
src/sys/arch/sparc/dev: bwtwo_obio.c cgeight.c cgfour.c cgfourteen.c
cgsix_obio.c cgtwo.c dma_obio.c if_ie_obio.c obio.c rtc.c sx.c
ts102.c
src/sys/arch/sparc/sparc: autoconf.c core_machdep.c pci_machdep.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc/dev/bwtwo_obio.c
cvs rdiff -u -r1.50 -r1.51 src/sys/arch/sparc/dev/cgeight.c \
src/sys/arch/sparc/dev/cgfour.c
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/sparc/dev/cgfourteen.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc/dev/cgsix_obio.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/sparc/dev/cgtwo.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/sparc/dev/dma_obio.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/sparc/dev/if_ie_obio.c
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/sparc/dev/obio.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc/dev/rtc.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/dev/sx.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/dev/ts102.c
cvs rdiff -u -r1.271 -r1.272 src/sys/arch/sparc/sparc/autoconf.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sparc/sparc/core_machdep.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/sparc/sparc/pci_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/arch/sun3

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 05:18:00 UTC 2023

Modified Files:
src/sys/arch/sun3/dev: bw2.c cg2.c dma.c sebuf.c si_obio.c si_vme.c
src/sys/arch/sun3/sun3: cache.c dvma.c leds.c machdep.c
src/sys/arch/sun3/sun3x: dvma.c iommu.c machdep.c pmap.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/sun3/dev/bw2.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sun3/dev/cg2.c \
src/sys/arch/sun3/dev/si_vme.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sun3/dev/dma.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sun3/dev/sebuf.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/sun3/dev/si_obio.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sun3/sun3/cache.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/sun3/sun3/dvma.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sun3/sun3/leds.c
cvs rdiff -u -r1.213 -r1.214 src/sys/arch/sun3/sun3/machdep.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/sun3/sun3x/dvma.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sun3/sun3x/iommu.c
cvs rdiff -u -r1.139 -r1.140 src/sys/arch/sun3/sun3x/machdep.c
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/sun3/sun3x/pmap.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/sun3/dev/bw2.c
diff -u src/sys/arch/sun3/dev/bw2.c:1.36 src/sys/arch/sun3/dev/bw2.c:1.37
--- src/sys/arch/sun3/dev/bw2.c:1.36	Fri Jul 25 08:10:35 2014
+++ src/sys/arch/sun3/dev/bw2.c	Wed Dec 20 05:18:00 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: bw2.c,v 1.36 2014/07/25 08:10:35 dholland Exp $	*/
+/*	$NetBSD: bw2.c,v 1.37 2023/12/20 05:18:00 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -47,14 +47,13 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bw2.c,v 1.36 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bw2.c,v 1.37 2023/12/20 05:18:00 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Index: src/sys/arch/sun3/dev/cg2.c
diff -u src/sys/arch/sun3/dev/cg2.c:1.31 src/sys/arch/sun3/dev/cg2.c:1.32
--- src/sys/arch/sun3/dev/cg2.c:1.31	Fri Jul 25 08:10:35 2014
+++ src/sys/arch/sun3/dev/cg2.c	Wed Dec 20 05:18:00 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: cg2.c,v 1.31 2014/07/25 08:10:35 dholland Exp $	*/
+/*	$NetBSD: cg2.c,v 1.32 2023/12/20 05:18:00 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993
@@ -49,14 +49,13 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cg2.c,v 1.31 2014/07/25 08:10:35 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cg2.c,v 1.32 2023/12/20 05:18:00 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
Index: src/sys/arch/sun3/dev/si_vme.c
diff -u src/sys/arch/sun3/dev/si_vme.c:1.31 src/sys/arch/sun3/dev/si_vme.c:1.32
--- src/sys/arch/sun3/dev/si_vme.c:1.31	Mon Aug  2 12:56:23 2021
+++ src/sys/arch/sun3/dev/si_vme.c	Wed Dec 20 05:18:00 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: si_vme.c,v 1.31 2021/08/02 12:56:23 andvar Exp $	*/
+/*	$NetBSD: si_vme.c,v 1.32 2023/12/20 05:18:00 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -74,13 +74,12 @@
  /
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: si_vme.c,v 1.31 2021/08/02 12:56:23 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: si_vme.c,v 1.32 2023/12/20 05:18:00 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Index: src/sys/arch/sun3/dev/dma.c
diff -u src/sys/arch/sun3/dev/dma.c:1.23 src/sys/arch/sun3/dev/dma.c:1.24
--- src/sys/arch/sun3/dev/dma.c:1.23	Mon Sep  3 16:29:28 2018
+++ src/sys/arch/sun3/dev/dma.c	Wed Dec 20 05:18:00 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: dma.c,v 1.23 2018/09/03 16:29:28 riastradh Exp $ */
+/*	$NetBSD: dma.c,v 1.24 2023/12/20 05:18:00 thorpej Exp $ */
 
 /*
  * Copyright (c) 1994 Paul Kranenburg.  All rights reserved.
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.23 2018/09/03 16:29:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.24 2023/12/20 05:18:00 thorpej Exp $");
 
 #include 
 #include 
@@ -39,7 +39,6 @@ __KERNEL_RCSID(0, "$NetBSD: dma.c,v 1.23
 #include 
 #include 
 #include 
-#include 
 
 #include 
 #include 

Index: src/sys/arch/sun3/dev/sebuf.c
diff -u src/sys/arch/sun3/dev/sebuf.c:1.19 src/sys/arch/sun3/dev/sebuf.c:1.20
--- src/sys/arch/sun3/dev/sebuf.c:1.19	Sat Aug  7 16:19:06 2021
+++ src/sys/arch/sun3/dev/sebuf.c	Wed Dec 20 05:18:00 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: sebuf.c,v 1.19 2021/08/07 16:19:06 thorpej Exp $	*/
+/*	$NetBSD: sebuf.c,v 1.20 2023/12/20 05:18:00 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -45,14 +45,13 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: sebuf.c,v 1.19 2021/08/07 16:19:06 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sebuf.c,v 1.20 2023/12/20 05:18:00 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
 

CVS commit: src/sys/arch/sun3

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 05:18:00 UTC 2023

Modified Files:
src/sys/arch/sun3/dev: bw2.c cg2.c dma.c sebuf.c si_obio.c si_vme.c
src/sys/arch/sun3/sun3: cache.c dvma.c leds.c machdep.c
src/sys/arch/sun3/sun3x: dvma.c iommu.c machdep.c pmap.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/sun3/dev/bw2.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/sun3/dev/cg2.c \
src/sys/arch/sun3/dev/si_vme.c
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/sun3/dev/dma.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sun3/dev/sebuf.c
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/sun3/dev/si_obio.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sun3/sun3/cache.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/sun3/sun3/dvma.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/sun3/sun3/leds.c
cvs rdiff -u -r1.213 -r1.214 src/sys/arch/sun3/sun3/machdep.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/sun3/sun3x/dvma.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sun3/sun3x/iommu.c
cvs rdiff -u -r1.139 -r1.140 src/sys/arch/sun3/sun3x/machdep.c
cvs rdiff -u -r1.121 -r1.122 src/sys/arch/sun3/sun3x/pmap.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/sun2

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 05:13:35 UTC 2023

Modified Files:
src/sys/arch/sun2/dev: bwtwo_any.c if_ie_obio.c
src/sys/arch/sun2/sun2: leds.c machdep.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sun2/dev/bwtwo_any.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sun2/dev/if_ie_obio.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sun2/sun2/leds.c
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/sun2/sun2/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/arch/sun2

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 05:13:35 UTC 2023

Modified Files:
src/sys/arch/sun2/dev: bwtwo_any.c if_ie_obio.c
src/sys/arch/sun2/sun2: leds.c machdep.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sun2/dev/bwtwo_any.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/sun2/dev/if_ie_obio.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/sun2/sun2/leds.c
cvs rdiff -u -r1.85 -r1.86 src/sys/arch/sun2/sun2/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/sun2/dev/bwtwo_any.c
diff -u src/sys/arch/sun2/dev/bwtwo_any.c:1.17 src/sys/arch/sun2/dev/bwtwo_any.c:1.18
--- src/sys/arch/sun2/dev/bwtwo_any.c:1.17	Sat Sep 19 04:52:44 2009
+++ src/sys/arch/sun2/dev/bwtwo_any.c	Wed Dec 20 05:13:35 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: bwtwo_any.c,v 1.17 2009/09/19 04:52:44 tsutsui Exp $ */
+/*	$NetBSD: bwtwo_any.c,v 1.18 2023/12/20 05:13:35 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -79,13 +79,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bwtwo_any.c,v 1.17 2009/09/19 04:52:44 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bwtwo_any.c,v 1.18 2023/12/20 05:13:35 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Index: src/sys/arch/sun2/dev/if_ie_obio.c
diff -u src/sys/arch/sun2/dev/if_ie_obio.c:1.18 src/sys/arch/sun2/dev/if_ie_obio.c:1.19
--- src/sys/arch/sun2/dev/if_ie_obio.c:1.18	Sun Oct 24 20:00:11 2021
+++ src/sys/arch/sun2/dev/if_ie_obio.c	Wed Dec 20 05:13:35 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ie_obio.c,v 1.18 2021/10/24 20:00:11 andvar Exp $	*/
+/*	$NetBSD: if_ie_obio.c,v 1.19 2023/12/20 05:13:35 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -73,13 +73,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.18 2021/10/24 20:00:11 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ie_obio.c,v 1.19 2023/12/20 05:13:35 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 

Index: src/sys/arch/sun2/sun2/leds.c
diff -u src/sys/arch/sun2/sun2/leds.c:1.8 src/sys/arch/sun2/sun2/leds.c:1.9
--- src/sys/arch/sun2/sun2/leds.c:1.8	Mon Sep  3 16:29:28 2018
+++ src/sys/arch/sun2/sun2/leds.c	Wed Dec 20 05:13:35 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: leds.c,v 1.8 2018/09/03 16:29:28 riastradh Exp $	*/
+/*	$NetBSD: leds.c,v 1.9 2023/12/20 05:13:35 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -36,14 +36,13 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: leds.c,v 1.8 2018/09/03 16:29:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: leds.c,v 1.9 2023/12/20 05:13:35 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 

Index: src/sys/arch/sun2/sun2/machdep.c
diff -u src/sys/arch/sun2/sun2/machdep.c:1.85 src/sys/arch/sun2/sun2/machdep.c:1.86
--- src/sys/arch/sun2/sun2/machdep.c:1.85	Sat Dec  2 15:50:57 2023
+++ src/sys/arch/sun2/sun2/machdep.c	Wed Dec 20 05:13:35 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.85 2023/12/02 15:50:57 thorpej Exp $	*/
+/*	$NetBSD: machdep.c,v 1.86 2023/12/20 05:13:35 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1990, 1993
@@ -149,7 +149,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.85 2023/12/02 15:50:57 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.86 2023/12/20 05:13:35 thorpej Exp $");
 
 #include "opt_ddb.h"
 #include "opt_fpu_emulate.h"
@@ -170,7 +170,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 



CVS commit: src/sys/dev/pci

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 05:08:34 UTC 2023

Modified Files:
src/sys/dev/pci: ciss_pci.c cs4280.c cs4281.c emuxki.c if_bwi_pci.c
if_ipw.c if_jme.c if_malo_pci.c if_txp.c unichromefb.c
src/sys/dev/pci/voyager: voyagerfb.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/ciss_pci.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/pci/cs4280.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/cs4281.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pci/emuxki.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/if_bwi_pci.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/pci/if_ipw.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/if_jme.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/if_malo_pci.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/pci/if_txp.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/unichromefb.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/voyager/voyagerfb.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/ciss_pci.c
diff -u src/sys/dev/pci/ciss_pci.c:1.22 src/sys/dev/pci/ciss_pci.c:1.23
--- src/sys/dev/pci/ciss_pci.c:1.22	Tue Jul 14 17:23:58 2020
+++ src/sys/dev/pci/ciss_pci.c	Wed Dec 20 05:08:34 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: ciss_pci.c,v 1.22 2020/07/14 17:23:58 jdolecek Exp $	*/
+/*	$NetBSD: ciss_pci.c,v 1.23 2023/12/20 05:08:34 thorpej Exp $	*/
 /*	$OpenBSD: ciss_pci.c,v 1.9 2005/12/13 15:56:01 brad Exp $	*/
 
 /*
@@ -19,12 +19,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.22 2020/07/14 17:23:58 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ciss_pci.c,v 1.23 2023/12/20 05:08:34 thorpej Exp $");
 
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 

Index: src/sys/dev/pci/cs4280.c
diff -u src/sys/dev/pci/cs4280.c:1.75 src/sys/dev/pci/cs4280.c:1.76
--- src/sys/dev/pci/cs4280.c:1.75	Sat Dec 24 15:23:02 2022
+++ src/sys/dev/pci/cs4280.c	Wed Dec 20 05:08:34 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: cs4280.c,v 1.75 2022/12/24 15:23:02 andvar Exp $	*/
+/*	$NetBSD: cs4280.c,v 1.76 2023/12/20 05:08:34 thorpej Exp $	*/
 
 /*
  * Copyright (c) 1999, 2000 Tatoku Ogaito.  All rights reserved.
@@ -52,7 +52,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.75 2022/12/24 15:23:02 andvar Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1.76 2023/12/20 05:08:34 thorpej Exp $");
 
 #include "midi.h"
 
@@ -60,7 +60,6 @@ __KERNEL_RCSID(0, "$NetBSD: cs4280.c,v 1
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Index: src/sys/dev/pci/cs4281.c
diff -u src/sys/dev/pci/cs4281.c:1.58 src/sys/dev/pci/cs4281.c:1.59
--- src/sys/dev/pci/cs4281.c:1.58	Tue Mar 29 09:16:24 2022
+++ src/sys/dev/pci/cs4281.c	Wed Dec 20 05:08:34 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: cs4281.c,v 1.58 2022/03/29 09:16:24 riastradh Exp $	*/
+/*	$NetBSD: cs4281.c,v 1.59 2023/12/20 05:08:34 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 Tatoku Ogaito.  All rights reserved.
@@ -43,12 +43,11 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.58 2022/03/29 09:16:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cs4281.c,v 1.59 2023/12/20 05:08:34 thorpej Exp $");
 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Index: src/sys/dev/pci/emuxki.c
diff -u src/sys/dev/pci/emuxki.c:1.77 src/sys/dev/pci/emuxki.c:1.78
--- src/sys/dev/pci/emuxki.c:1.77	Wed May 10 00:11:41 2023
+++ src/sys/dev/pci/emuxki.c	Wed Dec 20 05:08:34 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: emuxki.c,v 1.77 2023/05/10 00:11:41 riastradh Exp $	*/
+/*	$NetBSD: emuxki.c,v 1.78 2023/12/20 05:08:34 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2001, 2007 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.77 2023/05/10 00:11:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1.78 2023/12/20 05:08:34 thorpej Exp $");
 
 #include 
 #include 
@@ -48,7 +48,6 @@ __KERNEL_RCSID(0, "$NetBSD: emuxki.c,v 1
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 

Index: src/sys/dev/pci/if_bwi_pci.c
diff -u src/sys/dev/pci/if_bwi_pci.c:1.17 src/sys/dev/pci/if_bwi_pci.c:1.18
--- src/sys/dev/pci/if_bwi_pci.c:1.17	Sat May  8 00:27:02 2021
+++ src/sys/dev/pci/if_bwi_pci.c	Wed Dec 20 05:08:34 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_bwi_pci.c,v 1.17 2021/05/08 00:27:02 thorpej Exp $	*/
+/*	$NetBSD: if_bwi_pci.c,v 1.18 2023/12/20 05:08:34 thorpej Exp $	*/
 /*	$OpenBSD: if_bwi_pci.c,v 1.6 2008/02/14 22:10:02 brad Exp $ */
 
 /*
@@ -24,13 +24,12 @@
 
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.17 2021/05/08 00:27:02 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bwi_pci.c,v 1.18 2023/12/20 05:08:34 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 

Index: src/sys/dev/pci/if_ipw.c
diff -u src/sys/dev/pci/if_ipw.c:1.76 src/sys/dev/pci/if_ipw.c:1.77
--- src/sys/dev/pci/if_ipw.c:1.76	

CVS commit: src/sys/dev/pci

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 05:08:34 UTC 2023

Modified Files:
src/sys/dev/pci: ciss_pci.c cs4280.c cs4281.c emuxki.c if_bwi_pci.c
if_ipw.c if_jme.c if_malo_pci.c if_txp.c unichromefb.c
src/sys/dev/pci/voyager: voyagerfb.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/dev/pci/ciss_pci.c
cvs rdiff -u -r1.75 -r1.76 src/sys/dev/pci/cs4280.c
cvs rdiff -u -r1.58 -r1.59 src/sys/dev/pci/cs4281.c
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pci/emuxki.c
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/pci/if_bwi_pci.c
cvs rdiff -u -r1.76 -r1.77 src/sys/dev/pci/if_ipw.c
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/pci/if_jme.c
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/if_malo_pci.c
cvs rdiff -u -r1.73 -r1.74 src/sys/dev/pci/if_txp.c
cvs rdiff -u -r1.21 -r1.22 src/sys/dev/pci/unichromefb.c
cvs rdiff -u -r1.33 -r1.34 src/sys/dev/pci/voyager/voyagerfb.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

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 04:32:30 UTC 2023

Modified Files:
src/sys/dev/eisa: if_tlp_eisa.c
src/sys/dev/ic: tulip.c
src/sys/dev/pci: if_tlp_pci.c

Log Message:
malloc(9) -> kmem(9), and plug a memory leak on detach while I'm here.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/eisa/if_tlp_eisa.c
cvs rdiff -u -r1.209 -r1.210 src/sys/dev/ic/tulip.c
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/pci/if_tlp_pci.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/eisa/if_tlp_eisa.c
diff -u src/sys/dev/eisa/if_tlp_eisa.c:1.29 src/sys/dev/eisa/if_tlp_eisa.c:1.30
--- src/sys/dev/eisa/if_tlp_eisa.c:1.29	Sat Jul 24 18:50:07 2021
+++ src/sys/dev/eisa/if_tlp_eisa.c	Wed Dec 20 04:32:30 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tlp_eisa.c,v 1.29 2021/07/24 18:50:07 thorpej Exp $	*/
+/*	$NetBSD: if_tlp_eisa.c,v 1.30 2023/12/20 04:32:30 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1999, 2000 The NetBSD Foundation, Inc.
@@ -36,14 +36,14 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.29 2021/07/24 18:50:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_eisa.c,v 1.30 2023/12/20 04:32:30 thorpej Exp $");
 
 #include "opt_inet.h"
 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -221,8 +221,9 @@ tlp_eisa_attach(device_t parent, device_
 	/*
 	 * ...and now read the contents of the Ethernet Address ROM.
 	 */
-	sc->sc_srom = malloc(32, M_DEVBUF, M_WAITOK|M_ZERO);
-	for (i = 0; i < 32; i++)
+	sc->sc_srom_addrbits = 4;	/* 32 bytes */
+	sc->sc_srom = kmem_alloc(TULIP_ROM_SIZE(4), KM_SLEEP);
+	for (i = 0; i < TULIP_ROM_SIZE(4); i++)
 		sc->sc_srom[i] = bus_space_read_1(iot, ioh, DE425_ENETROM);
 
 	/*

Index: src/sys/dev/ic/tulip.c
diff -u src/sys/dev/ic/tulip.c:1.209 src/sys/dev/ic/tulip.c:1.210
--- src/sys/dev/ic/tulip.c:1.209	Mon Sep  4 21:54:41 2023
+++ src/sys/dev/ic/tulip.c	Wed Dec 20 04:32:30 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: tulip.c,v 1.209 2023/09/04 21:54:41 mrg Exp $	*/
+/*	$NetBSD: tulip.c,v 1.210 2023/12/20 04:32:30 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002 The NetBSD Foundation, Inc.
@@ -36,14 +36,14 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.209 2023/09/04 21:54:41 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tulip.c,v 1.210 2023/12/20 04:32:30 thorpej Exp $");
 
 
 #include 
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -135,6 +135,8 @@ static void	tlp_dm9102_reset(struct tuli
 
 static void	tlp_2114x_nway_tick(void *);
 
+static void	tlp_ifmedia_fini(struct tulip_softc *);
+
 #define	tlp_mchash(addr, sz)		\
 	(ether_crc32_le((addr), ETHER_ADDR_LEN) & ((sz) - 1))
 
@@ -625,7 +627,7 @@ tlp_detach(struct tulip_softc *sc)
 	if_detach(ifp);
 
 	/* Delete all remaining media. */
-	ifmedia_fini(>sc_mii.mii_media);
+	tlp_ifmedia_fini(sc);
 
 	for (i = 0; i < TULIP_NRXDESC; i++) {
 		rxs = >sc_rxsoft[i];
@@ -653,8 +655,10 @@ tlp_detach(struct tulip_softc *sc)
 
 	pmf_device_deregister(self);
 
-	if (sc->sc_srom)
-		free(sc->sc_srom, M_DEVBUF);
+	if (sc->sc_srom) {
+		KASSERT(sc->sc_srom_addrbits != 0);
+		kmem_free(sc->sc_srom, TULIP_ROM_SIZE(sc->sc_srom_addrbits));
+	}
 
 	return 0;
 }
@@ -2176,10 +2180,9 @@ tlp_srom_size(struct tulip_softc *sc)
 int
 tlp_read_srom(struct tulip_softc *sc)
 {
-	int size;
 	uint32_t miirom;
 	uint16_t datain;
-	int i, x;
+	int size, i, x;
 
 	tlp_srom_idle(sc);
 
@@ -2187,7 +2190,7 @@ tlp_read_srom(struct tulip_softc *sc)
 	if (sc->sc_srom_addrbits == 0)
 		return 0;
 	size = TULIP_ROM_SIZE(sc->sc_srom_addrbits);
-	sc->sc_srom = malloc(size, M_DEVBUF, M_WAITOK);
+	sc->sc_srom = kmem_alloc(size, KM_SLEEP);
 
 	/* Select the SROM. */
 	miirom = MIIROM_SR;
@@ -3181,6 +3184,27 @@ tlp_mediachange(struct ifnet *ifp)
 	return (*sc->sc_mediasw->tmsw_set)(sc);
 }
 
+/*
+ * tlp_ifmedia_fini:
+ *
+ *	Wrapper around ifmedia_fini(), which frees any media-speific
+ *	data we may have associated with each entry.
+ */
+static void
+tlp_ifmedia_fini(struct tulip_softc *sc)
+{
+	struct ifmedia_entry *ife;
+	struct tulip_21x4x_media *tm;
+
+	TAILQ_FOREACH(ife, >sc_mii.mii_media.ifm_list, ifm_list) {
+		if ((tm = ife->ifm_aux) != NULL) {
+			ife->ifm_aux = NULL;
+			kmem_free(tm, sizeof(*tm));
+		}
+	}
+	ifmedia_fini(>sc_mii.mii_media);
+}
+
 /*
  * Support functions for MII-attached media.
  */
@@ -3998,7 +4022,7 @@ tlp_add_srom_media(struct tulip_softc *s
 
 	for (i = 0; i < cnt; i++) {
 		tsti = tlp_srom_to_ifmedia(list[i]);
-		tm = malloc(sizeof(*tm), M_DEVBUF, M_WAITOK | M_ZERO);
+		tm = kmem_zalloc(sizeof(*tm), KM_SLEEP);
 		tlp_srom_media_info(sc, tsti, tm);
 		tm->tm_type = type;
 		tm->tm_get = get;
@@ -4380,7 

CVS commit: src/sys/dev

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 04:32:30 UTC 2023

Modified Files:
src/sys/dev/eisa: if_tlp_eisa.c
src/sys/dev/ic: tulip.c
src/sys/dev/pci: if_tlp_pci.c

Log Message:
malloc(9) -> kmem(9), and plug a memory leak on detach while I'm here.


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/eisa/if_tlp_eisa.c
cvs rdiff -u -r1.209 -r1.210 src/sys/dev/ic/tulip.c
cvs rdiff -u -r1.130 -r1.131 src/sys/dev/pci/if_tlp_pci.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/newsmips/apbus

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 04:30:27 UTC 2023

Modified Files:
src/sys/arch/newsmips/apbus: if_tlp_ap.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/newsmips/apbus/if_tlp_ap.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/newsmips/apbus/if_tlp_ap.c
diff -u src/sys/arch/newsmips/apbus/if_tlp_ap.c:1.15 src/sys/arch/newsmips/apbus/if_tlp_ap.c:1.16
--- src/sys/arch/newsmips/apbus/if_tlp_ap.c:1.15	Wed May 29 06:17:28 2019
+++ src/sys/arch/newsmips/apbus/if_tlp_ap.c	Wed Dec 20 04:30:27 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_tlp_ap.c,v 1.15 2019/05/29 06:17:28 msaitoh Exp $	*/
+/*	$NetBSD: if_tlp_ap.c,v 1.16 2023/12/20 04:30:27 thorpej Exp $	*/
 
 /*
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,13 +30,12 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_tlp_ap.c,v 1.15 2019/05/29 06:17:28 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_tlp_ap.c,v 1.16 2023/12/20 04:30:27 thorpej Exp $");
 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 



CVS commit: src/sys/arch/newsmips/apbus

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 04:30:27 UTC 2023

Modified Files:
src/sys/arch/newsmips/apbus: if_tlp_ap.c

Log Message:
Remove unnecessary .


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/newsmips/apbus/if_tlp_ap.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

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 00:40:44 UTC 2023

Modified Files:
src/sys/arch/amiga/amiga: machdep.c pmap_bootstrap.c
src/sys/arch/amiga/dev: acafh.c clock.c efa.c grf.c grf_cl.c grf_et.c
grf_ul.c if_ne_xsh.c if_ne_xsurf.c if_ne_zbus.c sbicvar.h
slhci_zbus.c wdc_acafh.c wdc_amiga.c wdc_buddha.c xsh.c xsurf.c
z3rambd.c
src/sys/arch/amiga/pci: cv3dpb.c em4k.c emmem.c empb.c mppb.c
p5membar.c p5pb.c pci_machdep.c
src/sys/arch/atari/atari: pmap_bootstrap.c
src/sys/arch/atari/dev: fd.c grf.c grfabs.c wdc_mb.c
src/sys/arch/atari/isa: isapnp_machdep.c
src/sys/arch/atari/vme: et4000.c vme.c
src/sys/arch/cesfic/cesfic: autoconf.c machdep.c
src/sys/arch/hp300/dev: rtc.c
src/sys/arch/luna68k/luna68k: machdep.c
src/sys/arch/m68k/m68k: core_machdep.c pmap_motorola.c sunos_machdep.c
vm_machdep.c
src/sys/arch/mac68k/mac68k: intr.c iop.c
src/sys/arch/mac68k/nubus: grf_nubus.c if_ae_nubus.c
src/sys/arch/mac68k/obio: if_mc_obio.c
src/sys/arch/mvme68k/dev: memc_68k.c vme_pcc.c
src/sys/arch/mvme68k/mvme68k: bus_space.c machdep.c
src/sys/arch/news68k/news68k: machdep.c
src/sys/arch/next68k/dev: mb8795.c nextcons.c nextdma.c
src/sys/arch/next68k/next68k: machdep.c
src/sys/arch/x68k/dev: grf.c mfp.c rtclock.c
src/sys/arch/x68k/x68k: clock.c machdep.c

Log Message:
Remove unnecessary  include.


To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 src/sys/arch/amiga/amiga/machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amiga/amiga/pmap_bootstrap.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/dev/acafh.c \
src/sys/arch/amiga/dev/wdc_acafh.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/amiga/dev/clock.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/efa.c \
src/sys/arch/amiga/dev/if_ne_zbus.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/amiga/dev/grf.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/amiga/dev/grf_cl.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amiga/dev/grf_et.c \
src/sys/arch/amiga/dev/wdc_amiga.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/amiga/dev/grf_ul.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/dev/if_ne_xsh.c \
src/sys/arch/amiga/dev/xsh.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/dev/if_ne_xsurf.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amiga/dev/sbicvar.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/dev/slhci_zbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amiga/dev/wdc_buddha.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/dev/xsurf.c \
src/sys/arch/amiga/dev/z3rambd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/pci/cv3dpb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/pci/em4k.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/pci/emmem.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/pci/empb.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amiga/pci/mppb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/pci/p5membar.c \
src/sys/arch/amiga/pci/pci_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amiga/pci/p5pb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/atari/atari/pmap_bootstrap.c
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/atari/dev/fd.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/atari/dev/grf.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/atari/dev/grfabs.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/atari/dev/wdc_mb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/atari/isa/isapnp_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/atari/vme/et4000.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/atari/vme/vme.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/cesfic/cesfic/autoconf.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/cesfic/cesfic/machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hp300/dev/rtc.c
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/luna68k/luna68k/machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/m68k/core_machdep.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/m68k/m68k/sunos_machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/m68k/m68k/vm_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mac68k/mac68k/intr.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mac68k/mac68k/iop.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/mac68k/nubus/grf_nubus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/mac68k/nubus/if_ae_nubus.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mac68k/obio/if_mc_obio.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mvme68k/dev/memc_68k.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mvme68k/dev/vme_pcc.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvme68k/mvme68k/bus_space.c
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/mvme68k/mvme68k/machdep.c
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/news68k/news68k/machdep.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/next68k/dev/mb8795.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/next68k/dev/nextcons.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/next68k/dev/nextdma.c
cvs rdiff -u -r1.120 -r1.121 

CVS commit: src/sys/arch

2023-12-19 Thread Jason R Thorpe
Module Name:src
Committed By:   thorpej
Date:   Wed Dec 20 00:40:44 UTC 2023

Modified Files:
src/sys/arch/amiga/amiga: machdep.c pmap_bootstrap.c
src/sys/arch/amiga/dev: acafh.c clock.c efa.c grf.c grf_cl.c grf_et.c
grf_ul.c if_ne_xsh.c if_ne_xsurf.c if_ne_zbus.c sbicvar.h
slhci_zbus.c wdc_acafh.c wdc_amiga.c wdc_buddha.c xsh.c xsurf.c
z3rambd.c
src/sys/arch/amiga/pci: cv3dpb.c em4k.c emmem.c empb.c mppb.c
p5membar.c p5pb.c pci_machdep.c
src/sys/arch/atari/atari: pmap_bootstrap.c
src/sys/arch/atari/dev: fd.c grf.c grfabs.c wdc_mb.c
src/sys/arch/atari/isa: isapnp_machdep.c
src/sys/arch/atari/vme: et4000.c vme.c
src/sys/arch/cesfic/cesfic: autoconf.c machdep.c
src/sys/arch/hp300/dev: rtc.c
src/sys/arch/luna68k/luna68k: machdep.c
src/sys/arch/m68k/m68k: core_machdep.c pmap_motorola.c sunos_machdep.c
vm_machdep.c
src/sys/arch/mac68k/mac68k: intr.c iop.c
src/sys/arch/mac68k/nubus: grf_nubus.c if_ae_nubus.c
src/sys/arch/mac68k/obio: if_mc_obio.c
src/sys/arch/mvme68k/dev: memc_68k.c vme_pcc.c
src/sys/arch/mvme68k/mvme68k: bus_space.c machdep.c
src/sys/arch/news68k/news68k: machdep.c
src/sys/arch/next68k/dev: mb8795.c nextcons.c nextdma.c
src/sys/arch/next68k/next68k: machdep.c
src/sys/arch/x68k/dev: grf.c mfp.c rtclock.c
src/sys/arch/x68k/x68k: clock.c machdep.c

Log Message:
Remove unnecessary  include.


To generate a diff of this commit:
cvs rdiff -u -r1.252 -r1.253 src/sys/arch/amiga/amiga/machdep.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amiga/amiga/pmap_bootstrap.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/dev/acafh.c \
src/sys/arch/amiga/dev/wdc_acafh.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/amiga/dev/clock.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/dev/efa.c \
src/sys/arch/amiga/dev/if_ne_zbus.c
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/amiga/dev/grf.c
cvs rdiff -u -r1.57 -r1.58 src/sys/arch/amiga/dev/grf_cl.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/amiga/dev/grf_et.c \
src/sys/arch/amiga/dev/wdc_amiga.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/amiga/dev/grf_ul.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/dev/if_ne_xsh.c \
src/sys/arch/amiga/dev/xsh.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/amiga/dev/if_ne_xsurf.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/amiga/dev/sbicvar.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amiga/dev/slhci_zbus.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amiga/dev/wdc_buddha.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/dev/xsurf.c \
src/sys/arch/amiga/dev/z3rambd.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/pci/cv3dpb.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/amiga/pci/em4k.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/pci/emmem.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/amiga/pci/empb.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amiga/pci/mppb.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amiga/pci/p5membar.c \
src/sys/arch/amiga/pci/pci_machdep.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/amiga/pci/p5pb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/atari/atari/pmap_bootstrap.c
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/atari/dev/fd.c
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/atari/dev/grf.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/atari/dev/grfabs.c
cvs rdiff -u -r1.42 -r1.43 src/sys/arch/atari/dev/wdc_mb.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/atari/isa/isapnp_machdep.c
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/atari/vme/et4000.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/atari/vme/vme.c
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/cesfic/cesfic/autoconf.c
cvs rdiff -u -r1.72 -r1.73 src/sys/arch/cesfic/cesfic/machdep.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/hp300/dev/rtc.c
cvs rdiff -u -r1.109 -r1.110 src/sys/arch/luna68k/luna68k/machdep.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/m68k/m68k/core_machdep.c
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/m68k/m68k/pmap_motorola.c
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/m68k/m68k/sunos_machdep.c
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/m68k/m68k/vm_machdep.c
cvs rdiff -u -r1.32 -r1.33 src/sys/arch/mac68k/mac68k/intr.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mac68k/mac68k/iop.c
cvs rdiff -u -r1.78 -r1.79 src/sys/arch/mac68k/nubus/grf_nubus.c
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/mac68k/nubus/if_ae_nubus.c
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/mac68k/obio/if_mc_obio.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mvme68k/dev/memc_68k.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/mvme68k/dev/vme_pcc.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/mvme68k/mvme68k/bus_space.c
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/mvme68k/mvme68k/machdep.c
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/news68k/news68k/machdep.c
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/next68k/dev/mb8795.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/next68k/dev/nextcons.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/next68k/dev/nextdma.c
cvs rdiff -u -r1.120 -r1.121 

CVS commit: src/usr.bin/make

2023-12-19 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue Dec 19 20:08:28 UTC 2023

Modified Files:
src/usr.bin/make: Makefile

Log Message:
make: clean up code coverage report files

Remove trailing whitespace.

Remove the first line, as it only repeats the filename.

Remove the line numbers, as they are mostly the same as in the original
source file.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/usr.bin/make/Makefile

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

Modified files:

Index: src/usr.bin/make/Makefile
diff -u src/usr.bin/make/Makefile:1.126 src/usr.bin/make/Makefile:1.127
--- src/usr.bin/make/Makefile:1.126	Sun Dec 17 10:48:10 2023
+++ src/usr.bin/make/Makefile	Tue Dec 19 20:08:27 2023
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.126 2023/12/17 10:48:10 rillig Exp $
+#	$NetBSD: Makefile,v 1.127 2023/12/19 20:08:27 rillig Exp $
 #	@(#)Makefile	5.2 (Berkeley) 12/28/90
 
 PROG=	make
@@ -145,7 +145,11 @@ report-coverage: .PHONY
 	| perl -ne ${GCOV_PERL:Q} \
 	| sort -r -k4 \
 	| sort -nr -k1
-	@sed -i 's,^\([^:]*\): *[0-9]*:,\1: ,' *.gcov
+	@sed -i \
+	-e '1d' \
+	-e 's,^\([^:]*\): *[0-9]*:,\1: ,' \
+	-e 's, *$$,,g' \
+	*.gcov
 .endif
 
 .include 



CVS commit: src/usr.bin/make

2023-12-19 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue Dec 19 20:08:28 UTC 2023

Modified Files:
src/usr.bin/make: Makefile

Log Message:
make: clean up code coverage report files

Remove trailing whitespace.

Remove the first line, as it only repeats the filename.

Remove the line numbers, as they are mostly the same as in the original
source file.


To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.127 src/usr.bin/make/Makefile

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



CVS commit: src/usr.bin/make

2023-12-19 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue Dec 19 19:33:40 UTC 2023

Modified Files:
src/usr.bin/make: buf.c buf.h compat.c cond.c dir.c hash.c hash.h job.c
job.h parse.c suff.c var.c
src/usr.bin/make/unit-tests: cond-func-empty.mk dep-var.mk dir.mk
directive-for-errors.mk opt-debug-loud.mk

Log Message:
make: clean up comments

No binary change, except for line numbers in assertions.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/usr.bin/make/buf.c
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/make/buf.h
cvs rdiff -u -r1.247 -r1.248 src/usr.bin/make/compat.c
cvs rdiff -u -r1.356 -r1.357 src/usr.bin/make/cond.c
cvs rdiff -u -r1.284 -r1.285 src/usr.bin/make/dir.c
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/make/hash.c
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/make/hash.h
cvs rdiff -u -r1.460 -r1.461 src/usr.bin/make/job.c
cvs rdiff -u -r1.77 -r1.78 src/usr.bin/make/job.h
cvs rdiff -u -r1.711 -r1.712 src/usr.bin/make/parse.c
cvs rdiff -u -r1.371 -r1.372 src/usr.bin/make/suff.c
cvs rdiff -u -r1.1083 -r1.1084 src/usr.bin/make/var.c
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/make/unit-tests/cond-func-empty.mk
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/dep-var.mk \
src/usr.bin/make/unit-tests/dir.mk
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/directive-for-errors.mk
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/opt-debug-loud.mk

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/make/buf.c
diff -u src/usr.bin/make/buf.c:1.56 src/usr.bin/make/buf.c:1.57
--- src/usr.bin/make/buf.c:1.56	Thu Jun  1 07:44:10 2023
+++ src/usr.bin/make/buf.c	Tue Dec 19 19:33:39 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: buf.c,v 1.56 2023/06/01 07:44:10 rillig Exp $	*/
+/*	$NetBSD: buf.c,v 1.57 2023/12/19 19:33:39 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -69,13 +69,13 @@
  * SUCH DAMAGE.
  */
 
-/* Automatically-expanding null-terminated character buffers. */
+/* Automatically growing null-terminated buffers of characters. */
 
 #include 
 #include "make.h"
 
 /*	"@(#)buf.c	8.1 (Berkeley) 6/6/93"	*/
-MAKE_RCSID("$NetBSD: buf.c,v 1.56 2023/06/01 07:44:10 rillig Exp $");
+MAKE_RCSID("$NetBSD: buf.c,v 1.57 2023/12/19 19:33:39 rillig Exp $");
 
 /* Make space in the buffer for adding at least 16 more bytes. */
 void

Index: src/usr.bin/make/buf.h
diff -u src/usr.bin/make/buf.h:1.48 src/usr.bin/make/buf.h:1.49
--- src/usr.bin/make/buf.h:1.48	Thu Jun  1 07:44:10 2023
+++ src/usr.bin/make/buf.h	Tue Dec 19 19:33:39 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: buf.h,v 1.48 2023/06/01 07:44:10 rillig Exp $	*/
+/*	$NetBSD: buf.h,v 1.49 2023/12/19 19:33:39 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -96,7 +96,7 @@ Buf_Clear(Buffer *buf)
 	buf->data[0] = '\0';
 }
 
-/* Buf_AddByte adds a single byte to a buffer. */
+/* Adds a single byte to a buffer. */
 MAKE_INLINE void
 Buf_AddByte(Buffer *buf, char byte)
 {

Index: src/usr.bin/make/compat.c
diff -u src/usr.bin/make/compat.c:1.247 src/usr.bin/make/compat.c:1.248
--- src/usr.bin/make/compat.c:1.247	Thu May  4 22:31:17 2023
+++ src/usr.bin/make/compat.c	Tue Dec 19 19:33:39 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: compat.c,v 1.247 2023/05/04 22:31:17 sjg Exp $	*/
+/*	$NetBSD: compat.c,v 1.248 2023/12/19 19:33:39 rillig Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -91,7 +91,7 @@
 #include "pathnames.h"
 
 /*	"@(#)compat.c	8.2 (Berkeley) 3/19/94"	*/
-MAKE_RCSID("$NetBSD: compat.c,v 1.247 2023/05/04 22:31:17 sjg Exp $");
+MAKE_RCSID("$NetBSD: compat.c,v 1.248 2023/12/19 19:33:39 rillig Exp $");
 
 static GNode *curTarg = NULL;
 static pid_t compatChild;
@@ -129,9 +129,7 @@ CompatInterrupt(int signo)
 	CompatDeleteTarget(curTarg);
 
 	if (curTarg != NULL && !GNode_IsPrecious(curTarg)) {
-		/*
-		 * Run .INTERRUPT only if hit with interrupt signal
-		 */
+		/* Run .INTERRUPT only if hit with interrupt signal. */
 		if (signo == SIGINT) {
 			GNode *gn = Targ_FindNode(".INTERRUPT");
 			if (gn != NULL) {
@@ -289,37 +287,22 @@ Compat_RunCommand(const char *cmdp, GNod
 
 	while (ch_isspace(*cmd))
 		cmd++;
-
-	/*
-	 * If we did not end up with a command, just skip it.
-	 */
 	if (cmd[0] == '\0')
 		return true;
 
 	useShell = UseShell(cmd);
-	/*
-	 * Print the command before echoing if we're not supposed to be quiet
-	 * for this one. We also print the command if -n given.
-	 */
+
 	if (!silent || !GNode_ShouldExecute(gn)) {
 		printf("%s\n", cmd);
 		fflush(stdout);
 	}
 
-	/*
-	 * If we're not supposed to execute any commands, this is as far as
-	 * we go...
-	 */
 	if (!doIt && !GNode_ShouldExecute(gn))
 		return true;
 
 	DEBUG1(JOB, "Execute: '%s'\n", cmd);
 
 	if (useShell) {
-		/*
-		 * We need to pass the command off to the shell, typically
-		 * because the 

CVS commit: src/usr.bin/make

2023-12-19 Thread Roland Illig
Module Name:src
Committed By:   rillig
Date:   Tue Dec 19 19:33:40 UTC 2023

Modified Files:
src/usr.bin/make: buf.c buf.h compat.c cond.c dir.c hash.c hash.h job.c
job.h parse.c suff.c var.c
src/usr.bin/make/unit-tests: cond-func-empty.mk dep-var.mk dir.mk
directive-for-errors.mk opt-debug-loud.mk

Log Message:
make: clean up comments

No binary change, except for line numbers in assertions.


To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/usr.bin/make/buf.c
cvs rdiff -u -r1.48 -r1.49 src/usr.bin/make/buf.h
cvs rdiff -u -r1.247 -r1.248 src/usr.bin/make/compat.c
cvs rdiff -u -r1.356 -r1.357 src/usr.bin/make/cond.c
cvs rdiff -u -r1.284 -r1.285 src/usr.bin/make/dir.c
cvs rdiff -u -r1.73 -r1.74 src/usr.bin/make/hash.c
cvs rdiff -u -r1.47 -r1.48 src/usr.bin/make/hash.h
cvs rdiff -u -r1.460 -r1.461 src/usr.bin/make/job.c
cvs rdiff -u -r1.77 -r1.78 src/usr.bin/make/job.h
cvs rdiff -u -r1.711 -r1.712 src/usr.bin/make/parse.c
cvs rdiff -u -r1.371 -r1.372 src/usr.bin/make/suff.c
cvs rdiff -u -r1.1083 -r1.1084 src/usr.bin/make/var.c
cvs rdiff -u -r1.23 -r1.24 src/usr.bin/make/unit-tests/cond-func-empty.mk
cvs rdiff -u -r1.10 -r1.11 src/usr.bin/make/unit-tests/dep-var.mk \
src/usr.bin/make/unit-tests/dir.mk
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/directive-for-errors.mk
cvs rdiff -u -r1.4 -r1.5 src/usr.bin/make/unit-tests/opt-debug-loud.mk

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



CVS commit: src/share/misc

2023-12-19 Thread Jan Schaumann
Module Name:src
Committed By:   jschauma
Date:   Tue Dec 19 15:01:23 UTC 2023

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

Log Message:
+NVD  national vulnerability database


To generate a diff of this commit:
cvs rdiff -u -r1.383 -r1.384 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.383 src/share/misc/acronyms.comp:1.384
--- src/share/misc/acronyms.comp:1.383	Thu Dec  7 16:03:32 2023
+++ src/share/misc/acronyms.comp	Tue Dec 19 15:01:23 2023
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.383 2023/12/07 16:03:32 jschauma Exp $
+$NetBSD: acronyms.comp,v 1.384 2023/12/19 15:01:23 jschauma Exp $
 3WHS	three-way handshake
 8VSB	8-state vestigial side band modulation
 AA	anti-aliasing
@@ -1141,6 +1141,7 @@ NTM	non-deterministic Turing machine
 NTP	Network Time Protocol
 NUMA	non-uniform memory access
 NURBS	non-uniform rational basis spline
+NVD	National Vulnerability Database
 NVMM	NetBSD Virtual Machine Monitor
 NVMM	non-volatile main memory
 NVRAM	non-volatile random access memory



CVS commit: src/share/misc

2023-12-19 Thread Jan Schaumann
Module Name:src
Committed By:   jschauma
Date:   Tue Dec 19 15:01:23 UTC 2023

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

Log Message:
+NVD  national vulnerability database


To generate a diff of this commit:
cvs rdiff -u -r1.383 -r1.384 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/usr.sbin/sysinst/arch/evbarm

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 13:21:56 UTC 2023

Modified Files:
src/usr.sbin/sysinst/arch/evbarm: msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl

Log Message:
Fix kernel set names (the code has been changed to only offer GENERIC
or GENERIC64 kernel sets, but the UI messages and translations have not
been adapted back then)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/evbarm/msg.md.de \
src/usr.sbin/sysinst/arch/evbarm/msg.md.es \
src/usr.sbin/sysinst/arch/evbarm/msg.md.fr \
src/usr.sbin/sysinst/arch/evbarm/msg.md.pl
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbarm/msg.md.en

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

Modified files:

Index: src/usr.sbin/sysinst/arch/evbarm/msg.md.de
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.de:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.de:1.2
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.de:1.1	Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.de	Tue Dec 19 13:21:55 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.de,v 1.1 2014/07/26 19:30:45 dholland Exp $	*/
+/*	$NetBSD: msg.md.de,v 1.2 2023/12/19 13:21:55 martin Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -73,23 +73,7 @@ message arm32fspart
 }
 
 message set_kernel_1
-{Kernel (ADI_BRH)}
-message set_kernel_2
-{Kernel (INTERGRATOR)}
-message set_kernel_3
-{Kernel (IQ80310)}
-message set_kernel_4
-{Kernel (IQ80321)}
-message set_kernel_5
-{Kernel (MINI2440)}
-message set_kernel_6
-{Kernel (TEAMASA_NPWR)}
-message set_kernel_7
-{Kernel (TS7200)}
-message set_kernel_8
-{Kernel (RPI)}
-message set_kernel_9
-{Kernel (KUROBOX_PRO)}
+{Kernel}
 
 message nomsdospart
 {There is no MSDOS boot partition in the MBR partition table.}
Index: src/usr.sbin/sysinst/arch/evbarm/msg.md.es
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.es:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.es:1.2
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.es:1.1	Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.es	Tue Dec 19 13:21:55 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.es,v 1.1 2014/07/26 19:30:45 dholland Exp $	*/
+/*	$NetBSD: msg.md.es,v 1.2 2023/12/19 13:21:55 martin Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -72,23 +72,7 @@ Compensación en %s):
 }
 
 message set_kernel_1
-{Núcleo (ADI_BRH)}
-message set_kernel_2
-{Núcleo (INTERGRATOR)}
-message set_kernel_3
-{Núcleo (IQ80310)}
-message set_kernel_4
-{Núcleo (IQ80321)}
-message set_kernel_5
-{Núcleo (MINI2440)}
-message set_kernel_6
-{Núcleo (TEAMASA_NPWR)}
-message set_kernel_7
-{Núcleo (TS7200)}
-message set_kernel_8
-{N\xfacleo (RPI)}
-message set_kernel_9
-{Núcleo (KUROBOX_PRO)}
+{Núcleo}
 
 message nomsdospart
 {There is no MSDOS boot partition in the MBR partition table.}
Index: src/usr.sbin/sysinst/arch/evbarm/msg.md.fr
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.fr:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.fr:1.2
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.fr:1.1	Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.fr	Tue Dec 19 13:21:55 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.fr,v 1.1 2014/07/26 19:30:45 dholland Exp $	*/
+/*	$NetBSD: msg.md.fr,v 1.2 2023/12/19 13:21:55 martin Exp $	*/
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -72,23 +72,7 @@ message arm32fspart
 }
 
 message set_kernel_1
-{Kernel (ADI_BRH)}
-message set_kernel_2
-{Kernel (INTERGRATOR)}
-message set_kernel_3
-{Kernel (IQ80310)}
-message set_kernel_4
-{Kernel (IQ80321)}
-message set_kernel_5
-{Kernel (MINI2440)}
-message set_kernel_6
-{Kernel (TEAMASA_NPWR)}
-message set_kernel_7
-{Kernel (TS7200)}
-message set_kernel_8
-{Kernel (RPI)}
-message set_kernel_9
-{Kernel (KUROBOX_PRO)}
+{Kernel}
 
 message nomsdospart
 {There is no MSDOS boot partition in the MBR partition table.}
Index: src/usr.sbin/sysinst/arch/evbarm/msg.md.pl
diff -u src/usr.sbin/sysinst/arch/evbarm/msg.md.pl:1.1 src/usr.sbin/sysinst/arch/evbarm/msg.md.pl:1.2
--- src/usr.sbin/sysinst/arch/evbarm/msg.md.pl:1.1	Sat Jul 26 19:30:45 2014
+++ src/usr.sbin/sysinst/arch/evbarm/msg.md.pl	Tue Dec 19 13:21:55 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: msg.md.pl,v 1.1 2014/07/26 19:30:45 dholland Exp $	*/
+/*	$NetBSD: msg.md.pl,v 1.2 2023/12/19 13:21:55 martin Exp $	*/
 /* Based on english version: */
 /*	NetBSD: msg.md.en,v 1.2 2002/04/02 17:02:54 thorpej Exp */
 
@@ -71,23 +71,7 @@ message arm32fspart
 }
 
 message set_kernel_1
-{Kernel (ADI_BRH)}
-message set_kernel_2
-{Kernel (INTERGRATOR)}
-message set_kernel_3
-{Kernel (IQ80310)}
-message set_kernel_4
-{Kernel (IQ80321)}
-message set_kernel_5
-{Kernel (MINI2440)}
-message set_kernel_6
-{Kernel (TEAMASA_NPWR)}
-message set_kernel_7
-{Kernel (TS7200)}
-message set_kernel_8
-{Kernel (RPI)}
-message set_kernel_9
-{Kernel (KUROBOX_PRO)}
+{Kernel}
 
 message nomsdospart
 {There is no MSDOS boot partition in 

CVS commit: src/usr.sbin/sysinst/arch/evbarm

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 13:21:56 UTC 2023

Modified Files:
src/usr.sbin/sysinst/arch/evbarm: msg.md.de msg.md.en msg.md.es
msg.md.fr msg.md.pl

Log Message:
Fix kernel set names (the code has been changed to only offer GENERIC
or GENERIC64 kernel sets, but the UI messages and translations have not
been adapted back then)


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/evbarm/msg.md.de \
src/usr.sbin/sysinst/arch/evbarm/msg.md.es \
src/usr.sbin/sysinst/arch/evbarm/msg.md.fr \
src/usr.sbin/sysinst/arch/evbarm/msg.md.pl
cvs rdiff -u -r1.2 -r1.3 src/usr.sbin/sysinst/arch/evbarm/msg.md.en

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



CVS commit: [netbsd-10] src/sys/arch/netwinder/conf

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 12:51:30 UTC 2023

Modified Files:
src/sys/arch/netwinder/conf [netbsd-10]: GENERIC

Log Message:
Fix merge botch in previous


To generate a diff of this commit:
cvs rdiff -u -r1.144.4.1 -r1.144.4.2 src/sys/arch/netwinder/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/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.144.4.1 src/sys/arch/netwinder/conf/GENERIC:1.144.4.2
--- src/sys/arch/netwinder/conf/GENERIC:1.144.4.1	Tue Dec 19 12:49:40 2023
+++ src/sys/arch/netwinder/conf/GENERIC	Tue Dec 19 12:51:30 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.144.4.1 2023/12/19 12:49:40 martin Exp $
+# $NetBSD: GENERIC,v 1.144.4.2 2023/12/19 12:51:30 martin Exp $
 #
 # GENERIC machine description file
 #
@@ -295,4 +295,4 @@ pseudo-device 	swwdog			# software watch
 pseudo-device	wsmux			# mouse & keyboard multiplexor
 #pseudo-device	wsfont
 
-include "dev/veriexec.config"
+#include "dev/veriexec.config"



CVS commit: [netbsd-10] src/sys/arch/netwinder/conf

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 12:51:30 UTC 2023

Modified Files:
src/sys/arch/netwinder/conf [netbsd-10]: GENERIC

Log Message:
Fix merge botch in previous


To generate a diff of this commit:
cvs rdiff -u -r1.144.4.1 -r1.144.4.2 src/sys/arch/netwinder/conf/GENERIC

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



CVS commit: [netbsd-10] src/sys/arch/netwinder/conf

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 12:49:40 UTC 2023

Modified Files:
src/sys/arch/netwinder/conf [netbsd-10]: GENERIC Makefile.netwinder.inc
kern.ldscript std.netwinder

Log Message:
Pull up following revision(s) (requested by uwe in ticket #510):

sys/arch/netwinder/conf/Makefile.netwinder.inc: revision 1.12
sys/arch/netwinder/conf/std.netwinder: revision 1.17
sys/arch/netwinder/conf/kern.ldscript: revision 1.11
sys/arch/netwinder/conf/GENERIC: revision 1.146
sys/arch/netwinder/conf/GENERIC: revision 1.147

netwinder: specify kernel make variables in the makefile

There's not much sense to specify makeoptions in std.netwinder for
config(1) to move them to the generated makefile, when there's already
Makefile.netwinder.inc where these variables can be specified directly.

Move ENTRYPOINT.  Do NOT move LOADADDRESS - we don't want to use it as
it is kinda wrong and it will override the ld script.  Instead
explicitly set LINKTEXT to be empty to avoid the common kernel
makefile to supply the unwanted -Ttext option.

netwinder: fix base, minimize kern.ldscript diff with evbarm

New binutils align to 0x1, not 0x8000 (which makes sense), so
adjust the base to be 0x1 so that we are loaded at a page boundary
and (I guess) don't smash the firmware in the first page.  While here,
sync with ldscript.evbarm.

Makes my netwinder boot again.

netwinder: GENERIC - trim down some
It is still too big to get loaded by the firmware successfully, but
these VERBOSE options and -g symtab are the obvious hogs.

netwinder: GENERIC - trim down some more
Disable more stuff to make GENERIC just about fit.


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.144.4.1 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.11 -r1.11.48.1 \
src/sys/arch/netwinder/conf/Makefile.netwinder.inc
cvs rdiff -u -r1.10 -r1.10.48.1 src/sys/arch/netwinder/conf/kern.ldscript
cvs rdiff -u -r1.16 -r1.16.68.1 src/sys/arch/netwinder/conf/std.netwinder

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/netwinder/conf/GENERIC
diff -u src/sys/arch/netwinder/conf/GENERIC:1.144 src/sys/arch/netwinder/conf/GENERIC:1.144.4.1
--- src/sys/arch/netwinder/conf/GENERIC:1.144	Thu Sep 29 10:10:08 2022
+++ src/sys/arch/netwinder/conf/GENERIC	Tue Dec 19 12:49:40 2023
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.144 2022/09/29 10:10:08 riastradh Exp $
+# $NetBSD: GENERIC,v 1.144.4.1 2023/12/19 12:49:40 martin Exp $
 #
 # GENERIC machine description file
 #
@@ -54,7 +54,7 @@ file-system	FFS		# UFS
 file-system	MFS		# memory file system
 file-system	NFS		# Network file system
 #file-system 	ADOSFS		# AmigaDOS-compatible file system
-file-system 	EXT2FS		# second extended file system (linux)
+#file-system 	EXT2FS		# second extended file system (linux)
 #file-system	CD9660		# ISO 9660 + Rock Ridge file system
 file-system	MSDOSFS		# MS-DOS file system
 file-system	FDESC		# /dev/fd
@@ -75,7 +75,7 @@ file-system	TMPFS		# Efficient memory fi
 #options 	UFS_DIRHASH	# UFS Large Directory Hashing
 #options 	UFS_EXTATTR	# Extended attribute support for UFS1
 options 	WAPBL		# File system journaling support
-options 	NFSSERVER	# Network File System server
+#options 	NFSSERVER	# Network File System server
 
 # Networking options
 
@@ -130,8 +130,8 @@ options 	SYSVSHM		# System V-like memory
 options 	KTRACE		# system call tracing, a la ktrace(1)
 options 	IRQSTATS	# manage IRQ statistics
 #options 	SCSIVERBOSE	# Verbose SCSI errors
-options 	PCIVERBOSE	# Verbose PCI descriptions
-options 	MIIVERBOSE	# Verbose MII autoconfuration messages
+#options 	PCIVERBOSE	# Verbose PCI descriptions
+#options 	MIIVERBOSE	# Verbose MII autoconfuration messages
 #options 	PCI_CONFIG_DUMP	# verbosely dump PCI config space
 #options 	DDB_KEYCODE=0x40
 options 	USERCONF	# userconf(4) support
@@ -146,8 +146,8 @@ options 	SYSCTL_INCLUDE_DESCR	# Include 
 #options 	UVMHIST		# kernhist for uvm/pmap subsystems
 options 	DDB		# in-kernel debugger
 options 	DDB_HISTORY_SIZE=100	# Enable history editing in DDB
-makeoptions	DEBUG="-g"	# compile full symbol table
-makeoptions	COPY_SYMTAB=1
+#makeoptions	DEBUG="-g"	# compile full symbol table
+#makeoptions	COPY_SYMTAB=1	# see also ksyms below
 
 config		netbsd	root on ? type ?
 
@@ -260,8 +260,8 @@ spkr*	at audio?		# PC speaker (synthesiz
 
 # Pseudo-Devices
 
-pseudo-device 	crypto		# /dev/crypto device
-pseudo-device	swcrypto	# software crypto implementation
+#pseudo-device 	crypto		# /dev/crypto device
+#pseudo-device	swcrypto	# software crypto implementation
 
 # disk/mass storage pseudo-devices
 #pseudo-device	md			# memory disk device (ramdisk)
@@ -273,7 +273,7 @@ pseudo-device	fss			# file system snapsh
 # network pseudo-devices
 pseudo-device	bpfilter		# Berkeley packet filter
 pseudo-device	carp			# Common Address Redundancy Protocol
-pseudo-device	

CVS commit: [netbsd-10] src/sys/arch/netwinder/conf

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 12:49:40 UTC 2023

Modified Files:
src/sys/arch/netwinder/conf [netbsd-10]: GENERIC Makefile.netwinder.inc
kern.ldscript std.netwinder

Log Message:
Pull up following revision(s) (requested by uwe in ticket #510):

sys/arch/netwinder/conf/Makefile.netwinder.inc: revision 1.12
sys/arch/netwinder/conf/std.netwinder: revision 1.17
sys/arch/netwinder/conf/kern.ldscript: revision 1.11
sys/arch/netwinder/conf/GENERIC: revision 1.146
sys/arch/netwinder/conf/GENERIC: revision 1.147

netwinder: specify kernel make variables in the makefile

There's not much sense to specify makeoptions in std.netwinder for
config(1) to move them to the generated makefile, when there's already
Makefile.netwinder.inc where these variables can be specified directly.

Move ENTRYPOINT.  Do NOT move LOADADDRESS - we don't want to use it as
it is kinda wrong and it will override the ld script.  Instead
explicitly set LINKTEXT to be empty to avoid the common kernel
makefile to supply the unwanted -Ttext option.

netwinder: fix base, minimize kern.ldscript diff with evbarm

New binutils align to 0x1, not 0x8000 (which makes sense), so
adjust the base to be 0x1 so that we are loaded at a page boundary
and (I guess) don't smash the firmware in the first page.  While here,
sync with ldscript.evbarm.

Makes my netwinder boot again.

netwinder: GENERIC - trim down some
It is still too big to get loaded by the firmware successfully, but
these VERBOSE options and -g symtab are the obvious hogs.

netwinder: GENERIC - trim down some more
Disable more stuff to make GENERIC just about fit.


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.144.4.1 src/sys/arch/netwinder/conf/GENERIC
cvs rdiff -u -r1.11 -r1.11.48.1 \
src/sys/arch/netwinder/conf/Makefile.netwinder.inc
cvs rdiff -u -r1.10 -r1.10.48.1 src/sys/arch/netwinder/conf/kern.ldscript
cvs rdiff -u -r1.16 -r1.16.68.1 src/sys/arch/netwinder/conf/std.netwinder

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



CVS commit: [netbsd-10] src/doc

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 12:39:01 UTC 2023

Modified Files:
src/doc [netbsd-10]: CHANGES-10.0

Log Message:
Tickets #507 - #510


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.173 -r1.1.2.174 src/doc/CHANGES-10.0

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



CVS commit: [netbsd-10] src/doc

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 12:39:01 UTC 2023

Modified Files:
src/doc [netbsd-10]: CHANGES-10.0

Log Message:
Tickets #507 - #510


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.173 -r1.1.2.174 src/doc/CHANGES-10.0

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

Modified files:

Index: src/doc/CHANGES-10.0
diff -u src/doc/CHANGES-10.0:1.1.2.173 src/doc/CHANGES-10.0:1.1.2.174
--- src/doc/CHANGES-10.0:1.1.2.173	Mon Dec 18 14:18:58 2023
+++ src/doc/CHANGES-10.0	Tue Dec 19 12:39:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-10.0,v 1.1.2.173 2023/12/18 14:18:58 martin Exp $
+# $NetBSD: CHANGES-10.0,v 1.1.2.174 2023/12/19 12:39:01 martin Exp $
 
 A complete list of changes from the initial NetBSD 10.0 branch on 2022-12-16
 until the 10.0 release:
@@ -14396,3 +14396,31 @@ bin/df/df.c	1.102
 	df(1): correctly compute the "Filesystem" column width when using -W.
 	[kre, ticket #506]
 
+external/gpl3/gcc.old/dist/gcc/reload1.c	1.12
+	(applied to external/gpl3/gcc/dist/gcc/reload1.c)
+
+	gcc: vax: PR 57646: Where an output register might be reloaded,
+	and it is a memory  reference, and the address is auto-incremented,
+	any previously reloaded copy of the address must be invalidated.
+	[kalvisd, ticket #507]
+
+sys/arch/vax/vax/subr.S1.43
+
+	vax: PR 55415: preserve AST requests raised when handling software
+	interrupts.
+	[kalvisd, ticket #508]
+
+sys/arch/vax/include/cpu.h			1.108
+
+	vax: PR 55415: remove VAX-specific workaround to force pre-emption,
+	as it is now no longer needed.
+	[kalvisd, ticket #509]
+
+sys/arch/netwinder/conf/GENERIC			1.146,1.147
+sys/arch/netwinder/conf/Makefile.netwinder.inc	1.12
+sys/arch/netwinder/conf/kern.ldscript		1.11
+sys/arch/netwinder/conf/std.netwinder		1.17
+
+	netwinder: make GENERIC kernel bootable again.
+	[uwe, ticket #510]
+



CVS commit: [netbsd-10] src/sys/arch/vax/include

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 12:28:01 UTC 2023

Modified Files:
src/sys/arch/vax/include [netbsd-10]: cpu.h

Log Message:
Pull up following revision(s) (requested by kalvisd in ticket #509):

sys/arch/vax/include/cpu.h: revision 1.108

vax: PR port-vax/55415

Remove VAX-specific workaround to force pre-emption, as it is now
no longer needed.

tested by oster@


To generate a diff of this commit:
cvs rdiff -u -r1.106.2.1 -r1.106.2.2 src/sys/arch/vax/include/cpu.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/vax/include/cpu.h
diff -u src/sys/arch/vax/include/cpu.h:1.106.2.1 src/sys/arch/vax/include/cpu.h:1.106.2.2
--- src/sys/arch/vax/include/cpu.h:1.106.2.1	Mon Sep 11 13:42:08 2023
+++ src/sys/arch/vax/include/cpu.h	Tue Dec 19 12:28:01 2023
@@ -1,4 +1,4 @@
-/*  $NetBSD: cpu.h,v 1.106.2.1 2023/09/11 13:42:08 martin Exp $  */
+/*  $NetBSD: cpu.h,v 1.106.2.2 2023/12/19 12:28:01 martin Exp $  */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden
@@ -156,15 +156,10 @@ extern int cpu_printfataltraps;
 #define	curcpu()		(curlwp->l_cpu + 0)
 #define	curlwp			((struct lwp *)mfpr(PR_SSP))
 #define	cpu_number()		(curcpu()->ci_cpuid)
-/* XXX RESCHED_REMOTE isn't the right flag name to be used here,
-but we need to set ci_want_resched to '1' to make things work 
-on vax.  See PR#55415 */
 #define	cpu_need_resched(ci, l, flags)		\
 	do {			\
 		struct pcb *pcb = lwp_getpcb(curlwp);		\
 		__USE(flags);	\
-		/* XXX RESCHED_REMOTE isn't the right flag */   \
-		(ci)->ci_want_resched = RESCHED_REMOTE;		\
 		pcb->P0LR = (pcb->P0LR & ~AST_MASK) | AST_ON;	\
 		mtpr(AST_OK,PR_ASTLVL);\
 	} while (/*CONSTCOND*/ 0)



CVS commit: [netbsd-10] src/sys/arch/vax/include

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 12:28:01 UTC 2023

Modified Files:
src/sys/arch/vax/include [netbsd-10]: cpu.h

Log Message:
Pull up following revision(s) (requested by kalvisd in ticket #509):

sys/arch/vax/include/cpu.h: revision 1.108

vax: PR port-vax/55415

Remove VAX-specific workaround to force pre-emption, as it is now
no longer needed.

tested by oster@


To generate a diff of this commit:
cvs rdiff -u -r1.106.2.1 -r1.106.2.2 src/sys/arch/vax/include/cpu.h

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



CVS commit: [netbsd-10] src/sys/arch/vax/vax

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 12:26:01 UTC 2023

Modified Files:
src/sys/arch/vax/vax [netbsd-10]: subr.S

Log Message:
Pull up following revision(s) (requested by kalvisd in ticket #508):

sys/arch/vax/vax/subr.S: revision 1.43

vax: preserve AST requests raised when handling software interrupts

PR port-vax/55415

On return from a software interrupt, if the software interrupt LWP
raised an AST request, copy the AST level from its PCB to the PCB
of the interrupted LWP.

Reviewed by 


To generate a diff of this commit:
cvs rdiff -u -r1.41.2.1 -r1.41.2.2 src/sys/arch/vax/vax/subr.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/vax/vax/subr.S
diff -u src/sys/arch/vax/vax/subr.S:1.41.2.1 src/sys/arch/vax/vax/subr.S:1.41.2.2
--- src/sys/arch/vax/vax/subr.S:1.41.2.1	Mon Jul 31 13:36:31 2023
+++ src/sys/arch/vax/vax/subr.S	Tue Dec 19 12:26:01 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: subr.S,v 1.41.2.1 2023/07/31 13:36:31 martin Exp $	   */
+/*	$NetBSD: subr.S,v 1.41.2.2 2023/12/19 12:26:01 martin Exp $	   */
 
 /*
  * Copyright (c) 1994 Ludd, University of Lule}, Sweden.
@@ -319,7 +319,18 @@ softint_process:
 	movl	%r6,CI_CURLWP(%r8)
 	/* XXX store-before-load barrier -- see cpu_switchto */
 #endif
-
+	/* copy AST level from current LWP to pinned LWP, reset
+	   current AST level */
+	mfpr	$PR_SSP,%r4		/* current LWP */
+	movl	L_PCB(%r4),%r4		/* PCB address */
+	movl	P0LR(%r4),%r0		/* LR and ASTLVL field, current PCB */
+	movl	P0LR(%r3),%r1		/* same, pinned LWP */
+	cmpl	%r0,%r1
+	bgtru	1f			/* AST(current) >= AST(pinned) */
+	extv	$24,$3,%r0,%r0		/* ASTLVL field for current LWP */
+	insv	%r0,$24,$3,P0LR(%r3)	/* copy to pinned LWP */
+	insv	$4,$24,$3,P0LR(%r4)	/* reset AST for current LWP */
+1:
 	mtpr	PCB_PADDR(%r3),$PR_PCBB	/* restore PA of interrupted pcb */
 	ldpctx/* implicitly updates curlwp */
 	rei



CVS commit: [netbsd-10] src/sys/arch/vax/vax

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 12:26:01 UTC 2023

Modified Files:
src/sys/arch/vax/vax [netbsd-10]: subr.S

Log Message:
Pull up following revision(s) (requested by kalvisd in ticket #508):

sys/arch/vax/vax/subr.S: revision 1.43

vax: preserve AST requests raised when handling software interrupts

PR port-vax/55415

On return from a software interrupt, if the software interrupt LWP
raised an AST request, copy the AST level from its PCB to the PCB
of the interrupted LWP.

Reviewed by 


To generate a diff of this commit:
cvs rdiff -u -r1.41.2.1 -r1.41.2.2 src/sys/arch/vax/vax/subr.S

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



CVS commit: [netbsd-10] src/external/gpl3/gcc/dist/gcc

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 12:24:21 UTC 2023

Modified Files:
src/external/gpl3/gcc/dist/gcc [netbsd-10]: reload1.c

Log Message:
Pull up following revision(s) (requested by kalvisd in ticket #507):

external/gpl3/gcc.old/dist/gcc/reload1.c: revision 1.12
(applied to external/gpl3/gcc/dist/gcc/reload1.c)

gcc: vax: gcc/reload1.c: PR port-vax/57646
Where an output register might be reloaded, and it is a memory
reference, and the address is auto-incremented, any previously
reloaded copy of the address must be invalidated.
XXXKD: Hidden within ``#ifdef NB_FIX_VAX_BACKEND'' and enabled
only for vax at the moment.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.6.1 src/external/gpl3/gcc/dist/gcc/reload1.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/gpl3/gcc/dist/gcc/reload1.c
diff -u src/external/gpl3/gcc/dist/gcc/reload1.c:1.9 src/external/gpl3/gcc/dist/gcc/reload1.c:1.9.6.1
--- src/external/gpl3/gcc/dist/gcc/reload1.c:1.9	Sun Apr 11 00:02:11 2021
+++ src/external/gpl3/gcc/dist/gcc/reload1.c	Tue Dec 19 12:24:21 2023
@@ -8377,6 +8377,44 @@ emit_reload_insns (class insn_chain *cha
 		reg_last_reload_reg[out_regno + k] = 0;
 	}
 	}
+
+#ifdef NB_FIX_VAX_BACKEND
+#if AUTO_INC_DEC
+  /* Where an output register might be reloaded, and it is a
+	 memory reference, and the address is auto-incremented, any
+	 previously reloaded copy of the address must be
+	 invalidated. */
+  if (i < 0
+	  && rld[r].out != 0
+	  && MEM_P (rld[r].out))
+	{
+	  rtx out = XEXP (rld[r].out, 0); /* address expression */
+	  enum rtx_code code = GET_CODE (out);
+
+	  if (code != POST_INC && code != POST_DEC
+	  && code != PRE_INC && code != PRE_DEC)
+	{
+	  /* do nothing */
+	}
+	  else
+	{
+	  int out_regno = REGNO (XEXP (out, 0));
+	  machine_mode mode = GET_MODE (XEXP (out, 0));
+
+	  /* for the moment, handle only the case where out_regno
+		 is a hardware register */
+
+	  if (HARD_REGISTER_NUM_P (out_regno))
+		{
+		  int k, out_nregs = hard_regno_nregs (out_regno, mode);
+
+		  for (k = 0; k < out_nregs; k++)
+		reg_last_reload_reg[out_regno + k] = 0;
+		}
+	}
+	}
+#endif /* AUTO_INC_DEC */
+#endif
 }
   reg_reloaded_dead |= reg_reloaded_died;
 }



CVS commit: [netbsd-10] src/external/gpl3/gcc/dist/gcc

2023-12-19 Thread Martin Husemann
Module Name:src
Committed By:   martin
Date:   Tue Dec 19 12:24:21 UTC 2023

Modified Files:
src/external/gpl3/gcc/dist/gcc [netbsd-10]: reload1.c

Log Message:
Pull up following revision(s) (requested by kalvisd in ticket #507):

external/gpl3/gcc.old/dist/gcc/reload1.c: revision 1.12
(applied to external/gpl3/gcc/dist/gcc/reload1.c)

gcc: vax: gcc/reload1.c: PR port-vax/57646
Where an output register might be reloaded, and it is a memory
reference, and the address is auto-incremented, any previously
reloaded copy of the address must be invalidated.
XXXKD: Hidden within ``#ifdef NB_FIX_VAX_BACKEND'' and enabled
only for vax at the moment.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.6.1 src/external/gpl3/gcc/dist/gcc/reload1.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

2023-12-19 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Dec 19 09:39:55 UTC 2023

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

Log Message:
Remove unnecessary #include


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/pci/if_eqos_pci.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/if_eqos_pci.c
diff -u src/sys/dev/pci/if_eqos_pci.c:1.3 src/sys/dev/pci/if_eqos_pci.c:1.4
--- src/sys/dev/pci/if_eqos_pci.c:1.3	Tue Oct 31 13:57:08 2023
+++ src/sys/dev/pci/if_eqos_pci.c	Tue Dec 19 09:39:55 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: if_eqos_pci.c,v 1.3 2023/10/31 13:57:08 msaitoh Exp $ */
+/* $NetBSD: if_eqos_pci.c,v 1.4 2023/12/19 09:39:55 skrll Exp $ */
 
 /*-
  * Copyright (c) 2023 Masanobu SAITOH 
@@ -32,10 +32,8 @@
  *
  */
 
-#include "opt_net_mpsafe.h"
-
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_eqos_pci.c,v 1.3 2023/10/31 13:57:08 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_eqos_pci.c,v 1.4 2023/12/19 09:39:55 skrll Exp $");
 
 #include 
 #include 



CVS commit: src/sys/dev/pci

2023-12-19 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Dec 19 09:39:55 UTC 2023

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

Log Message:
Remove unnecessary #include


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

2023-12-19 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Dec 19 08:19:42 UTC 2023

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

Log Message:
Use un_flags as pointed out by mrg@ thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/usb/if_axen.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_axen.c
diff -u src/sys/dev/usb/if_axen.c:1.95 src/sys/dev/usb/if_axen.c:1.96
--- src/sys/dev/usb/if_axen.c:1.95	Tue Dec 19 07:05:36 2023
+++ src/sys/dev/usb/if_axen.c	Tue Dec 19 08:19:42 2023
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_axen.c,v 1.95 2023/12/19 07:05:36 skrll Exp $	*/
+/*	$NetBSD: if_axen.c,v 1.96 2023/12/19 08:19:42 skrll Exp $	*/
 /*	$OpenBSD: if_axen.c,v 1.3 2013/10/21 10:10:22 yuo Exp $	*/
 
 /*
@@ -23,7 +23,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.95 2023/12/19 07:05:36 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_axen.c,v 1.96 2023/12/19 08:19:42 skrll Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -55,11 +55,6 @@ struct axen_type {
 #define AX179A	0x0004		/* AX88179A */
 };
 
-struct axen_softc {
-	struct usbnet		axen_un;
-	uint16_t		axen_flags;
-};
-
 /*
  * Various supported device vendors/products.
  */
@@ -76,7 +71,7 @@ static const struct axen_type axen_devs[
 static int	axen_match(device_t, cfdata_t, void *);
 static void	axen_attach(device_t, device_t, void *);
 
-CFATTACH_DECL_NEW(axen, sizeof(struct axen_softc),
+CFATTACH_DECL_NEW(axen, sizeof(struct usbnet),
 	axen_match, axen_attach, usbnet_detach, usbnet_activate);
 
 static int	axen_cmd(struct usbnet *, int, int, int, void *);
@@ -578,8 +573,7 @@ static void
 axen_attach(device_t parent, device_t self, void *aux)
 {
 	USBNET_MII_DECL_DEFAULT(unm);
-	struct axen_softc * const sc = device_private(self);
-	struct usbnet * const un = >axen_un;
+	struct usbnet * const un = device_private(self);
 	struct usb_attach_arg *uaa = aux;
 	struct usbd_device *dev = uaa->uaa_device;
 	usbd_status err;
@@ -596,7 +590,7 @@ axen_attach(device_t parent, device_t se
 
 	un->un_dev = self;
 	un->un_udev = dev;
-	un->un_sc = sc;
+	un->un_sc = un;
 	un->un_ops = _ops;
 	un->un_rx_xfer_flags = USBD_SHORT_XFER_OK;
 	un->un_tx_xfer_flags = USBD_FORCE_SHORT_XFER;
@@ -610,11 +604,11 @@ axen_attach(device_t parent, device_t se
 		return;
 	}
 
-	sc->axen_flags =
+	un->un_flags =
 	axen_lookup(uaa->uaa_vendor, uaa->uaa_product)->axen_flags;
 	if (UGETW(usbd_get_device_descriptor(dev)->bcdDevice) == 0x0200) {
-		sc->axen_flags &= ~(AX178A | AX179);
-		sc->axen_flags |= AX179A;
+		un->un_flags &= ~(AX178A | AX179);
+		un->un_flags |= AX179A;
 	}
 
 	err = usbd_device2interface_handle(dev, AXEN_IFACE_IDX, >un_iface);
@@ -678,7 +672,7 @@ axen_attach(device_t parent, device_t se
 #define   AXEN_FW_MODE0x08
 #define AXEN_FW_MODE_178A179		0x
 #define AXEN_FW_MODE_179A			0x0001
-	if (sc->axen_flags & AX179A) {
+	if (un->un_flags & AX179A) {
 		uint8_t bval = 0;
 		/*	len		dir	  cmd */
 		int cmd = (1 << 12) | (1 << 8) | (AXEN_FW_MODE & 0x00FF);
@@ -687,11 +681,11 @@ axen_attach(device_t parent, device_t se
 #endif
 
 	/* An ASIX chip was detected. Inform the world.  */
-	if (sc->axen_flags & AX178A)
+	if (un->un_flags & AX178A)
 		aprint_normal_dev(self, "AX88178a\n");
-	else if (sc->axen_flags & AX179)
+	else if (un->un_flags & AX179)
 		aprint_normal_dev(self, "AX88179\n");
-	else if (sc->axen_flags & AX179A)
+	else if (un->un_flags & AX179A)
 		aprint_normal_dev(self, "AX88179A\n");
 	else
 		aprint_normal_dev(self, "(unknown)\n");
@@ -760,7 +754,6 @@ axen_csum_flags_rx(struct ifnet *ifp, ui
 static void
 axen_uno_rx_loop(struct usbnet *un, struct usbnet_chain *c, uint32_t total_len)
 {
-	struct axen_softc * const sc = usbnet_softc(un);
 	struct ifnet *ifp = usbnet_ifp(un);
 	uint8_t *buf = c->unc_buf;
 	uint32_t rx_hdr, pkt_hdr;
@@ -842,7 +835,7 @@ axen_uno_rx_loop(struct usbnet *un, stru
 			goto nextpkt;
 		}
 
-		if (sc->axen_flags & AX179A) {
+		if (un->un_flags & AX179A) {
 			/* each 88179A frame doesn't contain FCS. */
 			usbnet_enqueue(un, buf + ETHER_ALIGN, pkt_len - 2,
 			   axen_csum_flags_rx(ifp, pkt_hdr), 0, 0);



CVS commit: src/sys/dev/usb

2023-12-19 Thread Nick Hudson
Module Name:src
Committed By:   skrll
Date:   Tue Dec 19 08:19:42 UTC 2023

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

Log Message:
Use un_flags as pointed out by mrg@ thanks.


To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/sys/dev/usb/if_axen.c

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



re: CVS commit: src/sys/dev/usb

2023-12-19 Thread matthew green
"Nick Hudson" writes:
> Module Name:  src
> Committed By: skrll
> Date: Tue Dec 19 07:05:36 UTC 2023
>
> Modified Files:
>   src/sys/dev/usb: if_axen.c
>
> Log Message:
> Add support for AX88179A. From sc.dying on current-users.
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.94 -r1.95 src/sys/dev/usb/if_axen.c

cool.

this can probably go back to not having a device softc
by using un_flags:

/*
 * This section is for driver to use, not touched by usbnet.
 */
unsignedun_flags;

in struct usbnet, and axen_softc becomes just usbnet again.


.mrg.