diff options
| author | bde <bde@FreeBSD.org> | 1994-08-22 15:58:40 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 1994-08-22 15:58:40 +0000 |
| commit | fd6631bb73ace75acad7eb4e3cc5b82379970c00 (patch) | |
| tree | 13f5db31f844980ad2033d6ad59d35d52d341994 /sys | |
| parent | a1893a4b8223e14f6b7bb2aebd0db09710882ef1 (diff) | |
| download | FreeBSD-src-fd6631bb73ace75acad7eb4e3cc5b82379970c00.zip FreeBSD-src-fd6631bb73ace75acad7eb4e3cc5b82379970c00.tar.gz | |
Restore the intr_* array variables that were removed in the previous
revision. They caused redundant redeclaration warnings because I
forgot to declare them as extern and gcc-2.6.0 treats "extern int x[];"
slightly different from "int x[];" (this is probably a bug). The new
versions will cause RR warnings from gcc-2.4.5 because it does not
understand that the second declaration in "extern int x[]; int x[1];"
is not redundant. The variables don't actually need to be declared
in a header file because they are used in only one C source file and
one assembler source file, but I want all public variables and
comments about them to be findable by grepping *.h.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/isa/isa_device.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index f7bd8db..3cd86ef 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.6 1994/08/18 05:09:33 davidg Exp $ + * $Id: isa_device.h,v 1.7 1994/08/20 03:48:41 davidg Exp $ */ #ifndef _I386_ISA_ISA_DEVICE_H_ @@ -93,6 +93,10 @@ struct isa_driver { extern char eintrnames[]; /* end of intrnames[] */ extern u_long intrcnt[]; /* counts for for each device and stray */ extern char intrnames[]; /* string table containing device names */ +extern u_long *intr_countp[]; /* indirectors 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 struct isa_device isa_devtab_bio[], isa_devtab_tty[], isa_devtab_net[], isa_devtab_null[], isa_biotab_wdc[], isa_biotab_fdc[]; |
