diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 2001-09-27 04:01:43 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 2001-09-27 04:01:43 +0000 |
| commit | 37bc047e274b3210d85884e8bee9f367c52b7704 (patch) | |
| tree | 1181175836bef305547c258f3f59aa625bbd5ae6 /sys/dev/sbus | |
| parent | ea07e5f4d44613fa5c483a396d12d1d12dc30ff4 (diff) | |
Huge merge with NetBSD. For full details look at their revision history (1.26 -> 1.83)...
Highlights:
o tag queue support
o fas366 support (doesn't work yet on sparc, but does on sparc64)
o tons more
(thanks to hugh, fgsch and beck for testing)
Diffstat (limited to 'sys/dev/sbus')
| -rw-r--r-- | sys/dev/sbus/esp_sbus.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/sys/dev/sbus/esp_sbus.c b/sys/dev/sbus/esp_sbus.c index 8d8f0b2a47a..d9550d80493 100644 --- a/sys/dev/sbus/esp_sbus.c +++ b/sys/dev/sbus/esp_sbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp_sbus.c,v 1.4 2001/09/26 00:03:34 jason Exp $ */ +/* $OpenBSD: esp_sbus.c,v 1.5 2001/09/27 04:01:42 jason Exp $ */ /* $NetBSD: esp_sbus.c,v 1.14 2001/04/25 17:53:37 bouyer Exp $ */ /*- @@ -538,13 +538,8 @@ espattach(esc, gluep) evcnt_attach(&sc->sc_dev, "intr", &sc->sc_intrcnt); /* Turn on target selection using the `dma' method */ -#ifdef notyet if (sc->sc_rev != NCR_VARIANT_FAS366) sc->sc_features |= NCR_F_DMASELECT; -#else - if (sc->sc_rev != NCR_VARIANT_FAS366) - ncr53c9x_dmaselect = 1; -#endif /* Do the common parts of attachment. */ ncr53c9x_attach(sc, &esp_switch, &esp_dev); |