 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Leo Weppelman.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -104,33 +104,33 @@ struct clockframe;
  * Interrupt handler chains.  intr_establish() inserts a handler into
  * the list.  The handler is called with its (single) argument or with a
  * 'standard' clockframe. This depends on 'ih_type'.
  */
 typedef int	(*hw_ifun_t)(void *, int);
 struct intrhand {
 	LIST_ENTRY(intrhand)	ih_link;
 	hw_ifun_t		ih_fun;
 	void			*ih_arg;
 	int			ih_type;
 	int			ih_pri;
 	int			ih_vector;
-	u_long			*ih_intrcnt;
+	u_int			*ih_intrcnt;
 };
 void		intr_init(void);
 struct intrhand *intr_establish(int, int, int, hw_ifun_t, void *);
 int		intr_disestablish(struct intrhand *);
 void		intr_dispatch(struct clockframe);
 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 */
 #endif /* _ATARI_INTR_H_ */

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Glass, Gordon W. Ross, and Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,43 +24,43 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Link and dispatch interrupts.
  */
 #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>
 #include <sys/queue.h>
 #include <sys/kmem.h>
 #include <sys/vmmeter.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <cesfic/cesfic/isr.h>
 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)
+{
 	int i;
 	/* Initialize the ISR lists. */
 	for (i = 0; i < NISR; ++i) {
 		LIST_INIT(&isr_list[i]);
+	}
+}
 /*

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Glass, Gordon W. Ross, and Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,47 +21,47 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #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.
  */
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kmem.h>
 #include <sys/vmmeter.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <luna68k/luna68k/isr.h>
 isr_autovec_list_t isr_autovec[NISRAUTOVEC];
 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);
 extern	int getsr(void);	/* in locore.s */
 void
 isrinit(void)
+{
 	int i;
 	/* Initialize the autovector lists. */
 	for (i = 0; i < NISRAUTOVEC; ++i) {

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Glass, Gordon W. Ross, and Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Link and dispatch interrupts.
  */
 #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>
 #include <sys/malloc.h>
 #include <sys/vmmeter.h>
 #include <sys/cpu.h>
 #include <sys/intr.h>
 #include <machine/psc.h>
 #include <machine/viareg.h>
 #define	NISR	8
 #define	ISRLOC	0x18
 @@ -75,27 +75,27 @@ static void *intr_arg[NISR] = {
 #ifdef DEBUG
 int	intr_debug = 0;
 #endif
 /*
  * Some of the below are not used yet, but might be used someday on the
  * IIfx/Q700/900/950/etc. where the interrupt controller may be reprogrammed
  * to interrupt on different levels as listed in locore.s
  */
 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);
 #define MAX_INAME_LENGTH 53
 #define STD_INAMES \
 	"spur\0via1\0via2\0unused1\0scc\0unused2\0unused3\0nmi\0clock\0"
 #define AUX_INAMES \
 	"spur\0soft\0via2\0ethernet\0scc\0sound\0via1\0nmi\0clock\0    "
 #define AV_INAMES \
 	"spur\0via1\0via2\0ethernet\0scc\0dsp\0unused1\0nmi\0clock\0   "
 void
 intr_init(void)

 @@ -1,14 +1,14 @@
-/*	$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.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Adam Glass, Gordon W. Ross, and Jason R. Thorpe.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -24,27 +24,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Link and dispatch interrupts.
  */
 #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>
 #include <sys/kmem.h>
 #include <sys/vmmeter.h>
 #include <sys/device.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <mvme68k/mvme68k/isr.h>
 volatile unsigned int interrupt_depth;
 @@ -53,27 +53,27 @@ struct	isr_vectored isr_vectored[NISRVEC
 static const char irqgroupname[] = "hard irqs";
 struct	evcnt mvme68k_irq_evcnt[] = {
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "spur"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "lev1"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "lev2"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "lev3"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "lev4"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "lev5"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "lev6"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "nmi")
 };
 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);
 static	int spurintr(void *);
 void
 isrinit(void)
+{
 	int i;
 	/* Initialize the autovector lists. */

 @@ -1,14 +1,14 @@
-/*	$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
  * should probably be re-synced when needed.
  * Darrin B. Jewell <jewell@mit.edu>  Tue Nov 10 05:07:16 1998
  * original cvs id: NetBSD: isr.c,v 1.12 1998/07/05 06:49:07 jonathan Exp
  */
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
 @@ -31,27 +31,27 @@
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * Link and dispatch interrupts.
  */
 #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>
 #include <sys/kmem.h>
 #include <sys/vmmeter.h>
 #include <sys/device.h>
 #include <sys/bus.h>
 #include <sys/cpu.h>
 #include <uvm/uvm_extern.h>
 #include <next68k/next68k/isr.h>
 @@ -64,27 +64,27 @@ static const char irqgroupname[] = "hard
 struct	evcnt next68k_irq_evcnt[] = {
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "spur"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "lev1"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "lev2"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "lev3"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "lev4"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "lev5"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "lev6"),
 	EVCNT_INITIALIZER(EVCNT_TYPE_INTR, NULL, irqgroupname, "nmi")
 };
 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);
 #if 0
 static	int spurintr(void *);
 #endif
 void
 isrinit(void)
+{
 	int i;

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -73,52 +73,52 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	from: Utah Hdr: clock.c 1.18 91/01/21$
  *	from: @(#)clock.c	8.2 (Berkeley) 1/12/94
  */
 /*
  * Machine-dependent clock routines for the Intersil 7170:
  * Original by Adam Glass;  partially rewritten by Gordon Ross.
  */
 #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>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <m68k/asm_single.h>
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/leds.h>
 #include <sun3/sun3/control.h>
 #include <sun3/sun3/interreg.h>
 #include <sun3/sun3/machdep.h>
 #include <dev/clock_subr.h>
 #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)
 void _isr_clock(void);	/* in locore.s */
 void clock_intr(struct clockframe);
 static volatile void *intersil_va;
 #define intersil_clock ((volatile struct intersil7170 *)intersil_va)
 #define intersil_clear() (void)intersil_clock->clk_intr_reg

 @@ -1,14 +1,14 @@
-/*	$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
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * the Systems Programming Group of the University of Utah Computer
  * Science Department.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -85,54 +85,54 @@
  * always something responding at the address where the Mostek
  * clock might be found: either a Mostek or plain-old EEPROM.
  * Therefore, we cheat.  If we find an Intersil clock, assume
  * that what responds at the end of the EEPROM space is just
  * plain-old EEPROM (not a Mostek clock).  Worse, there are
  * H/W problems with probing for an Intersil on the 3/80, so
  * on that machine we "know" there is a Mostek clock.
+ *
  * Note that the probing algorithm described above requires
  * that we probe the intersil before we probe the mostek!
  */
 #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>
 #include <sys/time.h>
 #include <sys/kernel.h>
 #include <sys/device.h>
 #include <uvm/uvm_extern.h>
 #include <m68k/asm_single.h>
 #include <machine/autoconf.h>
 #include <machine/bus.h>
 #include <machine/cpu.h>
 #include <machine/idprom.h>
 #include <machine/leds.h>
 #include <dev/clock_subr.h>
 #include <dev/ic/intersil7170reg.h>
 #include <dev/ic/intersil7170var.h>
 #include <dev/ic/mk48txxreg.h>
 #include <dev/ic/mk48txxvar.h>
 #include <sun3/sun3/machdep.h>
 #include <sun3/sun3/interreg.h>
-extern int intrcnt[];
+extern u_int intrcnt[];
 #define SUN3_470	Yes
 #define	CLOCK_PRI	5
 #define IREG_CLK_BITS	(IREG_CLOCK_ENAB_7 | IREG_CLOCK_ENAB_5)
 #define MKCLOCK_REG_OFFSET	(MK48T02_CLKOFF + MK48TXX_ICSR)
 /*
  * Only one of these two variables should be non-zero after
  * autoconfiguration determines which clock we have.
  */
 static volatile void *intersil_va;