From: deraadt Date: Tue, 28 Jan 1997 10:53:41 +0000 (+0000) Subject: use scsiprint X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=cbb472f8d2cf7bc590ba181836f22ff7f9687a12;p=openbsd use scsiprint --- diff --git a/sys/arch/mvme68k/dev/siopdma.c b/sys/arch/mvme68k/dev/siopdma.c index f5df9bf4036..452d522de76 100644 --- a/sys/arch/mvme68k/dev/siopdma.c +++ b/sys/arch/mvme68k/dev/siopdma.c @@ -1,4 +1,4 @@ -/* $OpenBSD: siopdma.c,v 1.5 1996/11/23 21:46:01 kstailey Exp $ */ +/* $OpenBSD: siopdma.c,v 1.6 1997/01/28 10:53:41 deraadt Exp $ */ /* * Copyright (c) 1995 Theo de Raadt @@ -60,7 +60,6 @@ int afscmatch __P((struct device *, void *, void *)); void afscattach __P((struct device *, struct device *, void *)); -int afscprint __P((void *auxp, const char *)); int siopintr __P((struct siop_softc *)); int afsc_dmaintr __P((struct siop_softc *)); @@ -177,24 +176,11 @@ afscattach(parent, self, auxp) tmp = bootpart; if (ca->ca_paddr != bootaddr) bootpart = -1; /* invalid flag to dk_establish */ - config_found(self, &sc->sc_link, afscprint); + config_found(self, &sc->sc_link, scsiprint); bootpart = tmp; /* restore old value */ } -/* - * print diag if pnp is NULL else just extra - */ -int -afscprint(auxp, pnp) - void *auxp; - const char *pnp; -{ - if (pnp == NULL) - return (UNCONF); - return (QUIET); -} - int afsc_dmaintr(sc) struct siop_softc *sc; diff --git a/sys/arch/mvme68k/dev/wdsc.c b/sys/arch/mvme68k/dev/wdsc.c index 936262e871e..ed207c95e40 100644 --- a/sys/arch/mvme68k/dev/wdsc.c +++ b/sys/arch/mvme68k/dev/wdsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wdsc.c,v 1.4 1996/11/23 21:46:02 kstailey Exp $ */ +/* $OpenBSD: wdsc.c,v 1.5 1997/01/28 10:54:10 deraadt Exp $ */ /* * Copyright (c) 1996 Steve Woodford @@ -48,7 +48,6 @@ #include #include -int wdscprint __P((void *auxp, const char *)); void wdscattach __P((struct device *, struct device *, void *)); int wdscmatch __P((struct device *, struct cfdata *, void *)); @@ -180,24 +179,10 @@ wdscattach(pdp, dp, auxp) tmp = bootpart; if (ca->ca_paddr != bootaddr) bootpart = -1; /* invalid flag to dk_establish */ - config_found(dp, &sc->sc_link, wdscprint); + config_found(dp, &sc->sc_link, scsiprint); bootpart = tmp; /* restore old value */ } -/* - * print diag if pnp is NULL else just extra - */ -int -wdscprint(auxp, pnp) - void *auxp; - const char *pnp; -{ - if (pnp == NULL) - return(UNCONF); - return(QUIET); -} - - /* * Enable DMA interrupts */