diff options
| -rw-r--r-- | sys/arch/sparc/dev/dma.c | 5 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/esp.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sys/arch/sparc/dev/dma.c b/sys/arch/sparc/dev/dma.c index ecd8b077f5e..f0c90d7eecf 100644 --- a/sys/arch/sparc/dev/dma.c +++ b/sys/arch/sparc/dev/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.9 1997/09/17 06:47:08 downsj Exp $ */ +/* $OpenBSD: dma.c,v 1.10 1998/01/28 17:21:46 jason Exp $ */ /* $NetBSD: dma.c,v 1.46 1997/08/27 11:24:16 bouyer Exp $ */ /* @@ -285,6 +285,9 @@ espsearch: } while (0) #define DMA_DRAIN(sc, dontpanic) do { \ + \ + if (sc->sc_rev == DMAREV_0) \ + DMACSR(sc) |= D_INVALIDATE; \ /* \ * DMA rev0 & rev1: we are not allowed to touch the DMA "flush" \ * and "drain" bits while it is still thinking about a \ diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c index 8e29e09fac9..438922eb1d6 100644 --- a/sys/arch/sparc/dev/esp.c +++ b/sys/arch/sparc/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.12 1998/01/14 18:30:10 jason Exp $ */ +/* $OpenBSD: esp.c,v 1.13 1998/01/28 17:21:47 jason Exp $ */ /* $NetBSD: esp.c,v 1.69 1997/08/27 11:24:18 bouyer Exp $ */ /* @@ -211,7 +211,6 @@ espattach(parent, self, aux) struct ncr53c9x_softc *sc = &esc->sc_ncr53c9x; struct bootpath *bp; int dmachild = strncmp(parent->dv_xname, "dma", 3) == 0; - int use_dmaselect = strncmp(parent->dv_xname, "obio", 4); /* * Set up glue for MI code early; we use some of it here. @@ -402,10 +401,7 @@ espattach(parent, self, aux) ncr53c9x_attach(sc, &esp_switch, &esp_dev); /* Turn on target selection using the `dma' method */ - /* XXX The Sun 4/300 doesn't handle this very well, so it is */ - /* XXX disabled if the parent device == "obio" */ - /* XXX More research to do here... */ - ncr53c9x_dmaselect = use_dmaselect; + ncr53c9x_dmaselect = 1; bootpath_store(1, NULL); } |