diff options
| author | dg <dg@FreeBSD.org> | 1993-09-25 01:50:15 +0000 |
|---|---|---|
| committer | dg <dg@FreeBSD.org> | 1993-09-25 01:50:15 +0000 |
| commit | eb3eab88c28e9a60df36b45c0ee474aec1bdb3c6 (patch) | |
| tree | 612653c345371b56e278bb4929e1c5dedc8c3e10 /sys | |
| parent | 2d5b7074e888e22729d128dac30b0a361a3eaa68 (diff) | |
| download | FreeBSD-src-eb3eab88c28e9a60df36b45c0ee474aec1bdb3c6.zip FreeBSD-src-eb3eab88c28e9a60df36b45c0ee474aec1bdb3c6.tar.gz | |
* Revision 1.30 93/09/24 18:43:31 davidg
* fix bug where Compex boards ident themselves as 8003E's and the
* 16bit override wasn't working
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ed/if_ed.c | 20 | ||||
| -rw-r--r-- | sys/i386/isa/if_ed.c | 20 |
2 files changed, 22 insertions, 18 deletions
diff --git a/sys/dev/ed/if_ed.c b/sys/dev/ed/if_ed.c index eccee0f..6f940f9 100644 --- a/sys/dev/ed/if_ed.c +++ b/sys/dev/ed/if_ed.c @@ -14,12 +14,16 @@ */ /* - * $Id: if_ed.c,v 1.29 93/09/12 04:43:31 davidg Exp Locker: davidg $ + * $Id: if_ed.c,v 1.30 93/09/24 18:43:31 davidg Exp Locker: davidg $ */ /* * Modification history * + * Revision 1.30 93/09/24 18:43:31 davidg + * fix bug where Compex boards ident themselves as 8003E's and the + * 16bit override wasn't working + * * Revision 1.29 93/09/12 04:43:31 davidg * cleaned-up probe routine to make it easier to add future board types * @@ -407,15 +411,13 @@ ed_probe_WD80x3(isa_dev) /* * Set upper address bits and 8/16 bit access to shared memory */ - if ((sc->type & ED_WD_SOFTCONFIG) || (sc->type == ED_TYPE_WD8013EBT)) { - if (isa16bit) { - outb(sc->asic_addr + ED_WD_LAAR, (sc->wd_laar_proto = - ED_WD_LAAR_L16EN | ED_WD_LAAR_M16EN | - ((kvtop(sc->smem_start) >> 19) & ED_WD_LAAR_ADDRHI))); - } else { - outb(sc->asic_addr + ED_WD_LAAR, (sc->wd_laar_proto = + if (isa16bit) { + outb(sc->asic_addr + ED_WD_LAAR, (sc->wd_laar_proto = + ED_WD_LAAR_L16EN | ED_WD_LAAR_M16EN | ((kvtop(sc->smem_start) >> 19) & ED_WD_LAAR_ADDRHI))); - } + } else { + outb(sc->asic_addr + ED_WD_LAAR, (sc->wd_laar_proto = + ((kvtop(sc->smem_start) >> 19) & ED_WD_LAAR_ADDRHI))); } /* diff --git a/sys/i386/isa/if_ed.c b/sys/i386/isa/if_ed.c index eccee0f..6f940f9 100644 --- a/sys/i386/isa/if_ed.c +++ b/sys/i386/isa/if_ed.c @@ -14,12 +14,16 @@ */ /* - * $Id: if_ed.c,v 1.29 93/09/12 04:43:31 davidg Exp Locker: davidg $ + * $Id: if_ed.c,v 1.30 93/09/24 18:43:31 davidg Exp Locker: davidg $ */ /* * Modification history * + * Revision 1.30 93/09/24 18:43:31 davidg + * fix bug where Compex boards ident themselves as 8003E's and the + * 16bit override wasn't working + * * Revision 1.29 93/09/12 04:43:31 davidg * cleaned-up probe routine to make it easier to add future board types * @@ -407,15 +411,13 @@ ed_probe_WD80x3(isa_dev) /* * Set upper address bits and 8/16 bit access to shared memory */ - if ((sc->type & ED_WD_SOFTCONFIG) || (sc->type == ED_TYPE_WD8013EBT)) { - if (isa16bit) { - outb(sc->asic_addr + ED_WD_LAAR, (sc->wd_laar_proto = - ED_WD_LAAR_L16EN | ED_WD_LAAR_M16EN | - ((kvtop(sc->smem_start) >> 19) & ED_WD_LAAR_ADDRHI))); - } else { - outb(sc->asic_addr + ED_WD_LAAR, (sc->wd_laar_proto = + if (isa16bit) { + outb(sc->asic_addr + ED_WD_LAAR, (sc->wd_laar_proto = + ED_WD_LAAR_L16EN | ED_WD_LAAR_M16EN | ((kvtop(sc->smem_start) >> 19) & ED_WD_LAAR_ADDRHI))); - } + } else { + outb(sc->asic_addr + ED_WD_LAAR, (sc->wd_laar_proto = + ((kvtop(sc->smem_start) >> 19) & ED_WD_LAAR_ADDRHI))); } /* |
