diff options
| author | Thierry Deval <tdeval@cvs.openbsd.org> | 2003-01-13 07:16:21 +0000 |
|---|---|---|
| committer | Thierry Deval <tdeval@cvs.openbsd.org> | 2003-01-13 07:16:21 +0000 |
| commit | f93879fb9148de772a45cc085a526fe1e2c38fe8 (patch) | |
| tree | 16511f6780225ca1ff1b4d7c4df127aeaa76adb5 /sys | |
| parent | 83553609eab80c8ec90956fd0616364c6ee1e043 (diff) | |
Fix pastos. Reported by andres at msu dot edu.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/ieee1394/fwohci.c | 24 | ||||
| -rw-r--r-- | sys/dev/ieee1394/fwscsi.c | 5 |
2 files changed, 12 insertions, 17 deletions
diff --git a/sys/dev/ieee1394/fwohci.c b/sys/dev/ieee1394/fwohci.c index 7f16c427844..092c419caef 100644 --- a/sys/dev/ieee1394/fwohci.c +++ b/sys/dev/ieee1394/fwohci.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fwohci.c,v 1.11 2003/01/12 12:05:04 tdeval Exp $ */ +/* $OpenBSD: fwohci.c,v 1.12 2003/01/13 07:16:20 tdeval Exp $ */ /* $NetBSD: fwohci.c,v 1.54 2002/03/29 05:06:42 jmc Exp $ */ /* @@ -3454,24 +3454,20 @@ fwohci_if_input(struct fwohci_softc *sc, void *arg, struct fwohci_pkt *pkt) struct iovec *iov; void (*handler)(struct device *, struct mbuf *) = arg; -#if defined(FWOHCI_DEBUG) && !defined(SMALL_KERNEL) +#ifdef FWOHCI_DEBUG int i; - DPRINTF(DBG_LOG|DBG_TIME|DBG_FUNC|DBG_L_V1, - ("tcode=0x%x, dlen=%d", pkt->fp_tcode, pkt->fp_dlen)); - for (i = 0; (DBG_FLAGS_VAR(fwohci) & DBG_L_BUFFER) && - i < pkt->fp_hlen/4; i++) - DPRINTF(DBG_LOG|DBG_NOLF|DBG_L_BUFFER, - ("%s %08x", i?"":" ", pkt->fp_hdr[i])); - DPRINTF(DBG_LOG|DBG_L_BUFFER, (" $")); + DPRINTFN(1, ("tcode=0x%x, dlen=%d\n", pkt->fp_tcode, pkt->fp_dlen)); + for (i = 0; fwohcidebug > 5 && i < pkt->fp_hlen/4; i++) + DPRINTFN(5, ("%s %08x", i?"":" ", pkt->fp_hdr[i])); + DPRINTFN(5, (" $\n")); if (pkt->fp_dlen) { for (n = 0, len = pkt->fp_dlen; len > 0; len -= i, n++){ iov = &pkt->fp_iov[n]; - for (i = 0; (DBG_FLAGS_VAR(fwohci) & DBG_L_BUFFER) && - i < iov->iov_len; i++) - DPRINTF(DBG_LOG|DBG_NOLF|DBG_L_BUFFER, - ("%s%02x", i&31?i&3?"":" ":i?"\n ":" ", + for (i = 0; fwohcidebug > 5 && i < iov->iov_len; i++) + DPRINTFN(5, ("%s%02x", + i&31?i&3?"":" ":i?"\n ":" ", ((u_int8_t *)iov->iov_base)[i])); - DPRINTF(DBG_LOG|DBG_L_BUFFER, (" $")); + DPRINTFN(5, (" $\n")); } } #endif /* FWOHCI_DEBUG */ diff --git a/sys/dev/ieee1394/fwscsi.c b/sys/dev/ieee1394/fwscsi.c index ee14bb08f0c..f8e5d2b0988 100644 --- a/sys/dev/ieee1394/fwscsi.c +++ b/sys/dev/ieee1394/fwscsi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fwscsi.c,v 1.10 2003/01/13 01:55:46 tdeval Exp $ */ +/* $OpenBSD: fwscsi.c,v 1.11 2003/01/13 07:16:20 tdeval Exp $ */ /* * Copyright (c) 2002 Thierry Deval. All rights reserved. @@ -435,8 +435,7 @@ fwscsi_detach(struct device *self, int flags) rv = 0; if (sc->sc_bus) { - DPRINTF(("%s: detach %s\n", __func__, - sc->sc_bus->dv_xname)); + DPRINTF(("%s: detach %s\n", __func__, dev->dv_xname)); s = splbio(); rv += config_detach(dev, flags); splx(s); |