diff options
| author | Jason Wright <jason@cvs.openbsd.org> | 1999-02-28 19:12:35 +0000 |
|---|---|---|
| committer | Jason Wright <jason@cvs.openbsd.org> | 1999-02-28 19:12:35 +0000 |
| commit | 9fa21bec8f03defd6ea5bffa1a8310f3d7a9df65 (patch) | |
| tree | 45a12dd119a5767383092cfc31a0e12de850d5be /sys/arch | |
| parent | 4f9aa2f73974e60c9a02dc84a916fd08703f8d90 (diff) | |
conditionalize use of sbus_testdma()
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/sparc/dev/dma.c | 6 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/esp.c | 4 | ||||
| -rw-r--r-- | sys/arch/sparc/dev/if_le.c | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/sys/arch/sparc/dev/dma.c b/sys/arch/sparc/dev/dma.c index 72e5499803e..cbbb3be40ea 100644 --- a/sys/arch/sparc/dev/dma.c +++ b/sys/arch/sparc/dev/dma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dma.c,v 1.13 1998/11/11 00:50:31 jason Exp $ */ +/* $OpenBSD: dma.c,v 1.14 1999/02/28 19:12:32 jason Exp $ */ /* $NetBSD: dma.c,v 1.46 1997/08/27 11:24:16 bouyer Exp $ */ /* @@ -115,11 +115,13 @@ dmamatch(parent, vcf, aux) if (strcmp(cf->cf_driver->cd_name, ra->ra_name) && strcmp("espdma", ra->ra_name)) return (0); +#if defined(SUN4C) || defined(SUN4M) if (ca->ca_bustype == BUS_SBUS) { if (!sbus_testdma((struct sbus_softc *)parent, ca)) return (0); return (1); } +#endif ra->ra_len = NBPG; return (probeget(ra->ra_vaddr, 4) != -1); } @@ -382,8 +384,10 @@ ledmamatch(parent, vcf, aux) if (strcmp(cf->cf_driver->cd_name, ra->ra_name)) return (0); +#if defined(SUN4C) || defined(SUN4M) if (!sbus_testdma((struct sbus_softc *)parent, ca)) return(0); +#endif return (1); } diff --git a/sys/arch/sparc/dev/esp.c b/sys/arch/sparc/dev/esp.c index 59f8c6415b2..5dcc10ddb01 100644 --- a/sys/arch/sparc/dev/esp.c +++ b/sys/arch/sparc/dev/esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: esp.c,v 1.14 1998/11/11 00:25:58 jason Exp $ */ +/* $OpenBSD: esp.c,v 1.15 1999/02/28 19:12:33 jason Exp $ */ /* $NetBSD: esp.c,v 1.69 1997/08/27 11:24:18 bouyer Exp $ */ /* @@ -192,11 +192,13 @@ espmatch(parent, vcf, aux) if (strcmp(cf->cf_driver->cd_name, ra->ra_name)) return (0); +#if defined(SUN4C) || defined(SUN4M) if (ca->ca_bustype == BUS_SBUS) { if (!sbus_testdma((struct sbus_softc *)parent, ca)) return (0); return (1); } +#endif ra->ra_len = NBPG; return (probeget(ra->ra_vaddr, 1) != -1); } diff --git a/sys/arch/sparc/dev/if_le.c b/sys/arch/sparc/dev/if_le.c index 64ec0b7fc3a..fe937ede779 100644 --- a/sys/arch/sparc/dev/if_le.c +++ b/sys/arch/sparc/dev/if_le.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_le.c,v 1.15 1998/12/22 15:40:30 jason Exp $ */ +/* $OpenBSD: if_le.c,v 1.16 1999/02/28 19:12:34 jason Exp $ */ /* $NetBSD: if_le.c,v 1.50 1997/09/09 20:54:48 pk Exp $ */ /*- @@ -394,11 +394,13 @@ lematch(parent, vcf, aux) if (strcmp(cf->cf_driver->cd_name, ra->ra_name)) return (0); +#if defined(SUN4C) || defined(SUN4M) if (ca->ca_bustype == BUS_SBUS) { if (!sbus_testdma((struct sbus_softc *)parent, ca)) return (0); return (1); } +#endif return (probeget(ra->ra_vaddr, 2) != -1); } |