diff options
| author | asami <asami@FreeBSD.org> | 1996-09-07 02:14:47 +0000 |
|---|---|---|
| committer | asami <asami@FreeBSD.org> | 1996-09-07 02:14:47 +0000 |
| commit | 148ce94bebd89be1aab174e5e4af889f43ffdd6d (patch) | |
| tree | 76c7c637f26dd9c707e9bc4cb86db9ba6765d078 /sys/i386/isa/icu.h | |
| parent | 7b9ecd2de3dd0e21793ef47de26c51dbf4b2dff9 (diff) | |
| download | FreeBSD-src-148ce94bebd89be1aab174e5e4af889f43ffdd6d.zip FreeBSD-src-148ce94bebd89be1aab174e5e4af889f43ffdd6d.tar.gz | |
Yet another merge. Remove support.s by deleting memcopy. Remove
autoconf.c by merging icu.h. Fix a couple of typos.
Submitted by: The FreeBSD(98) Development Team.
Diffstat (limited to 'sys/i386/isa/icu.h')
| -rw-r--r-- | sys/i386/isa/icu.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/sys/i386/isa/icu.h b/sys/i386/isa/icu.h index a68269b..3b3dcdf 100644 --- a/sys/i386/isa/icu.h +++ b/sys/i386/isa/icu.h @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)icu.h 5.6 (Berkeley) 5/9/91 - * $Id: icu.h,v 1.6 1994/09/18 23:18:32 bde Exp $ + * $Id: icu.h,v 1.7 1994/10/01 02:56:11 davidg Exp $ */ /* @@ -57,14 +57,22 @@ extern unsigned imen; /* interrupt mask enable */ #define INTRMASK(msk,s) (msk |= (s)) #define INTRUNMASK(msk,s) (msk &= ~(s)) #if 0 +#ifdef PC98 +#define SET_ICUS() (outb(IO_ICU1 + 2, imen), outb(IU_ICU2 + 2, imen >> 8)) +#else /* IBM-PC */ #define SET_ICUS() (outb(IO_ICU1 + 1, imen), outb(IU_ICU2 + 1, imen >> 8)) +#endif /* PC98 */ #else /* * XXX - IO_ICU* are defined in isa.h, not icu.h, and nothing much bothers to * include isa.h, while too many things include icu.h. */ +#ifdef PC98 +#define SET_ICUS() (outb(0x02, imen), outb(0x0a, imen >> 8)) +#else #define SET_ICUS() (outb(0x21, imen), outb(0xa1, imen >> 8)) #endif +#endif #endif /* LOCORE */ @@ -89,6 +97,13 @@ extern unsigned imen; /* interrupt mask enable */ #define IRQ6 0x0040 #define IRQ7 0x0080 /* lowest - parallel printer */ +#ifdef PC98 +#undef IRQ2 +#define IRQ2 0x0004 +#undef IRQ_SLAVE +#define IRQ_SLAVE 0x0080 +#endif + /* * Interrupt Control offset into Interrupt descriptor table (IDT) */ |
