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 | |
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')
-rw-r--r-- | sys/i386/include/random.h | 4 | ||||
-rw-r--r-- | sys/i386/include/types.h | 6 | ||||
-rw-r--r-- | sys/i386/isa/intr_machdep.c | 8 | ||||
-rw-r--r-- | sys/i386/isa/intr_machdep.h | 4 | ||||
-rw-r--r-- | sys/i386/isa/isa_device.h | 16 | ||||
-rw-r--r-- | sys/i386/isa/nmi.c | 8 | ||||
-rw-r--r-- | sys/i386/isa/random_machdep.c | 4 |
7 files changed, 32 insertions, 18 deletions
diff --git a/sys/i386/include/random.h b/sys/i386/include/random.h index 088d81b..9c4850a 100644 --- a/sys/i386/include/random.h +++ b/sys/i386/include/random.h @@ -1,7 +1,7 @@ /* * random.h -- A strong random number generator * - * $Id: random.h,v 1.13 1997/09/14 03:19:03 peter Exp $ + * $Id: random.h,v 1.14 1998/04/06 09:30:18 phk Exp $ * * Version 0.95, last modified 18-Oct-95 * @@ -61,7 +61,7 @@ /* Interrupts to be used in the randomizing process */ extern inthand2_t *sec_intr_handler[]; -extern int sec_intr_unit[]; +extern void *sec_intr_unit[]; /* Exported functions */ diff --git a/sys/i386/include/types.h b/sys/i386/include/types.h index b906d83..50f9c33 100644 --- a/sys/i386/include/types.h +++ b/sys/i386/include/types.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.3 (Berkeley) 1/5/94 - * $Id: types.h,v 1.11 1997/05/31 09:07:36 peter Exp $ + * $Id: types.h,v 1.12 1998/06/14 14:08:21 bde Exp $ */ #ifndef _MACHINE_TYPES_H_ @@ -76,7 +76,7 @@ typedef __uint64_t uoff_t; /* unsigned file offset */ /* Interrupt mask (spl, xxx_imask, etc) */ typedef u_int32_t intrmask_t; -/* Interrupt handler function type - arg should be "void *" one day */ -typedef void inthand2_t __P((int _unit)); +/* Interrupt handler function type. */ +typedef void inthand2_t __P((void *_cookie)); #endif /* !_MACHINE_TYPES_H_ */ diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c index 7e5363f..6382d19 100644 --- a/sys/i386/isa/intr_machdep.c +++ b/sys/i386/isa/intr_machdep.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: intr_machdep.c,v 1.10 1998/05/17 21:15:18 tegge Exp $ + * $Id: intr_machdep.c,v 1.11 1998/05/31 10:53:52 bde Exp $ */ #include "opt_auto_eoi.h" @@ -87,7 +87,7 @@ u_long *intr_countp[ICU_LEN]; inthand2_t *intr_handler[ICU_LEN]; u_int intr_mask[ICU_LEN]; static u_int* intr_mptr[ICU_LEN]; -int intr_unit[ICU_LEN]; +void *intr_unit[ICU_LEN]; static inthand_t *fastintr[ICU_LEN] = { &IDTVEC(fastintr0), &IDTVEC(fastintr1), @@ -117,7 +117,7 @@ static inthand_t *slowintr[ICU_LEN] = { #endif /* APIC_IO */ }; -static inthand2_t isa_strayintr; +static ointhand2_t isa_strayintr; #ifdef PC98 #define NMI_PARITY 0x04 @@ -404,7 +404,7 @@ icu_setup(int intr, inthand2_t *handler, void *arg, u_int *maskptr, int flags) intr_handler[intr] = handler; intr_mptr[intr] = maskptr; intr_mask[intr] = mask | (1 << intr); - intr_unit[intr] = (int) arg; + intr_unit[intr] = arg; #ifdef FAST_HI if (flags & INTR_FAST) { vector = TPR_FAST_INTS + intr; diff --git a/sys/i386/isa/intr_machdep.h b/sys/i386/isa/intr_machdep.h index dc8f900..7cdce87 100644 --- a/sys/i386/isa/intr_machdep.h +++ b/sys/i386/isa/intr_machdep.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * from: @(#)isa_device.h 7.1 (Berkeley) 5/9/91 - * $Id: intr_machdep.h,v 1.11 1998/03/03 22:56:30 tegge Exp $ + * $Id: intr_machdep.h,v 1.12 1998/05/31 10:53:54 bde Exp $ */ #ifndef _I386_ISA_INTR_MACHDEP_H_ @@ -144,7 +144,7 @@ extern char intrnames[]; /* string table containing device names */ extern u_long *intr_countp[]; /* pointers into intrcnt[] */ extern inthand2_t *intr_handler[]; /* C entry points of intr handlers */ extern u_int intr_mask[]; /* sets of intrs masked during handling of 1 */ -extern int intr_unit[]; /* cookies to pass to intr handlers */ +extern void *intr_unit[]; /* cookies to pass to intr handlers */ inthand_t IDTVEC(fastintr0), IDTVEC(fastintr1), 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_ */ diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c index 7e5363f..6382d19 100644 --- a/sys/i386/isa/nmi.c +++ b/sys/i386/isa/nmi.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 - * $Id: intr_machdep.c,v 1.10 1998/05/17 21:15:18 tegge Exp $ + * $Id: intr_machdep.c,v 1.11 1998/05/31 10:53:52 bde Exp $ */ #include "opt_auto_eoi.h" @@ -87,7 +87,7 @@ u_long *intr_countp[ICU_LEN]; inthand2_t *intr_handler[ICU_LEN]; u_int intr_mask[ICU_LEN]; static u_int* intr_mptr[ICU_LEN]; -int intr_unit[ICU_LEN]; +void *intr_unit[ICU_LEN]; static inthand_t *fastintr[ICU_LEN] = { &IDTVEC(fastintr0), &IDTVEC(fastintr1), @@ -117,7 +117,7 @@ static inthand_t *slowintr[ICU_LEN] = { #endif /* APIC_IO */ }; -static inthand2_t isa_strayintr; +static ointhand2_t isa_strayintr; #ifdef PC98 #define NMI_PARITY 0x04 @@ -404,7 +404,7 @@ icu_setup(int intr, inthand2_t *handler, void *arg, u_int *maskptr, int flags) intr_handler[intr] = handler; intr_mptr[intr] = maskptr; intr_mask[intr] = mask | (1 << intr); - intr_unit[intr] = (int) arg; + intr_unit[intr] = arg; #ifdef FAST_HI if (flags & INTR_FAST) { vector = TPR_FAST_INTS + intr; diff --git a/sys/i386/isa/random_machdep.c b/sys/i386/isa/random_machdep.c index 771e4cb..9f2e610 100644 --- a/sys/i386/isa/random_machdep.c +++ b/sys/i386/isa/random_machdep.c @@ -1,7 +1,7 @@ /* * random_machdep.c -- A strong random number generator * - * $Id: random_machdep.c,v 1.26 1998/06/07 08:40:25 phk Exp $ + * $Id: random_machdep.c,v 1.27 1998/06/09 13:10:46 phk Exp $ * * Version 0.95, last modified 18-Oct-95 * @@ -105,7 +105,7 @@ static struct timer_rand_state blkdev_timer_state[MAX_BLKDEV]; static struct wait_queue *random_wait; inthand2_t *sec_intr_handler[ICU_LEN]; -int sec_intr_unit[ICU_LEN]; +void *sec_intr_unit[ICU_LEN]; #ifndef MIN #define MIN(a,b) (((a) < (b)) ? (a) : (b)) |