Send "#if NISA > 0" to the bit-bucket and replace it with an option.

These were compile-time "is the isa code present?" tests and not
'how many isa busses' tests.

6 files changed, 18 insertions, 23 deletions

diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c
index 8e41c826..eb8eb8d 100644
--- a/sys/amd64/amd64/autoconf.c
+++ b/sys/amd64/amd64/autoconf.c
@@ -48,13 +48,12 @@
 #include "opt_bootp.h"
 #include "opt_ffs.h"
 #include "opt_cd9660.h"
+#include "opt_isa.h"
 #include "opt_nfs.h"
 #include "opt_nfsroot.h"
 #include "opt_bus.h"
 #include "opt_rootdevname.h"
 
-#include "isa.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
@@ -76,7 +75,7 @@
 #include <i386/isa/icu.h>
 #endif /* APIC_IO */
 
-#if NISA > 0
+#ifdef DEV_ISA
 #include <isa/isavar.h>
 
 device_t isa_bus_device = 0;
@@ -145,7 +144,7 @@ configure(dummy)
 	/* initialize new bus architecture */
 	root_bus_configure();
 
-#if NISA > 0
+#ifdef DEV_ISA
 	/*
 	 * Explicitly probe and attach ISA last.  The isa bus saves
 	 * it's device node at attach time for us here.
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 74917e7..e03d64f 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -44,6 +44,7 @@
 #include "opt_ddb.h"
 #include "opt_inet.h"
 #include "opt_ipx.h"
+#include "opt_isa.h"
 #include "opt_maxmem.h"
 #include "opt_msgbuf.h"
 #include "opt_npx.h"
@@ -1979,8 +1980,7 @@ init386(first)
 	 */
 	cninit();
 
-#include	"isa.h"
-#if	NISA >0
+#ifdef DEV_ISA
 	isa_defaultirq();
 #endif
 
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c
index 599551b..2caa992 100644
--- a/sys/amd64/amd64/trap.c
+++ b/sys/amd64/amd64/trap.c
@@ -45,6 +45,7 @@
 #include "opt_clock.h"
 #include "opt_cpu.h"
 #include "opt_ddb.h"
+#include "opt_isa.h"
 #include "opt_ktrace.h"
 #include "opt_npx.h"
 #include "opt_trap.h"
@@ -98,8 +99,6 @@
 
 #include <ddb/ddb.h>
 
-#include "isa.h"
-
 #include <sys/sysctl.h>
 
 int (*pmath_emulate) __P((struct trapframe *));
@@ -365,7 +364,7 @@ restart:
 			i = SIGFPE;
 			break;
 
-#if NISA > 0
+#ifdef DEV_ISA
 		case T_NMI:
 #ifdef POWERFAIL_NMI
 #ifndef TIMER_FREQ
@@ -398,7 +397,7 @@ restart:
 				panic("NMI indicates hardware failure");
 			break;
 #endif /* POWERFAIL_NMI */
-#endif /* NISA > 0 */
+#endif /* DEV_ISA */
 
 		case T_OFLOW:		/* integer overflow fault */
 			ucode = FPE_INTOVF;
@@ -618,7 +617,7 @@ restart:
 #endif
 			break;
 
-#if NISA > 0
+#ifdef DEV_ISA
 		case T_NMI:
 #ifdef POWERFAIL_NMI
 			mtx_enter(&Giant, MTX_DEF);
@@ -648,7 +647,7 @@ restart:
 				goto out;
 			/* FALL THROUGH */
 #endif /* POWERFAIL_NMI */
-#endif /* NISA > 0 */
+#endif /* DEV_ISA */
 		}
 
 		mtx_enter(&Giant, MTX_DEF);
diff --git a/sys/amd64/amd64/vm_machdep.c b/sys/amd64/amd64/vm_machdep.c
index 232ac42..eddae55 100644
--- a/sys/amd64/amd64/vm_machdep.c
+++ b/sys/amd64/amd64/vm_machdep.c
@@ -47,6 +47,7 @@
 #include "opt_pc98.h"
 #endif
 #include "opt_reset.h"
+#include "opt_isa.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -619,14 +620,12 @@ swi_vm(void *dummy)
  * or other unpredictable behaviour.
  */
 
-#include "isa.h"
-
 int
 is_physical_memory(addr)
 	vm_offset_t addr;
 {
 
-#if NISA > 0
+#ifdef DEV_ISA
 	/* The ISA ``memory hole''. */
 	if (addr >= 0xa0000 && addr < 0x100000)
 		return 0;
diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c
index 2649022..7a10912 100644
--- a/sys/amd64/isa/intr_machdep.c
+++ b/sys/amd64/isa/intr_machdep.c
@@ -38,8 +38,7 @@
  */
 
 #include "opt_auto_eoi.h"
-
-#include "isa.h"
+#include "opt_isa.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -76,7 +75,7 @@
 #endif
 #include <i386/isa/icu.h>
 
-#if NISA > 0
+#ifdef DEV_ISA
 #include <isa/isavar.h>
 #endif
 #include <i386/isa/intr_machdep.h>
@@ -367,7 +366,7 @@ isa_strayintr(vcookiep)
 		    "too many stray irq %d's; not logging any more\n", intr);
 }
 
-#if NISA > 0
+#ifdef DEV_ISA
 /*
  * Return a bitmap of the current interrupt requests.  This is 8259-specific
  * and is only suitable for use at probe time.
diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c
index 2649022..7a10912 100644
--- a/sys/amd64/isa/nmi.c
+++ b/sys/amd64/isa/nmi.c
@@ -38,8 +38,7 @@
  */
 
 #include "opt_auto_eoi.h"
-
-#include "isa.h"
+#include "opt_isa.h"
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -76,7 +75,7 @@
 #endif
 #include <i386/isa/icu.h>
 
-#if NISA > 0
+#ifdef DEV_ISA
 #include <isa/isavar.h>
 #endif
 #include <i386/isa/intr_machdep.h>
@@ -367,7 +366,7 @@ isa_strayintr(vcookiep)
 		    "too many stray irq %d's; not logging any more\n", intr);
 }
 
-#if NISA > 0
+#ifdef DEV_ISA
 /*
  * Return a bitmap of the current interrupt requests.  This is 8259-specific
  * and is only suitable for use at probe time.