From ff5f5ea02719e063f57a137ab03926d17b0123a0 Mon Sep 17 00:00:00 2001
From: matt <matt@NetBSD.org>
Date: Wed, 5 Sep 2001 17:08:41 +0000
Subject: [PATCH] Don't compile SPL/INTR stuff if NEWINTR is defined.

---
 sys/arch/arm/arm32/db_machdep.c |  6 ++++--
 sys/arch/arm/arm32/genassym.cf  | 10 +++++++---
 sys/arch/arm/arm32/stubs.c      |  5 ++++-
 sys/arch/arm/conf/files.arm     |  6 +++---
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/sys/arch/arm/arm32/db_machdep.c b/sys/arch/arm/arm32/db_machdep.c
index c1f1244466db..f60daaac6c20 100644
--- a/sys/arch/arm/arm32/db_machdep.c
+++ b/sys/arch/arm/arm32/db_machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: db_machdep.c,v 1.4 2001/09/05 16:17:35 matt Exp $	*/
+/*	$NetBSD: db_machdep.c,v 1.5 2001/09/05 17:08:41 matt Exp $	*/
 
 /* 
  * Copyright (c) 1996 Mark Brinicombe
@@ -48,8 +48,9 @@ db_show_intrchain_cmd(addr, have_addr, count, modif)
 	db_expr_t       count;
 	char            *modif;
 {
+#ifndef NEWINTR
 	int loop;
-	irqhandler_t *ptr;
+	struct irqhandler *ptr;
 	char *name;
 	db_expr_t offset;
 
@@ -72,6 +73,7 @@ db_show_intrchain_cmd(addr, have_addr, count, modif)
 			}
 		}
 	}
+#endif	/* NEWINTR */
 }
 
 
diff --git a/sys/arch/arm/arm32/genassym.cf b/sys/arch/arm/arm32/genassym.cf
index 69980d0be4a2..448a71217e7a 100644
--- a/sys/arch/arm/arm32/genassym.cf
+++ b/sys/arch/arm/arm32/genassym.cf
@@ -1,4 +1,4 @@
-#	$NetBSD: genassym.cf,v 1.3 2001/09/05 16:23:10 matt Exp $
+#	$NetBSD: genassym.cf,v 1.4 2001/09/05 17:08:41 matt Exp $
 
 # Copyright (c) 1982, 1990 The Regents of the University of California.
 # All rights reserved.
@@ -103,21 +103,25 @@ define	PR_SCALE		offsetof(struct uprof, pr_scale)
 
 define	IH_FUNC			offsetof(struct irqhandler, ih_func)
 define	IH_ARG			offsetof(struct irqhandler, ih_arg)
+define	IH_FLAGS		offsetof(struct irqhandler, ih_flags)
+ifndef NEWINTR
 define	IH_LEVEL		offsetof(struct irqhandler, ih_level)
 define	IH_NUM			offsetof(struct irqhandler, ih_num)
-define	IH_FLAGS		offsetof(struct irqhandler, ih_flags)
 define	IH_MASKADDR		offsetof(struct irqhandler, ih_maskaddr)
 define	IH_MASKBITS		offsetof(struct irqhandler, ih_maskbits)
 define	IH_NEXT			offsetof(struct irqhandler, ih_next)
+endif
 
 define	FH_FUNC			offsetof(struct fiqhandler, fh_func)
-define	FH_MASK			offsetof(struct fiqhandler, fh_mask)
 define	FH_R8			offsetof(struct fiqhandler, fh_r8)
 define	FH_R9			offsetof(struct fiqhandler, fh_r9)
 define	FH_R10			offsetof(struct fiqhandler, fh_r10)
 define	FH_R11			offsetof(struct fiqhandler, fh_r11)
 define	FH_R12			offsetof(struct fiqhandler, fh_r12)
 define	FH_R13			offsetof(struct fiqhandler, fh_r13)
+ifndef NEWINTR
+define	FH_MASK			offsetof(struct fiqhandler, fh_mask)
+endif
 
 define	SIGF_HANDLER		offsetof(struct sigframe, sf_handler)
 define	SIGF_SC			offsetof(struct sigframe, sf_sc)
diff --git a/sys/arch/arm/arm32/stubs.c b/sys/arch/arm/arm32/stubs.c
index b51b1c4cef48..7c860fefd040 100644
--- a/sys/arch/arm/arm32/stubs.c
+++ b/sys/arch/arm/arm32/stubs.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: stubs.c,v 1.3 2001/09/05 16:17:35 matt Exp $	*/
+/*	$NetBSD: stubs.c,v 1.4 2001/09/05 17:08:41 matt Exp $	*/
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -198,6 +198,7 @@ dumpsys()
 	delay(1000000);
 }
 
+#ifndef NEWINTR
 /* This is interrupt / SPL related */
 
 int current_spl_level = _SPL_HIGH;
@@ -248,4 +249,6 @@ dump_spl_masks()
 }
 #endif
 
+#endif /* !NEWINTR */
+
 /* End of stubs.c */
diff --git a/sys/arch/arm/conf/files.arm b/sys/arch/arm/conf/files.arm
index e354df6b807c..4d4755fd0c73 100644
--- a/sys/arch/arm/conf/files.arm
+++ b/sys/arch/arm/conf/files.arm
@@ -1,4 +1,4 @@
-#	$NetBSD: files.arm,v 1.37 2001/08/05 13:09:47 chris Exp $
+#	$NetBSD: files.arm,v 1.38 2001/09/05 17:08:41 matt Exp $
 
 # temporary define to allow easy moving to ../arch/arm/arm32
 defopt	ARM32
@@ -67,12 +67,12 @@ file	arch/arm/arm32/cpuswitch.S		arm32
 file	arch/arm/arm32/exception.S		arm32
 file	arch/arm/arm32/fault.c			arm32
 file	arch/arm/arm32/fusu.S			arm32
-file	arch/arm/arm32/intr.c			arm32
+file	arch/arm/arm32/intr.c			arm32 & !newintr
 file	arch/arm/arm32/mem.c			arm32
 file	arch/arm/arm32/pmap.c			arm32
 file	arch/arm/arm32/setcpsr.S		arm32
 file	arch/arm/arm32/setstack.S		arm32
-file	arch/arm/arm32/spl.S			arm32
+file	arch/arm/arm32/spl.S			arm32 & !newintr
 file	arch/arm/arm32/stubs.c			arm32
 file	arch/arm/arm32/syscall.c		arm32
 file	arch/arm/arm32/sys_machdep.c		arm32