diff options
| author | Jordan K. Hubbard <jkh@FreeBSD.org> | 1995-05-11 02:15:55 +0000 |
|---|---|---|
| committer | Jordan K. Hubbard <jkh@FreeBSD.org> | 1995-05-11 02:15:55 +0000 |
| commit | 9cc347481f17a630df51645a71cc62d0f83c400a (patch) | |
| tree | 2f1e3905d475ad44a74bf867f4223b0689b84da3 /sys/i386/isa/isa_device.h | |
| parent | d4053fae6ef7b6a13b281706068ec3a3ed2534e5 (diff) | |
| download | src-9cc347481f17a630df51645a71cc62d0f83c400a.tar.gz src-9cc347481f17a630df51645a71cc62d0f83c400a.zip | |
Remove all vestiges of the ALLOW_CONFLICT_FOO evil and replace it with
something slightly less evil - a per device conflict flag.
Notes
Notes:
svn path=/head/; revision=8431
Diffstat (limited to 'sys/i386/isa/isa_device.h')
| -rw-r--r-- | sys/i386/isa/isa_device.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h index c21d35a1cf5e..5ef4e676be0b 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.20 1995/03/28 07:55:39 bde Exp $ + * $Id: isa_device.h,v 1.21 1995/04/23 09:13:08 julian Exp $ */ #ifndef _I386_ISA_ISA_DEVICE_H_ @@ -57,6 +57,11 @@ typedef void inthand2_t __P((int unit)); /* * Per device structure. + * + * XXX Note: id_conflicts should either become an array of things we're + * specifically allowed to conflict with or be subsumed into some + * more powerful mechanism for detecting and dealing with multiple types + * of non-fatal conflict. -jkh XXX */ struct isa_device { int id_id; /* device id */ @@ -69,6 +74,7 @@ struct isa_device { inthand2_t *id_intr; /* interrupt interface routine */ int id_unit; /* unit number */ int id_flags; /* flags */ + int id_conflicts; /* we're allowed to conflict with things */ int id_scsiid; /* scsi id if needed */ int id_alive; /* device is present */ #define RI_FAST 1 /* fast interrupt handler */ |