diff options
author | bde <bde@FreeBSD.org> | 1998-06-18 15:32:09 +0000 |
---|---|---|
committer | bde <bde@FreeBSD.org> | 1998-06-18 15:32:09 +0000 |
commit | 5f62f0e8d098c625160e74c3257b2c9eae1a8cc2 (patch) | |
tree | df02485b79b159afa1982eac17e611a52c457f44 /sys/i386/isa/isa_device.h | |
parent | ee69dd69c584a8a7bd6cb1a59e16ade77758ff6a (diff) | |
download | FreeBSD-src-5f62f0e8d098c625160e74c3257b2c9eae1a8cc2.zip FreeBSD-src-5f62f0e8d098c625160e74c3257b2c9eae1a8cc2.tar.gz |
Changed the type of an isa/general interrupt handler to take a
`void *' arg. Fixed or hid most of the resulting type mismatches.
Handlers can now be updated locally (except for reworking their
global declarations in isa_device.h).
Diffstat (limited to 'sys/i386/isa/isa_device.h')
-rw-r--r-- | sys/i386/isa/isa_device.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index 3b315da..45e3c60 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.49 1998/06/17 16:32:23 kato Exp $ + * $Id: isa_device.h,v 1.50 1998/06/17 16:54:22 bde Exp $ */ #ifndef _I386_ISA_ISA_DEVICE_H_ @@ -122,6 +122,18 @@ 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 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; @@ -177,6 +189,8 @@ inthand2_t wtintr; inthand2_t zeintr; inthand2_t zpintr; +#undef inthand2_t + #endif /* KERNEL */ #endif /* !_I386_ISA_ISA_DEVICE_H_ */ |