diff options
| author | Andreas Schulz <ats@FreeBSD.org> | 1995-01-07 23:23:40 +0000 |
|---|---|---|
| committer | Andreas Schulz <ats@FreeBSD.org> | 1995-01-07 23:23:40 +0000 |
| commit | ddfdef13747342840217be8aa5d8f8a2204852af (patch) | |
| tree | 2651b93990ef32efcf522e7e93f543e0796f732f /sys | |
| parent | f677a957bffb568ecbf8f70395eb540f7bfbde9c (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/i386/isa/ultra14f.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/i386/isa/ultra14f.c b/sys/i386/isa/ultra14f.c index 9c8b98a5d1c8..224b439ad86a 100644 --- a/sys/i386/isa/ultra14f.c +++ b/sys/i386/isa/ultra14f.c @@ -22,7 +22,7 @@ * today: Fri Jun 2 17:21:03 EST 1994 * added 24F support ++sg * - * $Id: ultra14f.c,v 1.25 1994/09/16 13:33:50 davidg Exp $ + * $Id: ultra14f.c,v 1.26 1994/10/23 21:27:38 wollman Exp $ */ #include <sys/types.h> @@ -921,8 +921,8 @@ int uha24_init(unit) int unit; { - unsigned char p0, p1, p2, p3, p5, p6, p7; - unsigned char id[7], rev, emu, haid; + unsigned char p0, p1, p2, p3, p5, p7; + unsigned char id[7], rev, haid; int slot, port, irq, i; int resetcount = 4000; struct uha_data *uha = uhadata[unit]; @@ -988,13 +988,8 @@ int unit; /* We have the card! Grab remaining config. */ p5 = inb(ur->config); - p6 = inb(ur->config+1); p7 = inb(ur->config+2); - /* If the 24F is currently emulating an ISA device, leave. */ - emu = ((p6 & 0x04) >> 1) | ((p5 & 0x08) >> 3); - if (emu != 3) return(ENODEV); - switch (p5 & 0xf0) { case 0x10: irq = 15; break; case 0x20: irq = 14; break; |