diff options
| -rw-r--r-- | sys/amd64/amd64/autoconf.c | 6 | ||||
| -rw-r--r-- | sys/amd64/amd64/bios.c | 4 | ||||
| -rw-r--r-- | sys/amd64/isa/intr_machdep.c | 6 | ||||
| -rw-r--r-- | sys/amd64/isa/nmi.c | 6 | ||||
| -rw-r--r-- | sys/i386/i386/autoconf.c | 6 | ||||
| -rw-r--r-- | sys/i386/i386/bios.c | 4 | ||||
| -rw-r--r-- | sys/i386/isa/intr_machdep.c | 6 | ||||
| -rw-r--r-- | sys/i386/isa/nmi.c | 6 |
8 files changed, 42 insertions, 2 deletions
diff --git a/sys/amd64/amd64/autoconf.c b/sys/amd64/amd64/autoconf.c index 877b326..46f35c4 100644 --- a/sys/amd64/amd64/autoconf.c +++ b/sys/amd64/amd64/autoconf.c @@ -53,6 +53,8 @@ #include "opt_bus.h" #include "opt_rootdevname.h" +#include "isa.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -74,9 +76,11 @@ #include <i386/isa/icu.h> #endif /* APIC_IO */ -#include "isa.h" +#if NISA > 0 #include <isa/isavar.h> + device_t isa_bus_device = 0; +#endif static void configure_first __P((void *)); static void configure __P((void *)); diff --git a/sys/amd64/amd64/bios.c b/sys/amd64/amd64/bios.c index 63158c4..f70959c 100644 --- a/sys/amd64/amd64/bios.c +++ b/sys/amd64/amd64/bios.c @@ -33,6 +33,8 @@ #include "opt_pnp.h" +#include "isa.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -47,7 +49,9 @@ #include <machine/pc/bios.h> #include <isa/pnpreg.h> #include <isa/pnpvar.h> +#if NISA > 0 #include <isa/isavar.h> +#endif #define BIOS_START 0xe0000 #define BIOS_SIZE 0x20000 diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c index 4620006..d1f46ca 100644 --- a/sys/amd64/isa/intr_machdep.c +++ b/sys/amd64/isa/intr_machdep.c @@ -45,6 +45,8 @@ #include "opt_auto_eoi.h" +#include "isa.h" + #include <sys/param.h> #ifndef SMP #include <machine/lock.h> @@ -72,7 +74,9 @@ #endif #include <i386/isa/icu.h> +#if NISA > 0 #include <isa/isavar.h> +#endif #include <i386/isa/intr_machdep.h> #include <sys/interrupt.h> #ifdef APIC_IO @@ -304,6 +308,7 @@ isa_strayintr(vcookiep) "too many stray irq %d's; not logging any more\n", intr); } +#if NISA > 0 /* * Return a bitmap of the current interrupt requests. This is 8259-specific * and is only suitable for use at probe time. @@ -318,6 +323,7 @@ isa_irq_pending() irr2 = inb(IO_ICU2); return ((irr2 << 8) | irr1); } +#endif int update_intr_masks(void) diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c index 4620006..d1f46ca 100644 --- a/sys/amd64/isa/nmi.c +++ b/sys/amd64/isa/nmi.c @@ -45,6 +45,8 @@ #include "opt_auto_eoi.h" +#include "isa.h" + #include <sys/param.h> #ifndef SMP #include <machine/lock.h> @@ -72,7 +74,9 @@ #endif #include <i386/isa/icu.h> +#if NISA > 0 #include <isa/isavar.h> +#endif #include <i386/isa/intr_machdep.h> #include <sys/interrupt.h> #ifdef APIC_IO @@ -304,6 +308,7 @@ isa_strayintr(vcookiep) "too many stray irq %d's; not logging any more\n", intr); } +#if NISA > 0 /* * Return a bitmap of the current interrupt requests. This is 8259-specific * and is only suitable for use at probe time. @@ -318,6 +323,7 @@ isa_irq_pending() irr2 = inb(IO_ICU2); return ((irr2 << 8) | irr1); } +#endif int update_intr_masks(void) diff --git a/sys/i386/i386/autoconf.c b/sys/i386/i386/autoconf.c index 877b326..46f35c4 100644 --- a/sys/i386/i386/autoconf.c +++ b/sys/i386/i386/autoconf.c @@ -53,6 +53,8 @@ #include "opt_bus.h" #include "opt_rootdevname.h" +#include "isa.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> @@ -74,9 +76,11 @@ #include <i386/isa/icu.h> #endif /* APIC_IO */ -#include "isa.h" +#if NISA > 0 #include <isa/isavar.h> + device_t isa_bus_device = 0; +#endif static void configure_first __P((void *)); static void configure __P((void *)); diff --git a/sys/i386/i386/bios.c b/sys/i386/i386/bios.c index 63158c4..f70959c 100644 --- a/sys/i386/i386/bios.c +++ b/sys/i386/i386/bios.c @@ -33,6 +33,8 @@ #include "opt_pnp.h" +#include "isa.h" + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> @@ -47,7 +49,9 @@ #include <machine/pc/bios.h> #include <isa/pnpreg.h> #include <isa/pnpvar.h> +#if NISA > 0 #include <isa/isavar.h> +#endif #define BIOS_START 0xe0000 #define BIOS_SIZE 0x20000 diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c index 4620006..d1f46ca 100644 --- a/sys/i386/isa/intr_machdep.c +++ b/sys/i386/isa/intr_machdep.c @@ -45,6 +45,8 @@ #include "opt_auto_eoi.h" +#include "isa.h" + #include <sys/param.h> #ifndef SMP #include <machine/lock.h> @@ -72,7 +74,9 @@ #endif #include <i386/isa/icu.h> +#if NISA > 0 #include <isa/isavar.h> +#endif #include <i386/isa/intr_machdep.h> #include <sys/interrupt.h> #ifdef APIC_IO @@ -304,6 +308,7 @@ isa_strayintr(vcookiep) "too many stray irq %d's; not logging any more\n", intr); } +#if NISA > 0 /* * Return a bitmap of the current interrupt requests. This is 8259-specific * and is only suitable for use at probe time. @@ -318,6 +323,7 @@ isa_irq_pending() irr2 = inb(IO_ICU2); return ((irr2 << 8) | irr1); } +#endif int update_intr_masks(void) diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c index 4620006..d1f46ca 100644 --- a/sys/i386/isa/nmi.c +++ b/sys/i386/isa/nmi.c @@ -45,6 +45,8 @@ #include "opt_auto_eoi.h" +#include "isa.h" + #include <sys/param.h> #ifndef SMP #include <machine/lock.h> @@ -72,7 +74,9 @@ #endif #include <i386/isa/icu.h> +#if NISA > 0 #include <isa/isavar.h> +#endif #include <i386/isa/intr_machdep.h> #include <sys/interrupt.h> #ifdef APIC_IO @@ -304,6 +308,7 @@ isa_strayintr(vcookiep) "too many stray irq %d's; not logging any more\n", intr); } +#if NISA > 0 /* * Return a bitmap of the current interrupt requests. This is 8259-specific * and is only suitable for use at probe time. @@ -318,6 +323,7 @@ isa_irq_pending() irr2 = inb(IO_ICU2); return ((irr2 << 8) | irr1); } +#endif int update_intr_masks(void) |
