diff options
| author | bde <bde@FreeBSD.org> | 1999-12-26 16:21:19 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1999-12-26 16:21:19 +0000 |
| commit | 309905643392ff30130047951454fe281e4a9bc3 (patch) | |
| tree | a6823d7af94ec86c6fa16db6ac0dbc2925fb9d97 /sys/i386/isa | |
| parent | ca9961972f56cb4711e36f590e44faf51ed530aa (diff) | |
| download | FreeBSD-src-309905643392ff30130047951454fe281e4a9bc3.zip FreeBSD-src-309905643392ff30130047951454fe281e4a9bc3.tar.gz | |
Don't include <isa/isavar.h> or compile code depending on it when isa
is not configured. Including <isa/isavar.h> when it is not used is
harmful as well as bogus, since it includes "isa_if.h" which is not
generated when isa is not configured.
Diffstat (limited to 'sys/i386/isa')
| -rw-r--r-- | sys/i386/isa/intr_machdep.c | 6 | ||||
| -rw-r--r-- | sys/i386/isa/nmi.c | 6 |
2 files changed, 12 insertions, 0 deletions
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) |
