o Move ISA specific code from ppc.c to ppc_isa.c -- a bus front-

   end for isa(4).
o  Add a seperate bus frontend for acpi(4) and allow ISA DMA for
   it when ISA is configured in the kernel. This allows acpi(4)
   attachments in non-ISA configurations, as is possible for ia64.
o  Add a seperate bus frontend for pci(4) and detect known single
   port parallel cards.
o  Merge PC98 specific changes under pc98/cbus into the MI driver.
   The changes are minor enough for conditional compilation and
   in this form invites better abstraction.
o  Have ppc(4) usabled on all platforms, now that ISA specifics
   are untangled enough.

1 files changed, 114 insertions, 0 deletions

diff --git a/sys/dev/ppc/ppc_acpi.c b/sys/dev/ppc/ppc_acpi.c
new file mode 100644
index 0000000..c3a42fe
--- /dev/null
+++ b/sys/dev/ppc/ppc_acpi.c
@@ -0,0 +1,114 @@
+/*-
+ * Copyright (c) 2006 Marcel Moolenaar
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include "opt_isa.h"
+
+#include <sys/param.h>
+#include <sys/kernel.h>
+#include <sys/module.h>
+#include <sys/bus.h>
+  
+#include <machine/bus.h>
+
+#include <isa/isareg.h>
+#include <isa/isavar.h>
+
+#include <dev/ppbus/ppbconf.h>
+#include <dev/ppbus/ppb_msq.h>
+#include <dev/ppc/ppcvar.h>
+#include <dev/ppc/ppcreg.h>
+
+#include "ppbus_if.h"
+
+static int ppc_acpi_probe(device_t dev);
+
+int ppc_isa_attach(device_t dev);
+int ppc_isa_write(device_t, char *, int, int);
+
+static device_method_t ppc_acpi_methods[] = {
+	/* device interface */
+	DEVMETHOD(device_probe,		ppc_acpi_probe),
+#ifdef DEV_ISA
+	DEVMETHOD(device_attach,	ppc_isa_attach),
+#else
+	DEVMETHOD(device_attach,	ppc_attach),
+#endif
+	DEVMETHOD(device_detach,	ppc_attach),
+
+	/* bus interface */
+	DEVMETHOD(bus_read_ivar,	ppc_read_ivar),
+	DEVMETHOD(bus_setup_intr,	ppc_setup_intr),
+	DEVMETHOD(bus_teardown_intr,	ppc_teardown_intr),
+	DEVMETHOD(bus_alloc_resource,	bus_generic_alloc_resource),
+
+	/* ppbus interface */
+	DEVMETHOD(ppbus_io,		ppc_io),
+	DEVMETHOD(ppbus_exec_microseq,	ppc_exec_microseq),
+	DEVMETHOD(ppbus_reset_epp,	ppc_reset_epp),
+	DEVMETHOD(ppbus_setmode,	ppc_setmode),
+	DEVMETHOD(ppbus_ecp_sync,	ppc_ecp_sync),
+	DEVMETHOD(ppbus_read,		ppc_read),
+#ifdef DEV_ISA
+	DEVMETHOD(ppbus_write,		ppc_isa_write),
+#else
+	DEVMETHOD(ppbus_write,		ppc_write),
+#endif
+
+	{ 0, 0 }
+};
+
+static driver_t ppc_acpi_driver = {
+	ppc_driver_name,
+	ppc_acpi_methods,
+	sizeof(struct ppc_data),
+};
+
+static struct isa_pnp_id lpc_ids[] = {
+	{ 0x0004d041, "Standard parallel printer port" },	/* PNP0400 */
+	{ 0x0104d041, "ECP parallel printer port" },		/* PNP0401 */
+	{ 0 }
+};
+
+static int
+ppc_acpi_probe(device_t dev)
+{
+	device_t parent;
+	int error;
+
+	parent = device_get_parent(dev);
+
+	error = ISA_PNP_PROBE(parent, dev, lpc_ids);
+	if (error)
+		return (ENXIO);
+
+	device_set_desc(dev, "Parallel port");
+	return (ppc_probe(dev, 0));
+}
+
+DRIVER_MODULE(ppc, acpi, ppc_acpi_driver, ppc_devclass, 0, 0);