diff options
Diffstat (limited to 'sys/i386/isa/isa_device.h')
| -rw-r--r-- | sys/i386/isa/isa_device.h | 81 |
1 files changed, 72 insertions, 9 deletions
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index d23f701914e62..17aad1dd263d5 100644 --- a/sys/i386/isa/isa_device.h +++ b/sys/i386/isa/isa_device.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 - * $Id: isa_device.h,v 1.56 1998/10/22 05:58:39 bde Exp $ + * $Id: isa_device.h,v 1.54 1998/09/15 10:04:08 gibbs Exp $ */ #ifndef _I386_ISA_ISA_DEVICE_H_ @@ -41,8 +41,6 @@ * ISA Bus Autoconfiguration */ -typedef void ointhand2_t __P((int unit)); - /* * Per device structure. * @@ -59,12 +57,7 @@ struct isa_device { int id_drq; /* DMA request */ caddr_t id_maddr; /* physical i/o memory address on bus (if any)*/ int id_msize; /* size of i/o memory */ - union { - inthand2_t *id_i; - ointhand2_t *id_oi; - } id_iu; /* interrupt interface routine */ -#define id_intr id_iu.id_i -#define id_ointr id_iu.id_oi + inthand2_t *id_intr; /* interrupt interface routine */ int id_unit; /* unit number */ int id_flags; /* flags */ int id_scsiid; /* scsi id if needed */ @@ -130,6 +123,76 @@ int isa_dmastatus __P((int chan)); int isa_dmastop __P((int chan)); void reconfig_isadev __P((struct isa_device *isdp, u_int *mp)); +typedef void ointhand2_t __P((int unit)); + +/* + * The "old" interrupt handlers really have type ointhand2_t although they + * appear to be declared as having type inthand2_t. However, if this + * header is included by ioconf.c, pretend that the handlers really have + * type inthand_t. Assume that `C' is defined only by ioconf.c. + */ +#ifndef C +#define inthand2_t ointhand2_t +#endif + +inthand2_t adintr; +inthand2_t ahaintr; +inthand2_t aicintr; +inthand2_t alogintr; +inthand2_t arintr; +inthand2_t ascintr; +#ifdef PC98 +inthand2_t bsintr; +#endif +inthand2_t csintr; +inthand2_t cxintr; +inthand2_t cyintr; +inthand2_t edintr; +inthand2_t egintr; +inthand2_t elintr; +inthand2_t epintr; +inthand2_t exintr; +inthand2_t fdintr; +inthand2_t feintr; +inthand2_t gusintr; +inthand2_t ieintr; +inthand2_t labpcintr; +inthand2_t le_intr; +inthand2_t lncintr; +inthand2_t loranintr; +inthand2_t lptintr; +inthand2_t m6850intr; +inthand2_t mcdintr; +inthand2_t mseintr; +inthand2_t ncaintr; +inthand2_t npxintr; +inthand2_t pasintr; +inthand2_t pcmintr; +inthand2_t pcrint; +inthand2_t ppcintr; +inthand2_t pcfintr; +inthand2_t psmintr; +inthand2_t rcintr; +inthand2_t sbintr; +inthand2_t scintr; +inthand2_t seaintr; +inthand2_t siointr; +inthand2_t sndintr; +inthand2_t spigintr; +inthand2_t srintr; +inthand2_t sscapeintr; +inthand2_t stlintr; +inthand2_t twintr; +inthand2_t uhaintr; +inthand2_t wdintr; +inthand2_t wdsintr; +inthand2_t wlintr; +inthand2_t wtintr; +inthand2_t zeintr; +inthand2_t zpintr; + +#undef inthand2_t + #endif /* KERNEL */ #endif /* !_I386_ISA_ISA_DEVICE_H_ */ |