diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-27 01:11:50 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-05-27 01:11:50 +0000 |
| commit | 1bd2f7cbffbf279dd27916345027bb36540c411c (patch) | |
| tree | f9a68c3c12ef067a1d964ddffb750ddd780b96d9 /sys/dev/isa/aha.c | |
| parent | 4e2e9714c65149d74c0d51f529869cbb80f91351 (diff) | |
"aha + bt" kernels work now.
Diffstat (limited to 'sys/dev/isa/aha.c')
| -rw-r--r-- | sys/dev/isa/aha.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c index 94cf9130897..1cd5510d58e 100644 --- a/sys/dev/isa/aha.c +++ b/sys/dev/isa/aha.c @@ -1,4 +1,4 @@ -/* $OpenBSD: aha.c,v 1.19 1996/05/26 00:27:09 deraadt Exp $ */ +/* $OpenBSD: aha.c,v 1.20 1996/05/27 01:11:44 deraadt Exp $ */ /* $NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $ */ #define AHADIAG @@ -185,6 +185,8 @@ struct cfdriver aha_cd = { #define AHA_RESET_TIMEOUT 2000 /* time to wait for reset (mSec) */ #define AHA_ABORT_TIMEOUT 2000 /* time to wait for abort (mSec) */ +#include "bt.h" + /* * aha_cmd(iobase, sc, icnt, ibuf, ocnt, obuf) * @@ -328,6 +330,14 @@ ahaprobe(parent, match, aux) void *match, *aux; { register struct isa_attach_args *ia = aux; +#if NBT > 0 + extern int btports[], nbtports; + int i; + + for (i = 0; i < nbtports; i++) + if (btports[i] == ia->ia_iobase) + return 0; +#endif #ifdef NEWCONFIG if (ia->ia_iobase == IOBASEUNK) |