Module Name: src Committed By: rin Date: Fri Apr 2 12:11:42 UTC 2021
Modified Files: src/sys/arch/atari/include: intr.h src/sys/arch/cesfic/cesfic: isr.c src/sys/arch/luna68k/luna68k: isr.c src/sys/arch/mac68k/mac68k: intr.c src/sys/arch/mvme68k/mvme68k: isr.c src/sys/arch/next68k/next68k: isr.c src/sys/arch/sun3/sun3: clock.c src/sys/arch/sun3/sun3x: clock.c Log Message: For ports with __HAVE_LEGACY_INTRCNT, turn intrcnt[] and derived variables into u_int, to match with kern/subr_evcnt.c. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/atari/include/intr.h cvs rdiff -u -r1.18 -r1.19 src/sys/arch/cesfic/cesfic/isr.c cvs rdiff -u -r1.24 -r1.25 src/sys/arch/luna68k/luna68k/isr.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/mac68k/mac68k/intr.c cvs rdiff -u -r1.35 -r1.36 src/sys/arch/mvme68k/mvme68k/isr.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/next68k/next68k/isr.c cvs rdiff -u -r1.64 -r1.65 src/sys/arch/sun3/sun3/clock.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/sun3/sun3x/clock.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/atari/include/intr.h diff -u src/sys/arch/atari/include/intr.h:1.21 src/sys/arch/atari/include/intr.h:1.22 --- src/sys/arch/atari/include/intr.h:1.21 Wed Jul 8 12:23:10 2009 +++ src/sys/arch/atari/include/intr.h Fri Apr 2 12:11:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.h,v 1.21 2009/07/08 12:23:10 tsutsui Exp $ */ +/* $NetBSD: intr.h,v 1.22 2021/04/02 12:11:41 rin Exp $ */ /*- * Copyright (c) 1996, 1997, 2007 The NetBSD Foundation, Inc. @@ -114,7 +114,7 @@ struct intrhand { int ih_type; int ih_pri; int ih_vector; - u_long *ih_intrcnt; + u_int *ih_intrcnt; }; void intr_init(void); @@ -127,9 +127,9 @@ void intr_glue(void); * Exported by intrcnt.h */ extern u_long autovects[]; -extern u_long intrcnt_auto[]; +extern u_int intrcnt_auto[]; extern u_long uservects[]; -extern u_long intrcnt_user[]; +extern u_int intrcnt_user[]; #endif /* _KERNEL */ Index: src/sys/arch/cesfic/cesfic/isr.c diff -u src/sys/arch/cesfic/cesfic/isr.c:1.18 src/sys/arch/cesfic/cesfic/isr.c:1.19 --- src/sys/arch/cesfic/cesfic/isr.c:1.18 Wed Nov 18 03:40:50 2020 +++ src/sys/arch/cesfic/cesfic/isr.c Fri Apr 2 12:11:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: isr.c,v 1.18 2020/11/18 03:40:50 thorpej Exp $ */ +/* $NetBSD: isr.c,v 1.19 2021/04/02 12:11:41 rin Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.18 2020/11/18 03:40:50 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.19 2021/04/02 12:11:41 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.18 typedef LIST_HEAD(, isr) isr_list_t; isr_list_t isr_list[NISR]; -extern int intrcnt[]; /* from locore.s */ +extern u_int intrcnt[]; /* from locore.s */ void isrinit(void) Index: src/sys/arch/luna68k/luna68k/isr.c diff -u src/sys/arch/luna68k/luna68k/isr.c:1.24 src/sys/arch/luna68k/luna68k/isr.c:1.25 --- src/sys/arch/luna68k/luna68k/isr.c:1.24 Sat Dec 19 21:38:30 2020 +++ src/sys/arch/luna68k/luna68k/isr.c Fri Apr 2 12:11:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: isr.c,v 1.24 2020/12/19 21:38:30 thorpej Exp $ */ +/* $NetBSD: isr.c,v 1.25 2021/04/02 12:11:41 rin Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ #include <sys/cdefs.h> /* RCS ID & Copyright macro defns */ -__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.24 2020/12/19 21:38:30 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.25 2021/04/02 12:11:41 rin Exp $"); /* * Link and dispatch interrupts. @@ -51,7 +51,7 @@ isr_autovec_list_t isr_autovec[NISRAUTOV struct isr_vectored isr_vectored[NISRVECTORED]; int idepth; -extern int intrcnt[]; /* from locore.s */ +extern u_int intrcnt[]; /* from locore.s */ extern void (*vectab[])(void); extern void badtrap(void); extern void intrhand_vectored(void); Index: src/sys/arch/mac68k/mac68k/intr.c diff -u src/sys/arch/mac68k/mac68k/intr.c:1.31 src/sys/arch/mac68k/mac68k/intr.c:1.32 --- src/sys/arch/mac68k/mac68k/intr.c:1.31 Tue Jul 21 06:10:26 2020 +++ src/sys/arch/mac68k/mac68k/intr.c Fri Apr 2 12:11:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: intr.c,v 1.31 2020/07/21 06:10:26 rin Exp $ */ +/* $NetBSD: intr.c,v 1.32 2021/04/02 12:11:41 rin Exp $ */ /*- * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.31 2020/07/21 06:10:26 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.32 2021/04/02 12:11:41 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -85,7 +85,7 @@ uint16_t ipl2psl_table[NIPL]; int idepth; volatile int ssir; -extern int intrcnt[]; /* from locore.s */ +extern u_int intrcnt[]; /* from locore.s */ void intr_computeipl(void); Index: src/sys/arch/mvme68k/mvme68k/isr.c diff -u src/sys/arch/mvme68k/mvme68k/isr.c:1.35 src/sys/arch/mvme68k/mvme68k/isr.c:1.36 --- src/sys/arch/mvme68k/mvme68k/isr.c:1.35 Sat Nov 21 17:59:13 2020 +++ src/sys/arch/mvme68k/mvme68k/isr.c Fri Apr 2 12:11:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: isr.c,v 1.35 2020/11/21 17:59:13 thorpej Exp $ */ +/* $NetBSD: isr.c,v 1.36 2021/04/02 12:11:41 rin Exp $ */ /*- * Copyright (c) 1996 The NetBSD Foundation, Inc. @@ -34,7 +34,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.35 2020/11/21 17:59:13 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.36 2021/04/02 12:11:41 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -63,7 +63,7 @@ struct evcnt mvme68k_irq_evcnt[] = { }; static int idepth; -extern int intrcnt[]; /* from locore.s. XXXSCW: will go away soon */ +extern u_int intrcnt[]; /* from locore.s. XXXSCW: will go away soon */ extern void (*vectab[])(void); extern void badtrap(void); extern void intrhand_vectored(void); Index: src/sys/arch/next68k/next68k/isr.c diff -u src/sys/arch/next68k/next68k/isr.c:1.31 src/sys/arch/next68k/next68k/isr.c:1.32 --- src/sys/arch/next68k/next68k/isr.c:1.31 Sat Nov 21 17:49:20 2020 +++ src/sys/arch/next68k/next68k/isr.c Fri Apr 2 12:11:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: isr.c,v 1.31 2020/11/21 17:49:20 thorpej Exp $ */ +/* $NetBSD: isr.c,v 1.32 2021/04/02 12:11:41 rin Exp $ */ /* * This file was taken from mvme68k/mvme68k/isr.c @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.31 2020/11/21 17:49:20 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: isr.c,v 1.32 2021/04/02 12:11:41 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -74,7 +74,7 @@ struct evcnt next68k_irq_evcnt[] = { int idepth; int ssir; -extern int intrcnt[]; /* from locore.s. XXXSCW: will go away soon */ +extern u_int intrcnt[]; /* from locore.s. XXXSCW: will go away soon */ extern void (*vectab[])(void); extern void badtrap(void); extern void intrhand_vectored(void); Index: src/sys/arch/sun3/sun3/clock.c diff -u src/sys/arch/sun3/sun3/clock.c:1.64 src/sys/arch/sun3/sun3/clock.c:1.65 --- src/sys/arch/sun3/sun3/clock.c:1.64 Sat Sep 7 15:56:11 2013 +++ src/sys/arch/sun3/sun3/clock.c Fri Apr 2 12:11:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.64 2013/09/07 15:56:11 tsutsui Exp $ */ +/* $NetBSD: clock.c,v 1.65 2021/04/02 12:11:41 rin Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -83,7 +83,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.64 2013/09/07 15:56:11 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.65 2021/04/02 12:11:41 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -108,7 +108,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1. #include <dev/ic/intersil7170reg.h> #include <dev/ic/intersil7170var.h> -extern int intrcnt[]; +extern u_int intrcnt[]; #define CLOCK_PRI 5 #define IREG_CLK_BITS (IREG_CLOCK_ENAB_7 | IREG_CLOCK_ENAB_5) Index: src/sys/arch/sun3/sun3x/clock.c diff -u src/sys/arch/sun3/sun3x/clock.c:1.40 src/sys/arch/sun3/sun3x/clock.c:1.41 --- src/sys/arch/sun3/sun3x/clock.c:1.40 Fri Sep 6 17:43:19 2013 +++ src/sys/arch/sun3/sun3x/clock.c Fri Apr 2 12:11:41 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.40 2013/09/06 17:43:19 tsutsui Exp $ */ +/* $NetBSD: clock.c,v 1.41 2021/04/02 12:11:41 rin Exp $ */ /* * Copyright (c) 1982, 1990, 1993 @@ -95,7 +95,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.40 2013/09/06 17:43:19 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.41 2021/04/02 12:11:41 rin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -122,7 +122,7 @@ __KERNEL_RCSID(0, "$NetBSD: clock.c,v 1. #include <sun3/sun3/machdep.h> #include <sun3/sun3/interreg.h> -extern int intrcnt[]; +extern u_int intrcnt[]; #define SUN3_470 Yes