Delete wt code files. The end of wt(4).

2 files changed, 0 insertions, 1209 deletions

diff --git a/sys/dev/isa/wt.c b/sys/dev/isa/wt.c
deleted file mode 100644
index 305f982d7fd..00000000000
--- a/sys/dev/isa/wt.c
+++ /dev/null
@@ -1,1083 +0,0 @@
-/*	$OpenBSD: wt.c,v 1.17 2006/06/01 05:42:01 krw Exp $	*/
-/*	$NetBSD: wt.c,v 1.33 1996/05/12 23:54:22 mycroft Exp $	*/
-
-/*
- * Streamer tape driver.
- * Supports Archive and Wangtek compatible QIC-02/QIC-36 boards.
- *
- * Copyright (C) 1993 by:
- *	Sergey Ryzhkov <sir@kiae.su>
- *	Serge Vakulenko <vak@zebub.msk.su>
- *
- * This software is distributed with NO WARRANTIES, not even the implied
- * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Authors grant any other persons or organisations permission to use
- * or modify this software as long as this message is kept with the software,
- * all derivative works or modified versions.
- *
- * This driver is derived from the old 386bsd Wangtek streamer tape driver,
- * made by Robert Baron at CMU, based on Intel sources.
- */
-
-/*
- * Copyright (c) 1989 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Robert Baron
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-/*
- *  Copyright 1988, 1989 by Intel Corporation
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/buf.h>
-#include <sys/fcntl.h>
-#include <sys/malloc.h>
-#include <sys/ioctl.h>
-#include <sys/mtio.h>
-#include <sys/device.h>
-#include <sys/proc.h>
-#include <sys/conf.h>
-#include <sys/timeout.h>
-
-#include <uvm/uvm_param.h>
-
-#include <machine/intr.h>
-#include <machine/pio.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/isa/isadmavar.h>
-#include <dev/isa/wtreg.h>
-
-/*
- * Uncomment this to enable internal device tracing.
- */
-#define WTDBPRINT(x)		/* printf x */
-
-#define WTPRI			(PZERO+10)	/* sleep priority */
-
-/*
- * Wangtek controller ports
- */
-#define WT_CTLPORT(base)	((base)+0)	/* control, write only */
-#define WT_STATPORT(base)	((base)+0)	/* status, read only */
-#define WT_CMDPORT(base)	((base)+1)	/* command, write only */
-#define WT_DATAPORT(base)	((base)+1)	/* data, read only */
-#define WT_NPORT		2		/* 2 i/o ports */
-
-/* status port bits */
-#define WT_BUSY			0x01		/* not ready bit define */
-#define WT_NOEXCEP		0x02		/* no exception bit define */
-#define WT_RESETMASK		0x07		/* to check after reset */
-#define WT_RESETVAL		0x05		/* state after reset */
-
-/* control port bits */
-#define WT_ONLINE		0x01		/* device selected */
-#define WT_RESET		0x02		/* reset command */
-#define WT_REQUEST		0x04		/* request command */
-#define WT_IEN			0x08		/* enable dma */
-
-/*
- * Archive controller ports
- */
-#define AV_DATAPORT(base)	((base)+0)	/* data, read only */
-#define AV_CMDPORT(base)	((base)+0)	/* command, write only */
-#define AV_STATPORT(base)	((base)+1)	/* status, read only */
-#define AV_CTLPORT(base)	((base)+1)	/* control, write only */
-#define AV_SDMAPORT(base)	((base)+2)	/* start dma */
-#define AV_RDMAPORT(base)	((base)+3)	/* reset dma */
-#define AV_NPORT		4		/* 4 i/o ports */
-
-/* status port bits */
-#define AV_BUSY			0x40		/* not ready bit define */
-#define AV_NOEXCEP		0x20		/* no exception bit define */
-#define AV_RESETMASK		0xf8		/* to check after reset */
-#define AV_RESETVAL		0x50		/* state after reset */
-
-/* control port bits */
-#define AV_RESET		0x80		/* reset command */
-#define AV_REQUEST		0x40		/* request command */
-#define AV_IEN			0x20		/* enable interrupts */
-
-enum wttype {
-	UNKNOWN = 0,	/* unknown type, driver disabled */
-	ARCHIVE,	/* Archive Viper SC499, SC402 etc */
-	WANGTEK,	/* Wangtek */
-};
-
-struct wt_softc {
-	struct device sc_dev;
-	void *sc_ih;
-	struct timeout sc_tmo;
-
-	enum wttype type;	/* type of controller */
-	int sc_iobase;		/* base i/o port */
-	int chan;		/* dma channel number, 1..3 */
-	int flags;		/* state of tape drive */
-	unsigned dens;		/* tape density */
-	int bsize;		/* tape block size */
-	void *buf;		/* internal i/o buffer */
-
-	void *dmavaddr;		/* virtual address of dma i/o buffer */
-	size_t dmatotal;	/* size of i/o buffer */
-	int dmaflags;		/* i/o direction */
-	size_t dmacount;	/* resulting length of dma i/o */
-
-	u_short error;		/* code for error encountered */
-	u_short ercnt;		/* number of error blocks */
-	u_short urcnt;		/* number of underruns */
-
-	int DATAPORT, CMDPORT, STATPORT, CTLPORT, SDMAPORT, RDMAPORT;
-	u_char BUSY, NOEXCEP, RESETMASK, RESETVAL, ONLINE, RESET, REQUEST, IEN;
-};
-
-/* XXX: These don't belong here really */
-cdev_decl(wt);
-bdev_decl(wt);
-
-int wtwait(struct wt_softc *sc, int catch, char *msg);
-int wtcmd(struct wt_softc *sc, int cmd);
-int wtstart(struct wt_softc *sc, int flag, void *vaddr, size_t len);
-void wtdma(struct wt_softc *sc);
-void wttimer(void *arg);
-void wtclock(struct wt_softc *sc);
-int wtreset(struct wt_softc *sc);
-int wtsense(struct wt_softc *sc, int verbose, int ignore);
-int wtstatus(struct wt_softc *sc);
-void wtrewind(struct wt_softc *sc);
-int wtreadfm(struct wt_softc *sc);
-int wtwritefm(struct wt_softc *sc);
-u_char wtpoll(struct wt_softc *sc, int mask, int bits);
-
-int wtprobe(struct device *, void *, void *);
-void wtattach(struct device *, struct device *, void *);
-int wtintr(void *sc);
-
-struct cfattach wt_ca = {
-	sizeof(struct wt_softc), wtprobe, wtattach
-};
-
-struct cfdriver wt_cd = {
-	NULL, "wt", DV_TAPE
-};
-
-/*
- * Probe for the presence of the device.
- */
-int
-wtprobe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
-{
-	struct wt_softc *sc = match;
-	struct isa_attach_args *ia = aux;
-	int iobase;
-
-	sc->chan = ia->ia_drq;
-	sc->sc_iobase = iobase = ia->ia_iobase;
-	if (sc->chan < 1 || sc->chan > 3) {
-		printf("%s: Bad drq=%d, should be 1..3\n", sc->sc_dev.dv_xname,
-		    sc->chan);
-		return 0;
-	}
-
-	/* Try Wangtek. */
-	sc->type = WANGTEK;
-	sc->CTLPORT = WT_CTLPORT(iobase);
-	sc->STATPORT = WT_STATPORT(iobase);
-	sc->CMDPORT = WT_CMDPORT(iobase);
-	sc->DATAPORT = WT_DATAPORT(iobase);
-	sc->SDMAPORT = sc->RDMAPORT = 0;
-	sc->BUSY = WT_BUSY;		sc->NOEXCEP = WT_NOEXCEP;
-	sc->RESETMASK = WT_RESETMASK;	sc->RESETVAL = WT_RESETVAL;
-	sc->ONLINE = WT_ONLINE;		sc->RESET = WT_RESET;
-	sc->REQUEST = WT_REQUEST;	sc->IEN = WT_IEN;
-	if (wtreset(sc)) {
-		ia->ia_iosize = WT_NPORT;
-		return 1;
-	}
-
-	/* Try Archive. */
-	sc->type = ARCHIVE;
-	sc->CTLPORT = AV_CTLPORT(iobase);
-	sc->STATPORT = AV_STATPORT(iobase);
-	sc->CMDPORT = AV_CMDPORT(iobase);
-	sc->DATAPORT = AV_DATAPORT(iobase);
-	sc->SDMAPORT = AV_SDMAPORT(iobase);
-	sc->RDMAPORT = AV_RDMAPORT(iobase);
-	sc->BUSY = AV_BUSY;		sc->NOEXCEP = AV_NOEXCEP;
-	sc->RESETMASK = AV_RESETMASK;	sc->RESETVAL = AV_RESETVAL;
-	sc->ONLINE = 0;			sc->RESET = AV_RESET;
-	sc->REQUEST = AV_REQUEST;	sc->IEN = AV_IEN;
-	if (wtreset(sc)) {
-		ia->ia_iosize = AV_NPORT;
-		return 1;
-	}
-
-	/* Tape controller not found. */
-	sc->type = UNKNOWN;
-	return 0;
-}
-
-/*
- * Device is found, configure it.
- */
-void
-wtattach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
-{
-	struct wt_softc *sc = (void *)self;
-	struct isa_attach_args *ia = aux;
-
-	if (sc->type == ARCHIVE) {
-		printf(": type <Archive>\n");
-		/* Reset DMA. */
-		outb(sc->RDMAPORT, 0);
-	} else
-		printf(": type <Wangtek>\n");
-	sc->flags = TPSTART;		/* tape is rewound */
-	sc->dens = -1;			/* unknown density */
-
-	timeout_set(&sc->sc_tmo, wttimer, sc);
-	sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
-	    IPL_BIO, wtintr, sc, sc->sc_dev.dv_xname);
-}
-
-int
-wtdump(dev, blkno, va, size)
-	dev_t dev;
-	daddr_t blkno;
-	caddr_t va;
-	size_t size;
-{
-
-	/* Not implemented. */
-	return ENXIO;
-}
-
-int
-wtsize(dev)
-	dev_t dev;
-{
-
-	/* Not implemented. */
-	return -1;
-}
-
-/*
- * Open routine, called on every device open.
- */
-int
-wtopen(dev, flag, mode, p)
-	dev_t dev;
-	int flag;
-	int mode;
-	struct proc *p;
-{
-	int unit = minor(dev) & T_UNIT;
-	struct wt_softc *sc;
-	int error;
-
-	if (unit >= wt_cd.cd_ndevs)
-		return ENXIO;
-	sc = wt_cd.cd_devs[unit];
-	if (!sc)
-		return ENXIO;
-
-	/* Check that device is not in use */
-	if (sc->flags & TPINUSE)
-		return EBUSY;
-
-	/* If the tape is in rewound state, check the status and set density. */
-	if (sc->flags & TPSTART) {
-		/* If rewind is going on, wait */
-		if ((error = wtwait(sc, PCATCH, "wtrew")) != 0)
-			return error;
-
-		/* Check the controller status */
-		if (!wtsense(sc, 0, (flag & FWRITE) ? 0 : TP_WRP)) {
-			/* Bad status, reset the controller. */
-			if (!wtreset(sc))
-				return EIO;
-			if (!wtsense(sc, 1, (flag & FWRITE) ? 0 : TP_WRP))
-				return EIO;
-		}
-
-		/* Set up tape density. */
-		if (sc->dens != (minor(dev) & WT_DENSEL)) {
-			int d = 0;
-
-			switch (minor(dev) & WT_DENSEL) {
-			case WT_DENSDFLT:
-			default:
-				break;			/* default density */
-			case WT_QIC11:
-				d = QIC_FMT11;  break;	/* minor 010 */
-			case WT_QIC24:
-				d = QIC_FMT24;  break;	/* minor 020 */
-			case WT_QIC120:
-				d = QIC_FMT120; break;	/* minor 030 */
-			case WT_QIC150:
-				d = QIC_FMT150; break;	/* minor 040 */
-			case WT_QIC300:
-				d = QIC_FMT300; break;	/* minor 050 */
-			case WT_QIC600:
-				d = QIC_FMT600; break;	/* minor 060 */
-			}
-			if (d) {
-				/* Change tape density. */
-				if (!wtcmd(sc, d))
-					return EIO;
-				if (!wtsense(sc, 1, TP_WRP | TP_ILL))
-					return EIO;
-
-				/* Check the status of the controller. */
-				if (sc->error & TP_ILL) {
-					printf("%s: invalid tape density\n",
-					    sc->sc_dev.dv_xname);
-					return ENODEV;
-				}
-			}
-			sc->dens = minor(dev) & WT_DENSEL;
-		}
-		sc->flags &= ~TPSTART;
-	} else if (sc->dens != (minor(dev) & WT_DENSEL))
-		return ENXIO;
-
-	sc->bsize = (minor(dev) & WT_BSIZE) ? 1024 : 512;
-	sc->buf = malloc(sc->bsize, M_TEMP, M_WAITOK);
-
-	sc->flags = TPINUSE;
-	if (flag & FREAD)
-		sc->flags |= TPREAD;
-	if (flag & FWRITE)
-		sc->flags |= TPWRITE;
-	return 0;
-}
-
-/*
- * Close routine, called on last device close.
- */
-int
-wtclose(dev, flags, mode, p)
-	dev_t dev;
-	int flags;
-	int mode;
-	struct proc *p;
-{
-	int unit = minor(dev) & T_UNIT;
-	struct wt_softc *sc = wt_cd.cd_devs[unit];
-
-	/* If rewind is pending, do nothing */
-	if (sc->flags & TPREW)
-		goto done;
-
-	/* If seek forward is pending and no rewind on close, do nothing */
-	if (sc->flags & TPRMARK) {
-		if (minor(dev) & T_NOREWIND)
-			goto done;
-
-		/* If read file mark is going on, wait */
-		wtwait(sc, 0, "wtrfm");
-	}
-
-	if (sc->flags & TPWANY) {
-		/* Tape was written.  Write file mark. */
-		wtwritefm(sc);
-	}
-
-	if ((minor(dev) & T_NOREWIND) == 0) {
-		/* Rewind to beginning of tape. */
-		/* Don't wait until rewind, though. */
-		wtrewind(sc);
-		goto done;
-	}
-	if ((sc->flags & TPRANY) && (sc->flags & (TPVOL | TPWANY)) == 0) {
-		/* Space forward to after next file mark if no writing done. */
-		/* Don't wait for completion. */
-		wtreadfm(sc);
-	}
-
-done:
-	sc->flags &= TPREW | TPRMARK | TPSTART | TPTIMER;
-	free(sc->buf, M_TEMP);
-	return 0;
-}
-
-/*
- * Ioctl routine.  Compatible with BSD ioctls.
- * Direct QIC-02 commands ERASE and RETENSION added.
- * There are three possible ioctls:
- * ioctl(int fd, MTIOCGET, struct mtget *buf)	-- get status
- * ioctl(int fd, MTIOCTOP, struct mtop *buf)	-- do BSD-like op
- * ioctl(int fd, WTQICMD, int qicop)		-- do QIC op
- */
-int
-wtioctl(dev, cmd, addr, flag, p)
-	dev_t dev;
-	u_long cmd;
-	caddr_t addr;
-	int flag;
-	struct proc *p;
-{
-	int unit = minor(dev) & T_UNIT;
-	struct wt_softc *sc = wt_cd.cd_devs[unit];
-	int error, count, op;
-
-	switch (cmd) {
-	default:
-		return EINVAL;
-	case WTQICMD:	/* direct QIC command */
-		op = *(int *)addr;
-		switch (op) {
-		default:
-			return EINVAL;
-		case QIC_ERASE:		/* erase the whole tape */
-			if ((sc->flags & TPWRITE) == 0 || (sc->flags & TPWP))
-				return EACCES;
-			if ((error = wtwait(sc, PCATCH, "wterase")) != 0)
-				return error;
-			break;
-		case QIC_RETENS:	/* retension the tape */
-			if ((error = wtwait(sc, PCATCH, "wtretens")) != 0)
-				return error;
-			break;
-		}
-		/* Both ERASE and RETENS operations work like REWIND. */
-		/* Simulate the rewind operation here. */
-		sc->flags &= ~(TPRO | TPWO | TPVOL);
-		if (!wtcmd(sc, op))
-			return EIO;
-		sc->flags |= TPSTART | TPREW;
-		if (op == QIC_ERASE)
-			sc->flags |= TPWANY;
-		wtclock(sc);
-		return 0;
-	case MTIOCIEOT:	/* ignore EOT errors */
-	case MTIOCEEOT:	/* enable EOT errors */
-		return 0;
-	case MTIOCGET:
-		((struct mtget*)addr)->mt_type =
-			sc->type == ARCHIVE ? MT_ISVIPER1 : 0x11;
-		((struct mtget*)addr)->mt_dsreg = sc->flags;	/* status */
-		((struct mtget*)addr)->mt_erreg = sc->error;	/* errors */
-		((struct mtget*)addr)->mt_resid = 0;
-		((struct mtget*)addr)->mt_density = sc->dens;	/* density */
-		return 0;
-	case MTIOCTOP:
-		break;
-	}
-
-	switch ((short)((struct mtop*)addr)->mt_op) {
-	default:
-#if 0
-	case MTFSR:	/* forward space record */
-	case MTBSR:	/* backward space record */
-	case MTBSF:	/* backward space file */
-#endif
-		return EINVAL;
-	case MTNOP:	/* no operation, sets status only */
-	case MTCACHE:	/* enable controller cache */
-	case MTNOCACHE:	/* disable controller cache */
-		return 0;
-	case MTREW:	/* rewind */
-	case MTOFFL:	/* rewind and put the drive offline */
-		if (sc->flags & TPREW)   /* rewind is running */
-			return 0;
-		if ((error = wtwait(sc, PCATCH, "wtorew")) != 0)
-			return error;
-		wtrewind(sc);
-		return 0;
-	case MTFSF:	/* forward space file */
-		for (count = ((struct mtop*)addr)->mt_count; count > 0;
-		    --count) {
-			if ((error = wtwait(sc, PCATCH, "wtorfm")) != 0)
-				return error;
-			if ((error = wtreadfm(sc)) != 0)
-				return error;
-		}
-		return 0;
-	case MTWEOF:	/* write an end-of-file record */
-		if ((sc->flags & TPWRITE) == 0 || (sc->flags & TPWP))
-			return EACCES;
-		if ((error = wtwait(sc, PCATCH, "wtowfm")) != 0)
-			return error;
-		if ((error = wtwritefm(sc)) != 0)
-			return error;
-		return 0;
-	}
-
-#ifdef DIAGNOSTIC
-	panic("wtioctl: impossible");
-#endif
-}
-
-/*
- * Strategy routine.
- */
-void
-wtstrategy(bp)
-	struct buf *bp;
-{
-	int unit = minor(bp->b_dev) & T_UNIT;
-	struct wt_softc *sc = wt_cd.cd_devs[unit];
-	int s;
-
-	bp->b_resid = bp->b_bcount;
-
-	/* at file marks and end of tape, we just return '0 bytes available' */
-	if (sc->flags & TPVOL)
-		goto xit;
-
-	if (bp->b_flags & B_READ) {
-		/* Check read access and no previous write to this tape. */
-		if ((sc->flags & TPREAD) == 0 || (sc->flags & TPWANY))
-			goto errxit;
-
-		/* For now, we assume that all data will be copied out */
-		/* If read command outstanding, just skip down */
-		if ((sc->flags & TPRO) == 0) {
-			if (!wtsense(sc, 1, TP_WRP)) {
-				/* Clear status. */
-				goto errxit;
-			}
-			if (!wtcmd(sc, QIC_RDDATA)) {
-				/* Set read mode. */
-				wtsense(sc, 1, TP_WRP);
-				goto errxit;
-			}
-			sc->flags |= TPRO | TPRANY;
-		}
-	} else {
-		/* Check write access and write protection. */
-		/* No previous read from this tape allowed. */
-		if ((sc->flags & TPWRITE) == 0 || (sc->flags & (TPWP | TPRANY)))
-			goto errxit;
-
-		/* If write command outstanding, just skip down */
-		if ((sc->flags & TPWO) == 0) {
-			if (!wtsense(sc, 1, 0)) {
-				/* Clear status. */
-				goto errxit;
-			}
-			if (!wtcmd(sc, QIC_WRTDATA)) {
-				/* Set write mode. */
-				wtsense(sc, 1, 0);
-				goto errxit;
-			}
-			sc->flags |= TPWO | TPWANY;
-		}
-	}
-
-	if (bp->b_bcount == 0)
-		goto xit;
-
-	sc->flags &= ~TPEXCEP;
-	s = splbio();
-	if (wtstart(sc, bp->b_flags, bp->b_data, bp->b_bcount)) {
-		wtwait(sc, 0, (bp->b_flags & B_READ) ? "wtread" : "wtwrite");
-		bp->b_resid -= sc->dmacount;
-	}
-	splx(s);
-
-	if (sc->flags & TPEXCEP) {
-errxit:
-		bp->b_flags |= B_ERROR;
-		bp->b_error = EIO;
-	}
-xit:
-	s = splbio();
-	biodone(bp);
-	splx(s);
-	return;
-}
-
-int
-wtread(dev, uio, flags)
-	dev_t dev;
-	struct uio *uio;
-	int flags;
-{
-
-	return (physio(wtstrategy, NULL, dev, B_READ, minphys, uio));
-}
-
-int
-wtwrite(dev, uio, flags)
-	dev_t dev;
-	struct uio *uio;
-	int flags;
-{
-
-	return (physio(wtstrategy, NULL, dev, B_WRITE, minphys, uio));
-}
-
-/*
- * Interrupt routine.
- */
-int
-wtintr(arg)
-	void *arg;
-{
-	struct wt_softc *sc = arg;
-	u_char x;
-
-	x = inb(sc->STATPORT);			/* get status */
-	WTDBPRINT(("wtintr() status=0x%x -- ", x));
-	if ((x & (sc->BUSY | sc->NOEXCEP)) == (sc->BUSY | sc->NOEXCEP)) {
-		WTDBPRINT(("busy\n"));
-		return 0;			/* device is busy */
-	}
-
-	/*
-	 * Check if rewind finished.
-	 */
-	if (sc->flags & TPREW) {
-		WTDBPRINT(((x & (sc->BUSY | sc->NOEXCEP)) == (sc->BUSY | sc->NOEXCEP) ?
-		    "rewind busy?\n" : "rewind finished\n"));
-		sc->flags &= ~TPREW;		/* rewind finished */
-		wtsense(sc, 1, TP_WRP);
-		wakeup((caddr_t)sc);
-		return 1;
-	}
-
-	/*
-	 * Check if writing/reading of file mark finished.
-	 */
-	if (sc->flags & (TPRMARK | TPWMARK)) {
-		WTDBPRINT(((x & (sc->BUSY | sc->NOEXCEP)) == (sc->BUSY | sc->NOEXCEP) ?
-		    "marker r/w busy?\n" : "marker r/w finished\n"));
-		if ((x & sc->NOEXCEP) == 0)	/* operation failed */
-			wtsense(sc, 1, (sc->flags & TPRMARK) ? TP_WRP : 0);
-		sc->flags &= ~(TPRMARK | TPWMARK); /* operation finished */
-		wakeup((caddr_t)sc);
-		return 1;
-	}
-
-	/*
-	 * Do we started any i/o?  If no, just return.
-	 */
-	if ((sc->flags & TPACTIVE) == 0) {
-		WTDBPRINT(("unexpected interrupt\n"));
-		return 0;
-	}
-	sc->flags &= ~TPACTIVE;
-	sc->dmacount += sc->bsize;		/* increment counter */
-
-	/*
-	 * Clean up dma.
-	 */
-	if ((sc->dmaflags & DMAMODE_READ) &&
-	    (sc->dmatotal - sc->dmacount) < sc->bsize) {
-		/* If reading short block, copy the internal buffer
-		 * to the user memory. */
-		isadma_done(sc->chan);
-		bcopy(sc->buf, sc->dmavaddr, sc->dmatotal - sc->dmacount);
-	} else
-		isadma_done(sc->chan);
-
-	/*
-	 * On exception, check for end of file and end of volume.
-	 */
-	if ((x & sc->NOEXCEP) == 0) {
-		WTDBPRINT(("i/o exception\n"));
-		wtsense(sc, 1, (sc->dmaflags & DMAMODE_READ) ? TP_WRP : 0);
-		if (sc->error & (TP_EOM | TP_FIL))
-			sc->flags |= TPVOL;	/* end of file */
-		else
-			sc->flags |= TPEXCEP;	/* i/o error */
-		wakeup((caddr_t)sc);
-		return 1;
-	}
-
-	if (sc->dmacount < sc->dmatotal) {
-		/* Continue I/O. */
-		sc->dmavaddr += sc->bsize;
-		wtdma(sc);
-		WTDBPRINT(("continue i/o, %d\n", sc->dmacount));
-		return 1;
-	}
-	if (sc->dmacount > sc->dmatotal)	/* short last block */
-		sc->dmacount = sc->dmatotal;
-	/* Wake up user level. */
-	timeout_del(&sc->sc_tmo);
-	wakeup((caddr_t)sc);
-	WTDBPRINT(("i/o finished, %d\n", sc->dmacount));
-	return 1;
-}
-
-/* start the rewind operation */
-void
-wtrewind(sc)
-	struct wt_softc *sc;
-{
-	int rwmode = sc->flags & (TPRO | TPWO);
-
-	sc->flags &= ~(TPRO | TPWO | TPVOL);
-	/*
-	 * Wangtek strictly follows QIC-02 standard:
-	 * clearing ONLINE in read/write modes causes rewind.
-	 * REWIND command is not allowed in read/write mode
-	 * and gives `illegal command' error.
-	 */
-	if (sc->type == WANGTEK && rwmode) {
-		outb(sc->CTLPORT, 0);
-	} else if (!wtcmd(sc, QIC_REWIND))
-		return;
-	sc->flags |= TPSTART | TPREW;
-	wtclock(sc);
-}
-
-/*
- * Start the `read marker' operation.
- */
-int
-wtreadfm(sc)
-	struct wt_softc *sc;
-{
-
-	sc->flags &= ~(TPRO | TPWO | TPVOL);
-	if (!wtcmd(sc, QIC_READFM)) {
-		wtsense(sc, 1, TP_WRP);
-		return EIO;
-	}
-	sc->flags |= TPRMARK | TPRANY;
-	wtclock(sc);
-	/* Don't wait for completion here. */
-	return 0;
-}
-
-/*
- * Write marker to the tape.
- */
-int
-wtwritefm(sc)
-	struct wt_softc *sc;
-{
-
-	tsleep((caddr_t)wtwritefm, WTPRI, "wtwfm", hz);
-	sc->flags &= ~(TPRO | TPWO);
-	if (!wtcmd(sc, QIC_WRITEFM)) {
-		wtsense(sc, 1, 0);
-		return EIO;
-	}
-	sc->flags |= TPWMARK | TPWANY;
-	wtclock(sc);
-	return wtwait(sc, 0, "wtwfm");
-}
-
-/*
- * While controller status & mask == bits continue waiting.
- */
-u_char
-wtpoll(sc, mask, bits)
-	struct wt_softc *sc;
-	int mask, bits;
-{
-	u_char x;
-	int i;
-
-	/* Poll status port, waiting for specified bits. */
-	for (i = 0; i < 1000; ++i) {	/* up to 1 msec */
-		x = inb(sc->STATPORT);
-		if ((x & mask) != bits)
-			return x;
-		delay(1);
-	}
-	for (i = 0; i < 100; ++i) {	/* up to 10 msec */
-		x = inb(sc->STATPORT);
-		if ((x & mask) != bits)
-			return x;
-		delay(100);
-	}
-	for (;;) {			/* forever */
-		x = inb(sc->STATPORT);
-		if ((x & mask) != bits)
-			return x;
-		tsleep((caddr_t)wtpoll, WTPRI, "wtpoll", 1);
-	}
-}
-
-/*
- * Execute QIC command.
- */
-int
-wtcmd(sc, cmd)
-	struct wt_softc *sc;
-	int cmd;
-{
-	u_char x;
-	int s;
-
-	WTDBPRINT(("wtcmd() cmd=0x%x\n", cmd));
-	s = splbio();
-	x = wtpoll(sc, sc->BUSY | sc->NOEXCEP, sc->BUSY | sc->NOEXCEP); /* ready? */
-	if ((x & sc->NOEXCEP) == 0) {			/* error */
-		splx(s);
-		return 0;
-	}
-	
-	outb(sc->CMDPORT, cmd);				/* output the command */
-
-	outb(sc->CTLPORT, sc->REQUEST | sc->ONLINE);	/* set request */
-	wtpoll(sc, sc->BUSY, sc->BUSY);			/* wait for ready */
-	outb(sc->CTLPORT, sc->IEN | sc->ONLINE);	/* reset request */
-	wtpoll(sc, sc->BUSY, 0);			/* wait for not ready */
-	splx(s);
-	return 1;
-}
-
-/* wait for the end of i/o, seeking marker or rewind operation */
-int
-wtwait(sc, catch, msg)
-	struct wt_softc *sc;
-	int catch;
-	char *msg;
-{
-	int error;
-
-	WTDBPRINT(("wtwait() `%s'\n", msg));
-	while (sc->flags & (TPACTIVE | TPREW | TPRMARK | TPWMARK))
-		if ((error = tsleep((caddr_t)sc, WTPRI | catch, msg, 0)) != 0)
-			return error;
-	return 0;
-}
-
-/* initialize dma for the i/o operation */
-void
-wtdma(sc)
-	struct wt_softc *sc;
-{
-
-	sc->flags |= TPACTIVE;
-	wtclock(sc);
-
-	if (sc->type == ARCHIVE) {
-		/* Set DMA. */
-		outb(sc->SDMAPORT, 0);
-	}
-
-	if ((sc->dmaflags & DMAMODE_READ) &&
-	    (sc->dmatotal - sc->dmacount) < sc->bsize) {
-		/* Reading short block; do it through the internal buffer. */
-		isadma_start(sc->buf, sc->bsize, sc->chan, sc->dmaflags);
-	} else
-		isadma_start(sc->dmavaddr, sc->bsize, sc->chan, sc->dmaflags);
-}
-
-/* start i/o operation */
-int
-wtstart(sc, flag, vaddr, len)
-	struct wt_softc *sc;
-	int flag;
-	void *vaddr;
-	size_t len;
-{
-	u_char x;
-
-	WTDBPRINT(("wtstart()\n"));
-	x = wtpoll(sc, sc->BUSY | sc->NOEXCEP, sc->BUSY | sc->NOEXCEP); /* ready? */
-	if ((x & sc->NOEXCEP) == 0) {
-		sc->flags |= TPEXCEP;	/* error */
-		return 0;
-	}
-	sc->flags &= ~TPEXCEP;		/* clear exception flag */
-	sc->dmavaddr = vaddr;
-	sc->dmatotal = len;
-	sc->dmacount = 0;
-	sc->dmaflags = flag & B_READ ? DMAMODE_READ : DMAMODE_WRITE;
-	wtdma(sc);
-	return 1;
-}
-
-/*
- * Start timer.
- */
-void
-wtclock(sc)
-	struct wt_softc *sc;
-{
-
-	if (sc->flags & TPTIMER)
-		return;
-	sc->flags |= TPTIMER;
-	/*
-	 * Some controllers seem to lose dma interrupts too often.  To make the
-	 * tape stream we need 1 tick timeout.
-	 */
-	timeout_add(&sc->sc_tmo, (sc->flags & TPACTIVE) ? 1 : hz);
-}
-
-/*
- * Simulate an interrupt periodically while i/o is going.
- * This is necessary in case interrupts get eaten due to
- * multiple devices on a single IRQ line.
- */
-void
-wttimer(arg)
-	void *arg;
-{
-	struct wt_softc *sc = (struct wt_softc *)arg;
-	int s;
-
-	sc->flags &= ~TPTIMER;
-	if ((sc->flags & (TPACTIVE | TPREW | TPRMARK | TPWMARK)) == 0)
-		return;
-
-	/* If i/o going, simulate interrupt. */
-	s = splbio();
-	if ((inb(sc->STATPORT) & (sc->BUSY | sc->NOEXCEP)) != (sc->BUSY | sc->NOEXCEP)) {
-		WTDBPRINT(("wttimer() -- "));
-		wtintr(sc);
-	}
-	splx(s);
-
-	/* Restart timer if i/o pending. */
-	if (sc->flags & (TPACTIVE | TPREW | TPRMARK | TPWMARK))
-		wtclock(sc);
-}
-
-/*
- * Perform QIC-02 and QIC-36 compatible reset sequence.
- */
-int
-wtreset(sc)
-	struct wt_softc *sc;
-{
-	u_char x;
-	int i;
-
-	outb(sc->CTLPORT, sc->RESET | sc->ONLINE); /* send reset */
-	delay(30);
-	outb(sc->CTLPORT, sc->ONLINE);	/* turn off reset */
-	delay(30);
-
-	/* Read the controller status. */
-	x = inb(sc->STATPORT);
-	if (x == 0xff)			/* no port at this address? */
-		return 0;
-
-	/* Wait 3 sec for reset to complete. Needed for QIC-36 boards? */
-	for (i = 0; i < 3000; ++i) {
-		if ((x & sc->BUSY) == 0 || (x & sc->NOEXCEP) == 0)
-			break;
-		delay(1000);
-		x = inb(sc->STATPORT);
-	}
-	return (x & sc->RESETMASK) == sc->RESETVAL;
-}
-
-/*
- * Get controller status information.  Return 0 if user i/o request should
- * receive an i/o error code.
- */
-int
-wtsense(sc, verbose, ignore)
-	struct wt_softc *sc;
-	int verbose, ignore;
-{
-	char *msg = 0;
-	int error;
-
-	WTDBPRINT(("wtsense() ignore=0x%x\n", ignore));
-	sc->flags &= ~(TPRO | TPWO);
-	if (!wtstatus(sc))
-		return 0;
-	if ((sc->error & TP_ST0) == 0)
-		sc->error &= ~TP_ST0MASK;
-	if ((sc->error & TP_ST1) == 0)
-		sc->error &= ~TP_ST1MASK;
-	sc->error &= ~ignore;	/* ignore certain errors */
-	error = sc->error & (TP_FIL | TP_BNL | TP_UDA | TP_EOM | TP_WRP |
-	    TP_USL | TP_CNI | TP_MBD | TP_NDT | TP_ILL);
-	if (!error)
-		return 1;
-	if (!verbose)
-		return 0;
-
-	/* lifted from tdriver.c from Wangtek */
-	if (error & TP_USL)
-		msg = "Drive not online";
-	else if (error & TP_CNI)
-		msg = "No cartridge";
-	else if ((error & TP_WRP) && (sc->flags & TPWP) == 0) {
-		msg = "Tape is write protected";
-		sc->flags |= TPWP;
-	} else if (error & TP_FIL)
-		msg = 0 /*"Filemark detected"*/;
-	else if (error & TP_EOM)
-		msg = 0 /*"End of tape"*/;
-	else if (error & TP_BNL)
-		msg = "Block not located";
-	else if (error & TP_UDA)
-		msg = "Unrecoverable data error";
-	else if (error & TP_NDT)
-		msg = "No data detected";
-	else if (error & TP_ILL)
-		msg = "Illegal command";
-	if (msg)
-		printf("%s: %s\n", sc->sc_dev.dv_xname, msg);
-	return 0;
-}
-
-/*
- * Get controller status information.
- */
-int
-wtstatus(sc)
-	struct wt_softc *sc;
-{
-	char *p;
-	int s;
-
-	s = splbio();
-	wtpoll(sc, sc->BUSY | sc->NOEXCEP, sc->BUSY | sc->NOEXCEP); /* ready? */
-	outb(sc->CMDPORT, QIC_RDSTAT);	/* send `read status' command */
-
-	outb(sc->CTLPORT, sc->REQUEST | sc->ONLINE);	/* set request */
-	wtpoll(sc, sc->BUSY, sc->BUSY);			/* wait for ready */
-	outb(sc->CTLPORT, sc->ONLINE);			/* reset request */
-	wtpoll(sc, sc->BUSY, 0);			/* wait for not ready */
-
-	p = (char *)&sc->error;
-	while (p < (char *)&sc->error + 6) {
-		u_char x = wtpoll(sc, sc->BUSY | sc->NOEXCEP, sc->BUSY | sc->NOEXCEP);
-		if ((x & sc->NOEXCEP) == 0) {	/* error */
-			splx(s);
-			return 0;
-		}
-
-		*p++ = inb(sc->DATAPORT);	/* read status byte */
-
-		outb(sc->CTLPORT, sc->REQUEST | sc->ONLINE); /* set request */
-		wtpoll(sc, sc->BUSY, 0);	/* wait for not ready */
-		outb(sc->CTLPORT, sc->ONLINE);	/* unset request */
-	}
-	splx(s);
-	return 1;
-}
diff --git a/sys/dev/isa/wtreg.h b/sys/dev/isa/wtreg.h
deleted file mode 100644
index d906715f6b8..00000000000
--- a/sys/dev/isa/wtreg.h
+++ /dev/null
@@ -1,126 +0,0 @@
-/*	$OpenBSD: wtreg.h,v 1.2 1997/11/07 08:07:13 niklas Exp $	*/
-/*	$NetBSD: wtreg.h,v 1.5 1994/10/27 04:18:33 cgd Exp $	*/
-
-/*
- * Streamer tape driver.
- * Supports Archive and Wangtek compatible QIC-02/QIC-36 boards.
- *
- * Copyright (C) 1993 by:
- *      Sergey Ryzhkov       <sir@kiae.su>
- *      Serge Vakulenko      <vak@zebub.msk.su>
- *
- * This software is distributed with NO WARRANTIES, not even the implied
- * warranties for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- *
- * Authors grant any other persons or organisations permission to use
- * or modify this software as long as this message is kept with the software,
- * all derivative works or modified versions.
- *
- * This driver is derived from the old 386bsd Wangtek streamer tape driver,
- * made by Robert Baron at CMU, based on Intel sources.
- */
-
-/*
- * Copyright (c) 1989 Carnegie-Mellon University.
- * All rights reserved.
- *
- * Authors: Robert Baron
- * 
- * Permission to use, copy, modify and distribute this software and
- * its documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- * 
- * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" 
- * CONDITION.  CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND 
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- * 
- * Carnegie Mellon requests users of this software to return to
- *
- *  Software Distribution Coordinator  or  Software.Distribution@CS.CMU.EDU
- *  School of Computer Science
- *  Carnegie Mellon University
- *  Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie the
- * rights to redistribute these changes.
- */
-
-/*
- *  Copyright 1988, 1989 by Intel Corporation
- */
-
-/* ioctl for direct QIC commands */
-#define WTQICMD         _IO('W', 0)
-
-/* QIC-02 commands allowed for WTQICMD */
-#define QIC_ERASE       0x22    /* erase the tape */
-#define QIC_RETENS      0x24    /* retension the tape */
-
-/* internal QIC-02 commands */
-#define QIC_RDDATA      0x80    /* read data */
-#define QIC_READFM      0xa0    /* read file mark */
-#define QIC_WRTDATA     0x40    /* write data */
-#define QIC_WRITEFM     0x60    /* write file mark */
-#define QIC_RDSTAT      0xc0    /* read status command */
-#define QIC_REWIND      0x21    /* rewind command (position+bot) */
-#define QIC_FMT11       0x26    /* set format QIC-11 */
-#define QIC_FMT24       0x27    /* set format QIC-24 */
-#define QIC_FMT120      0x28    /* set format QIC-120 */
-#define QIC_FMT150      0x29    /* set format QIC-150 */
-#define QIC_FMT300      0x2a    /* set format QIC-300/QIC-2100 */
-#define QIC_FMT600      0x2b    /* set format QIC-600/QIC-2200 */
-
-/* tape driver flags */
-#define TPINUSE         0x0001  /* tape is already open */
-#define TPREAD          0x0002  /* tape is only open for reading */
-#define TPWRITE         0x0004  /* tape is only open for writing */
-#define TPSTART         0x0008  /* tape must be rewound and reset */
-#define TPRMARK         0x0010  /* read file mark command outstanding */
-#define TPWMARK         0x0020  /* write file mark command outstanding */
-#define TPREW           0x0040  /* rewind command outstanding */
-#define TPEXCEP         0x0080  /* i/o exception flag */
-#define TPVOL           0x0100  /* read file mark or hit end of tape */
-#define TPWO            0x0200  /* write command outstanding */
-#define TPRO            0x0400  /* read command outstanding */
-#define TPWANY          0x0800  /* write command requested */
-#define TPRANY          0x1000  /* read command requested */
-#define TPWP            0x2000  /* write protect error seen */
-#define TPTIMER         0x4000  /* timer() is active */
-#define TPACTIVE        0x8000  /* dma i/o active */
-
-/* controller error register bits */
-#define TP_FIL          0x0001  /* File mark detected */
-#define TP_BNL          0x0002  /* Block not located */
-#define TP_UDA          0x0004  /* Unrecoverable data error */
-#define TP_EOM          0x0008  /* End of media */
-#define TP_WRP          0x0010  /* Write protected cartridge */
-#define TP_USL          0x0020  /* Unselected drive */
-#define TP_CNI          0x0040  /* Cartridge not in place */
-#define TP_ST0          0x0080  /* Status byte 0 bits */
-#define TP_ST0MASK      0x00ff  /* Status byte 0 mask */
-#define TP_POR          0x0100  /* Power on/reset occurred */
-#define TP_ERM          0x0200  /* Reserved for end of recorded media */
-#define TP_BPE          0x0400  /* Reserved for bus parity error */
-#define TP_BOM          0x0800  /* Beginning of media */
-#define TP_MBD          0x1000  /* Marginal block detected */
-#define TP_NDT          0x2000  /* No data detected */
-#define TP_ILL          0x4000  /* Illegal command - should not happen! */
-#define TP_ST1          0x8000  /* Status byte 1 bits */
-#define TP_ST1MASK      0xff00  /* Status byte 1 mask */
-
-/* formats for printing flags and error values */
-#define WTDS_BITS "\20\1inuse\2read\3write\4start\5rmark\6wmark\7rew\10excep\11vol\12wo\13ro\14wany\15rany\16wp\17timer\20active"
-#define WTER_BITS "\20\1eof\2bnl\3uda\4eom\5wrp\6usl\7cni\11por\12erm\13bpe\14bom\15mbd\16ndt\17ill"
-
-/* device minor number */
-#define WT_BSIZE        0100    /* long block flag */
-#define WT_DENSEL       0070    /* density select mask */
-#define WT_DENSDFLT     0000    /* default density */
-#define WT_QIC11        0010    /* 11 megabytes? */
-#define WT_QIC24        0020    /* 60 megabytes */
-#define WT_QIC120       0030    /* 120 megabytes */
-#define WT_QIC150       0040    /* 150 megabytes */
-#define WT_QIC300       0050    /* 300 megabytes? */
-#define WT_QIC600       0060    /* 600 megabytes? */