diff options
| -rw-r--r-- | sys/arch/hp300/dev/ct.c | 15 | ||||
| -rw-r--r-- | sys/arch/hp300/dev/mt.c | 15 |
2 files changed, 8 insertions, 22 deletions
diff --git a/sys/arch/hp300/dev/ct.c b/sys/arch/hp300/dev/ct.c index 4e1b4b1bfcf..d7cef2e372e 100644 --- a/sys/arch/hp300/dev/ct.c +++ b/sys/arch/hp300/dev/ct.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ct.c,v 1.14 2005/11/18 00:16:48 miod Exp $ */ +/* $OpenBSD: ct.c,v 1.15 2005/12/27 18:34:58 miod Exp $ */ /* $NetBSD: ct.c,v 1.21 1997/04/02 22:37:23 scottr Exp $ */ /* @@ -55,7 +55,6 @@ #include <sys/ioctl.h> #include <sys/mtio.h> #include <sys/proc.h> -#include <sys/tprintf.h> #include <hp300/dev/hpibvar.h> @@ -86,7 +85,6 @@ struct ct_softc { char *sc_addr; int sc_flags; short sc_type; - tpr_t sc_tpr; struct hpibqueue sc_hq; /* entry on hpib job queue */ int sc_eofp; int sc_eofs[EOFS]; @@ -357,7 +355,6 @@ ctopen(dev, flag, type, p) if (cc != sizeof(stat)) return(EBUSY); - sc->sc_tpr = tprintf_open(p); sc->sc_flags |= CTF_OPEN; return(0); } @@ -389,7 +386,6 @@ ctclose(dev, flag, fmt, p) if ((minor(dev) & CT_NOREW) == 0) ctcommand(dev, MTREW, 1); sc->sc_flags &= ~(CTF_OPEN | CTF_WRT | CTF_WRTTN); - tprintf_close(sc->sc_tpr); #ifdef DEBUG if (ctdebug & CDB_FILES) printf("ctclose: flags %x\n", sc->sc_flags); @@ -760,16 +756,13 @@ ctintr(arg) } if (sc->sc_stat.c_aef & 0x5800) { if (sc->sc_stat.c_aef & 0x4000) - tprintf(sc->sc_tpr, - "%s: uninitialized media\n", + printf("%s: uninitialized media\n", sc->sc_dev.dv_xname); if (sc->sc_stat.c_aef & 0x1000) - tprintf(sc->sc_tpr, - "%s: not ready\n", + printf("%s: not ready\n", sc->sc_dev.dv_xname); if (sc->sc_stat.c_aef & 0x0800) - tprintf(sc->sc_tpr, - "%s: write protect\n", + printf("%s: write protect\n", sc->sc_dev.dv_xname); } else { printf("%s err: v%d u%d ru%d bn%ld, ", diff --git a/sys/arch/hp300/dev/mt.c b/sys/arch/hp300/dev/mt.c index 34a614e9678..de75b87a6bb 100644 --- a/sys/arch/hp300/dev/mt.c +++ b/sys/arch/hp300/dev/mt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mt.c,v 1.15 2005/11/18 00:16:48 miod Exp $ */ +/* $OpenBSD: mt.c,v 1.16 2005/12/27 18:34:58 miod Exp $ */ /* $NetBSD: mt.c,v 1.8 1997/03/31 07:37:29 scottr Exp $ */ /* @@ -43,7 +43,6 @@ #include <sys/syslog.h> #include <sys/tty.h> #include <sys/kernel.h> -#include <sys/tprintf.h> #include <sys/device.h> #include <sys/conf.h> @@ -75,7 +74,6 @@ struct mt_softc { short sc_density; /* current density of tape (mtio.h format) */ short sc_type; /* tape drive model (hardware IDs) */ struct hpibqueue sc_hq; /* HPIB device queue member */ - tpr_t sc_ttyp; struct buf sc_tab; /* buf queue */ struct buf sc_bufstore; /* XXX buffer storage */ struct timeout sc_start_to; /* spl_mtstart timeout */ @@ -290,7 +288,6 @@ mtopen(dev, flag, mode, p) if (sc->sc_flags & MTF_OPEN) return (EBUSY); sc->sc_flags |= MTF_OPEN; - sc->sc_ttyp = tprintf_open(p); if ((sc->sc_flags & MTF_ALIVE) == 0) { error = mtcommand(dev, MTRESET, 0); if (error != 0 || (sc->sc_flags & MTF_ALIVE) == 0) @@ -390,7 +387,6 @@ mtclose(dev, flag, fmt, p) if ((minor(dev) & T_NOREWIND) == 0) (void) mtcommand(dev, MTREW, 0); sc->sc_flags &= ~MTF_OPEN; - tprintf_close(sc->sc_ttyp); return (0); } @@ -446,8 +442,7 @@ mtstrategy(bp) #define WRITE_BITS_IGNORED 8 #if 0 if (bp->b_bcount & ((1 << WRITE_BITS_IGNORED) - 1)) { - tprintf(sc->sc_ttyp, - "%s: write record must be multiple of %d\n", + printf("%s: write record must be multiple of %d\n", sc->sc_dev.dv_xname, 1 << WRITE_BITS_IGNORED); goto error; } @@ -466,8 +461,7 @@ mtstrategy(bp) } } if (bp->b_bcount > s) { - tprintf(sc->sc_ttyp, - "%s: write record (%ld) too big: limit (%d)\n", + printf("%s: write record (%ld) too big: limit (%d)\n", sc->sc_dev.dv_xname, bp->b_bcount, s); #if 0 /* XXX see above */ error: @@ -891,8 +885,7 @@ mtintr(arg) dlog(LOG_DEBUG, "%s intr: bcount %ld, resid %d", sc->sc_dev.dv_xname, bp->b_bcount, bp->b_resid); } else { - tprintf(sc->sc_ttyp, - "%s: record (%d) larger than wanted (%ld)\n", + printf("%s: record (%d) larger than wanted (%ld)\n", sc->sc_dev.dv_xname, i, bp->b_bcount); error: sc->sc_flags &= ~MTF_IO; |