From NetBSD: driver for lpt at ebus

4 files changed, 120 insertions, 4 deletions

diff --git a/sys/arch/sparc64/conf/GENERIC b/sys/arch/sparc64/conf/GENERIC
index b9b580f4109..9b2f0fef5cd 100644
--- a/sys/arch/sparc64/conf/GENERIC
+++ b/sys/arch/sparc64/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.52 2002/03/14 19:19:21 jason Exp $
+#	$OpenBSD: GENERIC,v 1.53 2002/03/14 20:15:00 jason Exp $
 # 	$NetBSD: GENERIC32,v 1.18 2001/07/20 00:07:12 eeh Exp $
 
 machine		sparc64
@@ -92,6 +92,9 @@ wsmouse* at pmsi?				#   generic mouse
 audioce*	at ebus?
 audio*		at audioce?
 
+# parallel ports
+lpt*	at ebus?
+
 uperf*	at sbus? slot ? offset ?
 
 zs*	at sbus? slot ? offset ?
diff --git a/sys/arch/sparc64/conf/files.sparc64 b/sys/arch/sparc64/conf/files.sparc64
index 1d85320b95f..1c45706efa8 100644
--- a/sys/arch/sparc64/conf/files.sparc64
+++ b/sys/arch/sparc64/conf/files.sparc64
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc64,v 1.30 2002/02/18 17:14:34 jason Exp $
+#	$OpenBSD: files.sparc64,v 1.31 2002/03/14 20:15:00 jason Exp $
 #	$NetBSD: files.sparc64,v 1.50 2001/08/10 20:53:50 eeh Exp $
 
 # maxpartitions must be first item in files.${ARCH}
@@ -116,6 +116,9 @@ device comkbd: tty, wskbddev, sunkbd
 attach comkbd at ebus
 file	arch/sparc64/dev/comkbd_ebus.c		comkbd
 
+attach lpt at ebus with lpt_ebus
+file	arch/sparc64/dev/lpt_ebus.c		lpt_ebus
+
 device zs {channel = -1}
 attach zs at mainbus, sbus
 file	arch/sparc64/dev/zs.c			zs needs-flag
diff --git a/sys/arch/sparc64/dev/lpt_ebus.c b/sys/arch/sparc64/dev/lpt_ebus.c
new file mode 100644
index 00000000000..74f2db20c83
--- /dev/null
+++ b/sys/arch/sparc64/dev/lpt_ebus.c
@@ -0,0 +1,110 @@
+/*	$OpenBSD: lpt_ebus.c,v 1.1 2002/03/14 20:15:00 jason Exp $	*/
+/*	$NetBSD: lpt_ebus.c,v 1.8 2002/03/01 11:51:00 martin Exp $	*/
+
+/*
+ * Copyright (c) 1999, 2000 Matthew R. Green
+ * 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. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+/*
+ * NS Super I/O PC87332VLJ "lpt" to ebus attachment
+ */
+
+#include <sys/types.h>
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/device.h>
+#include <sys/tty.h>
+
+#include <machine/bus.h>
+
+#include <sparc64/dev/ebusreg.h>
+#include <sparc64/dev/ebusvar.h>
+
+#include <dev/ic/lptvar.h>
+
+int	lpt_ebus_match __P((struct device *, void *, void *));
+void	lpt_ebus_attach __P((struct device *, struct device *, void *));
+
+struct cfattach lpt_ebus_ca = {
+	sizeof(struct lpt_softc), lpt_ebus_match, lpt_ebus_attach
+};
+
+#define	ROM_LPT_NAME	"ecpp"
+
+int
+lpt_ebus_match(parent, match, aux)
+	struct device *parent;
+	void *match;
+	void *aux;
+{
+	struct ebus_attach_args *ea = aux;
+
+	if (strcmp(ea->ea_name, ROM_LPT_NAME) == 0)
+		return (1);
+
+	return (0);
+}
+
+void
+lpt_ebus_attach(parent, self, aux)
+	struct device *parent, *self;
+	void *aux;
+{
+	struct lpt_softc *sc = (void *)self;
+	struct ebus_attach_args *ea = aux;
+	int i;
+
+	sc->sc_iot = ea->ea_bustag;
+	/*
+	 * Addresses that shoud be supplied by the prom:
+	 *	- normal lpt registers
+	 *	- ns873xx configuration registers
+	 *	- DMA space
+	 * The `lpt' driver does not use DMA accesses, so we can
+	 * ignore that for now.  We should enable the lpt port in
+	 * the ns873xx registers here. XXX
+	 *
+	 * Use the prom address if there.
+	 */
+	if (ea->ea_nvaddrs)
+		sc->sc_ioh = (bus_space_handle_t)ea->ea_vaddrs[0];
+	else if (ebus_bus_map(sc->sc_iot, 0,
+			      EBUS_PADDR_FROM_REG(&ea->ea_regs[0]),
+			      ea->ea_regs[0].size,
+			      BUS_SPACE_MAP_LINEAR,
+			      0, &sc->sc_ioh) != 0) {
+		printf(": can't map register space\n");
+                return;
+	}
+
+	for (i = 0; i < ea->ea_nintrs; i++)
+		bus_intr_establish(ea->ea_bustag, ea->ea_intrs[i],
+				   IPL_SERIAL, 0, lptintr, sc);
+	printf("\n");
+
+	lpt_attach_common(sc);
+}
diff --git a/sys/conf/files b/sys/conf/files
index 22a72ff71ee..1640314fffe 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.242 2002/03/14 19:20:03 jason Exp $
+#	$OpenBSD: files,v 1.243 2002/03/14 20:15:00 jason Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -257,7 +257,7 @@ file	dev/ic/cy.c		cy & (cy_isa | cy_pci)	needs-flag
 
 # PC parallel ports (IEEE 1284)
 device	lpt
-file	dev/ic/lpt.c		lpt & (lpt_isa | lpt_pica | lpt_algor | lpt_gsc | lpt_puc | lpt_apio) needs-flag
+file	dev/ic/lpt.c		lpt & (lpt_isa | lpt_pica | lpt_algor | lpt_gsc | lpt_puc | lpt_apio | lpt_ebus) needs-flag
 
 # STI (hp graphics)
 device	sti: wsemuldisplaydev