Cleaned up. lpt is MI now.

4 files changed, 34 insertions, 668 deletions

diff --git a/sys/dev/isa/files.isa b/sys/dev/isa/files.isa
index 50d38eb8293..e33a52f4fdb 100644
--- a/sys/dev/isa/files.isa
+++ b/sys/dev/isa/files.isa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.isa,v 1.28 1996/11/29 22:54:57 niklas Exp $
+#	$OpenBSD: files.isa,v 1.29 1996/11/30 00:53:39 niklas Exp $
 #	$NetBSD: files.isa,v 1.21 1996/05/16 03:45:55 mycroft Exp $
 #
 # Config.new file and device description for machine-independent ISA code.
@@ -67,9 +67,7 @@ attach	cy at isa with cy_isa
 file	dev/isa/cy_isa.c		cy_isa
 
 # PC parallel ports (XXX what chip?)
-device	lpt
 attach	lpt at isa with lpt_isa
-file	dev/isa/lpt.c			lpt & (lpt_isa | lpt_pica) needs-flag
 file	dev/isa/lpt_isa.c		lpt_isa needs-flag
 
 #
diff --git a/sys/dev/isa/lpt.c b/sys/dev/isa/lpt.c
deleted file mode 100644
index de0bda2d16b..00000000000
--- a/sys/dev/isa/lpt.c
+++ /dev/null
@@ -1,591 +0,0 @@
-/*	$OpenBSD: lpt.c,v 1.20 1996/11/29 22:55:04 niklas Exp $ */
-/*	$NetBSD: lpt.c,v 1.42 1996/10/21 22:41:14 thorpej Exp $	*/
-
-/*
- * Copyright (c) 1993, 1994 Charles Hannum.
- * Copyright (c) 1990 William F. Jolitz, TeleMuse
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *	This software is a component of "386BSD" developed by 
- *	William F. Jolitz, TeleMuse.
- * 4. Neither the name of the developer nor the name "386BSD"
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS A COMPONENT OF 386BSD DEVELOPED BY WILLIAM F. JOLITZ 
- * AND IS INTENDED FOR RESEARCH AND EDUCATIONAL PURPOSES ONLY. THIS 
- * SOFTWARE SHOULD NOT BE CONSIDERED TO BE A COMMERCIAL PRODUCT. 
- * THE DEVELOPER URGES THAT USERS WHO REQUIRE A COMMERCIAL PRODUCT 
- * NOT MAKE USE OF THIS WORK.
- *
- * FOR USERS WHO WISH TO UNDERSTAND THE 386BSD SYSTEM DEVELOPED
- * BY WILLIAM F. JOLITZ, WE RECOMMEND THE USER STUDY WRITTEN 
- * REFERENCES SUCH AS THE  "PORTING UNIX TO THE 386" SERIES 
- * (BEGINNING JANUARY 1991 "DR. DOBBS JOURNAL", USA AND BEGINNING 
- * JUNE 1991 "UNIX MAGAZIN", GERMANY) BY WILLIAM F. JOLITZ AND 
- * LYNNE GREER JOLITZ, AS WELL AS OTHER BOOKS ON UNIX AND THE 
- * ON-LINE 386BSD USER MANUAL BEFORE USE. A BOOK DISCUSSING THE INTERNALS 
- * OF 386BSD ENTITLED "386BSD FROM THE INSIDE OUT" WILL BE AVAILABLE LATE 1992.
- *
- * THIS SOFTWARE IS PROVIDED BY THE DEVELOPER ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE DEVELOPER BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-/*
- * Device Driver for AT parallel printer port
- */
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
-#include <sys/user.h>
-#include <sys/buf.h>
-#include <sys/kernel.h>
-#include <sys/ioctl.h>
-#include <sys/uio.h>
-#include <sys/device.h>
-#include <sys/conf.h>
-#include <sys/syslog.h>
-
-#include <machine/bus.h>
-#include <machine/intr.h>
-
-#include <dev/isa/isavar.h>
-#include <dev/isa/lptreg.h>
-
-#include "lpt.h"
-
-#define	TIMEOUT		hz*16	/* wait up to 16 seconds for a ready */
-#define	STEP		hz/4
-
-#define	LPTPRI		(PZERO+8)
-#define	LPT_BSIZE	1024
-
-#if !defined(DEBUG) || !defined(notdef)
-#define LPRINTF(a)
-#else
-#define LPRINTF		if (lptdebug) printf a
-int lptdebug = 1;
-#endif
-
-struct lpt_softc {
-	struct device sc_dev;
-	void *sc_ih;
-
-	size_t sc_count;
-	struct buf *sc_inbuf;
-	u_char *sc_cp;
-	int sc_spinmax;
-	int sc_iobase;
-	bus_space_tag_t sc_iot;
-	bus_space_handle_t sc_ioh;
-	int sc_irq;
-	u_char sc_state;
-#define	LPT_OPEN	0x01	/* device is open */
-#define	LPT_OBUSY	0x02	/* printer is busy doing output */
-#define	LPT_INIT	0x04	/* waiting to initialize for open */
-	u_char sc_flags;
-#define	LPT_AUTOLF	0x20	/* automatic LF on CR */
-#define	LPT_NOPRIME	0x40	/* don't prime on open */
-#define	LPT_NOINTR	0x80	/* do not use interrupt */
-	u_char sc_control;
-	u_char sc_laststatus;
-};
-
-/* XXX does not belong here */
-cdev_decl(lpt);
-
-int lptintr __P((void *));
-
-#if NLPT_ISA
-int lpt_isa_probe __P((struct device *, void *, void *));
-void lpt_isa_attach __P((struct device *, struct device *, void *));
-struct cfattach lpt_isa_ca = {
-	sizeof(struct lpt_softc), lpt_isa_probe, lpt_isa_attach
-};
-#endif
-
-struct cfdriver lpt_cd = {
-	NULL, "lpt", DV_TTY
-};
-
-#define	LPTUNIT(s)	(minor(s) & 0x1f)
-#define	LPTFLAGS(s)	(minor(s) & 0xe0)
-
-#define	LPS_INVERT	(LPS_SELECT|LPS_NERR|LPS_NBSY|LPS_NACK)
-#define	LPS_MASK	(LPS_SELECT|LPS_NERR|LPS_NBSY|LPS_NACK|LPS_NOPAPER)
-#define	NOT_READY()	((bus_space_read_1(iot, ioh, lpt_status) ^ LPS_INVERT) & LPS_MASK)
-#define	NOT_READY_ERR()	not_ready(bus_space_read_1(iot, ioh, lpt_status), sc)
-static int not_ready __P((u_char, struct lpt_softc *));
-
-static void lptwakeup __P((void *arg));
-static int pushbytes __P((struct lpt_softc *));
-
-int	lpt_port_test __P((bus_space_tag_t, bus_space_handle_t, bus_addr_t,
-	    bus_size_t, u_char, u_char));
-
-/*
- * Internal routine to lptprobe to do port tests of one byte value.
- */
-int
-lpt_port_test(iot, ioh, base, off, data, mask)
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-	bus_addr_t base;
-	bus_size_t off;
-	u_char data, mask;
-{
-	int timeout;
-	u_char temp;
-
-	data &= mask;
-	bus_space_write_1(iot, ioh, off, data);
-	timeout = 1000;
-	do {
-		delay(10);
-		temp = bus_space_read_1(iot, ioh, off) & mask;
-	} while (temp != data && --timeout);
-	LPRINTF(("lpt: port=0x%x out=0x%x in=0x%x timeout=%d\n", base + off,
-	    data, temp, timeout));
-	return (temp == data);
-}
-
-/*
- * Logic:
- *	1) You should be able to write to and read back the same value
- *	   to the data port.  Do an alternating zeros, alternating ones,
- *	   walking zero, and walking one test to check for stuck bits.
- *
- *	2) You should be able to write to and read back the same value
- *	   to the control port lower 5 bits, the upper 3 bits are reserved
- *	   per the IBM PC technical reference manauls and different boards
- *	   do different things with them.  Do an alternating zeros, alternating
- *	   ones, walking zero, and walking one test to check for stuck bits.
- *
- *	   Some printers drag the strobe line down when the are powered off
- * 	   so this bit has been masked out of the control port test.
- *
- *	   XXX Some printers may not like a fast pulse on init or strobe, I
- *	   don't know at this point, if that becomes a problem these bits
- *	   should be turned off in the mask byte for the control port test.
- *
- *	3) Set the data and control ports to a value of 0
- */
-#if NLPT_ISA
-int
-lpt_isa_probe(parent, match, aux)
-	struct device *parent;
-	void *match, *aux;
-{
-	struct isa_attach_args *ia = aux;
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-	u_long base;
-	u_char mask, data;
-	int i, rv;
-
-#ifdef DEBUG
-#define	ABORT								     \
-	do {								     \
-		printf("lpt_isa_probe: mask %x data %x failed\n", mask,	     \
-		    data);						     \
-		goto out;						     \
-	} while (0)
-#else
-#define	ABORT	goto out
-#endif
-
-	iot = ia->ia_iot;
-	base = ia->ia_iobase;
-	if (bus_space_map(iot, base, LPT_NPORTS, 0, &ioh))
-		return 0;
-
-	rv = 0;
-	mask = 0xff;
-
-	data = 0x55;				/* Alternating zeros */
-	if (!lpt_port_test(iot, ioh, base, lpt_data, data, mask))
-		ABORT;
-
-	data = 0xaa;				/* Alternating ones */
-	if (!lpt_port_test(iot, ioh, base, lpt_data, data, mask))
-		ABORT;
-
-	for (i = 0; i < CHAR_BIT; i++) {	/* Walking zero */
-		data = ~(1 << i);
-		if (!lpt_port_test(iot, ioh, base, lpt_data, data, mask))
-			ABORT;
-	}
-
-	for (i = 0; i < CHAR_BIT; i++) {	/* Walking one */
-		data = (1 << i);
-		if (!lpt_port_test(iot, ioh, base, lpt_data, data, mask))
-			ABORT;
-	}
-
-	bus_space_write_1(iot, ioh, lpt_data, 0);
-	bus_space_write_1(iot, ioh, lpt_control, 0);
-
-	ia->ia_iosize = LPT_NPORTS;
-	ia->ia_msize = 0;
-
-	rv = 1;
-
-out:
-	bus_space_unmap(iot, ioh, LPT_NPORTS);
-	return rv;
-}
-#endif
-
-#if NLPT_ISA
-void
-lpt_isa_attach(parent, self, aux)
-	struct device *parent, *self;
-	void *aux;
-{
-	struct lpt_softc *sc = (void *)self;
-	struct isa_attach_args *ia = aux;
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-
-	if (ia->ia_irq != IRQUNK)
-		printf("\n");
-	else
-		printf(": polled\n");
-
-	sc->sc_iobase = ia->ia_iobase;
-	sc->sc_irq = ia->ia_irq;
-	sc->sc_state = 0;
-
-	iot = sc->sc_iot = ia->ia_iot;
-	if (bus_space_map(iot, sc->sc_iobase, LPT_NPORTS, 0, &ioh))
-		panic("lpt_isa_attach: couldn't map I/O ports");
-	sc->sc_ioh = ioh;
-
-	bus_space_write_1(iot, ioh, lpt_control, LPC_NINIT);
-
-	if (ia->ia_irq != IRQUNK)
-		sc->sc_ih = isa_intr_establish(ia->ia_ic, ia->ia_irq, IST_EDGE,
-		    IPL_TTY, lptintr, sc, sc->sc_dev.dv_xname);
-}
-#endif
-
-/*
- * Reset the printer, then wait until it's selected and not busy.
- */
-int
-lptopen(dev, flag, mode, p)
-	dev_t dev;
-	int flag;
-	int mode;
-	struct proc *p;
-{
-	int unit = LPTUNIT(dev);
-	u_char flags = LPTFLAGS(dev);
-	struct lpt_softc *sc;
-	bus_space_tag_t iot;
-	bus_space_handle_t ioh;
-	u_char control;
-	int error;
-	int spin;
-
-	if (unit >= lpt_cd.cd_ndevs)
-		return ENXIO;
-	sc = lpt_cd.cd_devs[unit];
-	if (!sc)
-		return ENXIO;
-
-	if (sc->sc_irq == IRQUNK && (flags & LPT_NOINTR) == 0)
-		return ENXIO;
-
-#ifdef DIAGNOSTIC
-	if (sc->sc_state)
-		printf("%s: stat=0x%x not zero\n", sc->sc_dev.dv_xname,
-		    sc->sc_state);
-#endif
-
-	if (sc->sc_state)
-		return EBUSY;
-
-	sc->sc_state = LPT_INIT;
-	sc->sc_flags = flags;
-	LPRINTF(("%s: open: flags=0x%x\n", sc->sc_dev.dv_xname, flags));
-	iot = sc->sc_iot;
-	ioh = sc->sc_ioh;
-
-	if ((flags & LPT_NOPRIME) == 0) {
-		/* assert INIT for 100 usec to start up printer */
-		bus_space_write_1(iot, ioh, lpt_control, LPC_SELECT);
-		delay(100);
-	}
-
-	control = LPC_SELECT | LPC_NINIT;
-	bus_space_write_1(iot, ioh, lpt_control, control);
-
-	/* wait till ready (printer running diagnostics) */
-	for (spin = 0; NOT_READY_ERR(); spin += STEP) {
-		if (spin >= TIMEOUT) {
-			sc->sc_state = 0;
-			return EBUSY;
-		}
-
-		/* wait 1/4 second, give up if we get a signal */
-		error = tsleep((caddr_t)sc, LPTPRI | PCATCH, "lptopen", STEP);
-		if (error != EWOULDBLOCK) {
-			sc->sc_state = 0;
-			return error;
-		}
-	}
-
-	if ((flags & LPT_NOINTR) == 0)
-		control |= LPC_IENABLE;
-	if (flags & LPT_AUTOLF)
-		control |= LPC_AUTOLF;
-	sc->sc_control = control;
-	bus_space_write_1(iot, ioh, lpt_control, control);
-
-	sc->sc_inbuf = geteblk(LPT_BSIZE);
-	sc->sc_count = 0;
-	sc->sc_state = LPT_OPEN;
-
-	if ((sc->sc_flags & LPT_NOINTR) == 0)
-		lptwakeup(sc);
-
-	LPRINTF(("%s: opened\n", sc->sc_dev.dv_xname));
-	return 0;
-}
-
-int
-not_ready(status, sc)
-	u_char status;
-	struct lpt_softc *sc;
-{
-	u_char new;
-
-	status = (status ^ LPS_INVERT) & LPS_MASK;
-	new = status & ~sc->sc_laststatus;
-	sc->sc_laststatus = status;
-
-	if (new & LPS_SELECT)
-		log(LOG_NOTICE, "%s: offline\n", sc->sc_dev.dv_xname);
-	else if (new & LPS_NOPAPER)
-		log(LOG_NOTICE, "%s: out of paper\n", sc->sc_dev.dv_xname);
-	else if (new & LPS_NERR)
-		log(LOG_NOTICE, "%s: output error\n", sc->sc_dev.dv_xname);
-
-	return status;
-}
-
-void
-lptwakeup(arg)
-	void *arg;
-{
-	struct lpt_softc *sc = arg;
-	int s;
-
-	s = spltty();
-	lptintr(sc);
-	splx(s);
-
-	timeout(lptwakeup, sc, STEP);
-}
-
-/*
- * Close the device, and free the local line buffer.
- */
-int
-lptclose(dev, flag, mode, p)
-	dev_t dev;
-	int flag;
-	int mode;
-	struct proc *p;
-{
-	int unit = LPTUNIT(dev);
-	struct lpt_softc *sc = lpt_cd.cd_devs[unit];
-	bus_space_tag_t iot = sc->sc_iot;
-	bus_space_handle_t ioh = sc->sc_ioh;
-
-	if (sc->sc_count)
-		(void) pushbytes(sc);
-
-	if ((sc->sc_flags & LPT_NOINTR) == 0)
-		untimeout(lptwakeup, sc);
-
-	bus_space_write_1(iot, ioh, lpt_control, LPC_NINIT);
-	sc->sc_state = 0;
-	bus_space_write_1(iot, ioh, lpt_control, LPC_NINIT);
-	brelse(sc->sc_inbuf);
-
-	LPRINTF(("%s: closed\n", sc->sc_dev.dv_xname));
-	return 0;
-}
-
-int
-pushbytes(sc)
-	struct lpt_softc *sc;
-{
-	bus_space_tag_t iot = sc->sc_iot;
-	bus_space_handle_t ioh = sc->sc_ioh;
-	int error;
-
-	if (sc->sc_flags & LPT_NOINTR) {
-		int spin, tic;
-		u_char control = sc->sc_control;
-
-		while (sc->sc_count > 0) {
-			spin = 0;
-			while (NOT_READY()) {
-				if (++spin < sc->sc_spinmax)
-					continue;
-				tic = 0;
-				/* adapt busy-wait algorithm */
-				sc->sc_spinmax++;
-				while (NOT_READY_ERR()) {
-					/* exponential backoff */
-					tic = tic + tic + 1;
-					if (tic > TIMEOUT)
-						tic = TIMEOUT;
-					error = tsleep((caddr_t)sc,
-					    LPTPRI | PCATCH, "lptpsh", tic);
-					if (error != EWOULDBLOCK)
-						return error;
-				}
-				break;
-			}
-
-			bus_space_write_1(iot, ioh, lpt_data, *sc->sc_cp++);
-			bus_space_write_1(iot, ioh, lpt_control, control | LPC_STROBE);
-			sc->sc_count--;
-			bus_space_write_1(iot, ioh, lpt_control, control);
-
-			/* adapt busy-wait algorithm */
-			if (spin*2 + 16 < sc->sc_spinmax)
-				sc->sc_spinmax--;
-		}
-	} else {
-		int s;
-
-		while (sc->sc_count > 0) {
-			/* if the printer is ready for a char, give it one */
-			if ((sc->sc_state & LPT_OBUSY) == 0) {
-				LPRINTF(("%s: write %d\n", sc->sc_dev.dv_xname,
-				    sc->sc_count));
-				s = spltty();
-				(void) lptintr(sc);
-				splx(s);
-			}
-			error = tsleep((caddr_t)sc, LPTPRI | PCATCH,
-			    "lptwrite2", 0);
-			if (error)
-				return error;
-		}
-	}
-	return 0;
-}
-
-/* 
- * Copy a line from user space to a local buffer, then call putc to get the
- * chars moved to the output queue.
- */
-int
-lptwrite(dev, uio, flags)
-	dev_t dev;
-	struct uio *uio;
-	int flags;
-{
-	struct lpt_softc *sc = lpt_cd.cd_devs[LPTUNIT(dev)];
-	size_t n;
-	int error = 0;
-
-	while ((n = min(LPT_BSIZE, uio->uio_resid)) != 0) {
-		uiomove(sc->sc_cp = sc->sc_inbuf->b_data, n, uio);
-		sc->sc_count = n;
-		error = pushbytes(sc);
-		if (error) {
-			/*
-			 * Return accurate residual if interrupted or timed
-			 * out.
-			 */
-			uio->uio_resid += sc->sc_count;
-			sc->sc_count = 0;
-			return error;
-		}
-	}
-	return 0;
-}
-
-/*
- * Handle printer interrupts which occur when the printer is ready to accept
- * another char.
- */
-int
-lptintr(arg)
-	void *arg;
-{
-	struct lpt_softc *sc = arg;
-	bus_space_tag_t iot = sc->sc_iot;
-	bus_space_handle_t ioh = sc->sc_ioh;
-
-	if (((sc->sc_state & LPT_OPEN) == 0 && sc->sc_count == 0) || (sc->sc_flags & LPT_NOINTR))
-		return 0;
-
-	/* is printer online and ready for output */
-	if (NOT_READY() && NOT_READY_ERR())
-		return -1;
-
-	if (sc->sc_count) {
-		u_char control = sc->sc_control;
-		/* send char */
-		bus_space_write_1(iot, ioh, lpt_data, *sc->sc_cp++);
-		delay (50);
-		bus_space_write_1(iot, ioh, lpt_control, control | LPC_STROBE);
-		sc->sc_count--;
-		bus_space_write_1(iot, ioh, lpt_control, control);
-		sc->sc_state |= LPT_OBUSY;
-	} else
-		sc->sc_state &= ~LPT_OBUSY;
-
-	if (sc->sc_count == 0) {
-		/* none, wake up the top half to get more */
-		wakeup((caddr_t)sc);
-	}
-
-	return 1;
-}
-
-int
-lptioctl(dev, cmd, data, flag, p)
-	dev_t dev;
-	u_long cmd;
-	caddr_t data;
-	int flag;
-	struct proc *p;
-{
-	int error = 0;
-
-	switch (cmd) {
-	default:
-		error = ENODEV;
-	}
-
-	return error;
-}
diff --git a/sys/dev/isa/lpt_isa.c b/sys/dev/isa/lpt_isa.c
index 024627911ee..9094cfe8996 100644
--- a/sys/dev/isa/lpt_isa.c
+++ b/sys/dev/isa/lpt_isa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lpt_isa.c,v 1.1 1996/11/29 23:51:13 niklas Exp $	*/
+/*	$OpenBSD: lpt_isa.c,v 1.2 1996/11/30 00:53:38 niklas Exp $	*/
 
 /*
  * Copyright (c) 1993, 1994 Charles Hannum.
@@ -60,15 +60,38 @@
 #include <machine/bus.h>
 #include <machine/intr.h>
 
-#include <dev/isa/lptreg.h>
+#include <dev/isa/isavar.h>
+#include <dev/ic/lptreg.h>
+#include <dev/ic/lptvar.h>
 
-int lpt_isa_probe __P((struct device *, void *, void *));
-void lpt_isa_attach __P((struct device *, struct device *, void *));
+int	lpt_isa_probe __P((struct device *, void *, void *));
+void	lpt_isa_attach __P((struct device *, struct device *, void *));
 
 struct cfattach lpt_isa_ca = {
 	sizeof(struct lpt_softc), lpt_isa_probe, lpt_isa_attach
 };
 
+/*
+ * Logic:
+ *	1) You should be able to write to and read back the same value
+ *	   to the data port.  Do an alternating zeros, alternating ones,
+ *	   walking zero, and walking one test to check for stuck bits.
+ *
+ *	2) You should be able to write to and read back the same value
+ *	   to the control port lower 5 bits, the upper 3 bits are reserved
+ *	   per the IBM PC technical reference manauls and different boards
+ *	   do different things with them.  Do an alternating zeros, alternating
+ *	   ones, walking zero, and walking one test to check for stuck bits.
+ *
+ *	   Some printers drag the strobe line down when the are powered off
+ * 	   so this bit has been masked out of the control port test.
+ *
+ *	   XXX Some printers may not like a fast pulse on init or strobe, I
+ *	   don't know at this point, if that becomes a problem these bits
+ *	   should be turned off in the mask byte for the control port test.
+ *
+ *	3) Set the data and control ports to a value of 0
+ */
 int
 lpt_isa_probe(parent, match, aux)
 	struct device *parent;
@@ -77,8 +100,8 @@ lpt_isa_probe(parent, match, aux)
 	struct isa_attach_args *ia = aux;
 	bus_space_tag_t iot;
 	bus_space_handle_t ioh;
-	u_long base;
-	u_char mask, data;
+	bus_addr_t base;
+	u_int8_t mask, data;
 	int i, rv;
 
 #ifdef DEBUG
@@ -145,15 +168,15 @@ lpt_isa_attach(parent, self, aux)
 
 	if (ia->ia_irq != IRQUNK)
 		printf("\n");
-	else
+	else {
+		sc->sc_flags |= LPT_POLLED;
 		printf(": polled\n");
+	}
 
-	sc->sc_iobase = ia->ia_iobase;
-	sc->sc_irq = ia->ia_irq;
 	sc->sc_state = 0;
 
 	iot = sc->sc_iot = ia->ia_iot;
-	if (bus_space_map(iot, sc->sc_iobase, LPT_NPORTS, 0, &ioh))
+	if (bus_space_map(iot, ia->ia_iobase, LPT_NPORTS, 0, &ioh))
 		panic("lpt_isa_attach: couldn't map I/O ports");
 	sc->sc_ioh = ioh;
 
diff --git a/sys/dev/isa/lptreg.h b/sys/dev/isa/lptreg.h
deleted file mode 100644
index b308fe24625..00000000000
--- a/sys/dev/isa/lptreg.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/*	$NetBSD: lptreg.h,v 1.4 1994/10/27 04:17:56 cgd Exp $	*/
-
-/*-
- * Copyright (c) 1990 The Regents of the University of California.
- * All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by
- * William Jolitz.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- *
- *      @(#)lptreg.h	1.1 (Berkeley) 12/19/90
- */
-
-/*
- * AT Parallel Port (for lineprinter)
- * Interface port and bit definitions
- * Written by William Jolitz 12/18/90
- * Copyright (C) William Jolitz 1990
- */
-
-#define	lpt_data	0	/* Data to/from printer (R/W) */
-
-#define	lpt_status	1	/* Status of printer (R) */
-#define	LPS_NERR		0x08	/* printer no error */
-#define	LPS_SELECT		0x10	/* printer selected */
-#define	LPS_NOPAPER		0x20	/* printer out of paper */
-#define	LPS_NACK		0x40	/* printer no ack of data */
-#define	LPS_NBSY		0x80	/* printer no ack of data */
-
-#define	lpt_control	2	/* Control printer (R/W) */
-#define	LPC_STROBE		0x01	/* strobe data to printer */
-#define	LPC_AUTOLF		0x02	/* automatic linefeed */
-#define	LPC_NINIT		0x04	/* initialize printer */
-#define	LPC_SELECT		0x08	/* printer selected */
-#define	LPC_IENABLE		0x10	/* printer out of paper */
-
-#define	LPT_NPORTS	8