Bring the 'new-bus' to the i386. This extensively changes the way the

i386 platform boots, it is no longer ISA-centric, and is fully dynamic.
Most old drivers compile and run without modification via 'compatability
shims' to enable a smoother transition.  eisa, isapnp and pccard* are
not yet using the new resource manager.  Once fully converted, all drivers
will be loadable, including PCI and ISA.

(Some other changes appear to have snuck in, including a port of Soren's
 ATA driver to the Alpha.  Soren, back this out if you need to.)

This is a checkpoint of work-in-progress, but is quite functional.

The bulk of the work was done over the last few years by Doug Rabson and
Garrett Wollman.

Approved by:	core

1 files changed, 255 insertions, 0 deletions

diff --git a/sys/i386/isa/isa_compat.c b/sys/i386/isa/isa_compat.c
new file mode 100644
index 0000000..82e6185
--- /dev/null
+++ b/sys/i386/isa/isa_compat.c
@@ -0,0 +1,255 @@
+/*-
+ * Copyright (c) 1998 Doug Rabson
+ * 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.
+ *
+ *	$Id$
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
+#include <sys/malloc.h>
+#include <sys/module.h>
+#include <machine/bus.h>
+#include <sys/rman.h>
+
+#include <machine/resource.h>
+#include <isa/isavar.h>
+#include <i386/isa/isa_compat.h>
+#include <i386/isa/isa_device.h>
+
+struct isa_compat_resources {
+    struct resource *ports;
+    struct resource *memory;
+    struct resource *drq;
+    struct resource *irq;
+};
+
+int
+isa_compat_nextid(void)
+{
+	static int id = 2;	/* id_id of -1, 0 and 1 are "used" */
+
+	return id++;
+}
+
+static void
+isa_compat_alloc_resources(device_t dev, struct isa_compat_resources *res)
+{
+	int rid;
+
+	if (isa_get_port(dev) != -1) {
+		rid = 0;
+		res->ports = bus_alloc_resource(dev, SYS_RES_IOPORT,
+						&rid, 0ul, ~0ul, 1,
+						RF_ACTIVE);
+		if (res->ports == NULL)
+			printf("isa_compat: didn't get ports for %s\n",
+			       device_get_name(dev));
+	} else
+		res->ports = 0;
+
+	if (isa_get_maddr(dev) != 0) {
+		rid = 0;
+		res->memory = bus_alloc_resource(dev, SYS_RES_MEMORY,
+						 &rid, 0ul, ~0ul, 1,
+						 RF_ACTIVE);
+		if (res->memory == NULL)
+			printf("isa_compat: didn't get memory for %s\n",
+			       device_get_name(dev));
+	} else
+		res->memory = 0;
+
+	if (isa_get_drq(dev) != -1) {
+		rid = 0;
+		res->drq = bus_alloc_resource(dev, SYS_RES_DRQ,
+					      &rid, 0ul, ~0ul, 1,
+					      RF_ACTIVE);
+		if (res->drq == NULL)
+			printf("isa_compat: didn't get drq for %s\n",
+			       device_get_name(dev));
+	} else
+		res->drq = 0;
+
+	if (isa_get_irq(dev) != -1) {
+		rid = 0;
+		res->irq = bus_alloc_resource(dev, SYS_RES_IRQ,
+					      &rid, 0ul, ~0ul, 1,
+					      RF_SHAREABLE | RF_ACTIVE);
+		if (res->irq == NULL)
+			printf("isa_compat: didn't get irq for %s\n",
+			       device_get_name(dev));
+	} else
+		res->irq = 0;
+}
+
+static void
+isa_compat_release_resources(device_t dev, struct isa_compat_resources *res)
+{
+	if (res->ports) {
+		bus_release_resource(dev, SYS_RES_IOPORT, 0, res->ports);
+		res->ports = 0;
+	}
+	if (res->memory) {
+		bus_release_resource(dev, SYS_RES_MEMORY, 0, res->memory);
+		res->memory = 0;
+	}
+	if (res->drq) {
+		bus_release_resource(dev, SYS_RES_DRQ, 0, res->drq);
+		res->drq = 0;
+	}
+	if (res->irq) {
+		bus_release_resource(dev, SYS_RES_IRQ, 0, res->irq);
+		res->irq = 0;
+	}
+}
+
+static int
+isa_compat_probe(device_t dev)
+{
+	struct isa_device *dvp = device_get_softc(dev);
+	struct isa_compat_resources res;
+	
+	bzero(&res, sizeof(res));
+	/*
+	 * Fill in the isa_device fields.
+	 */
+	dvp->id_id = isa_compat_nextid();
+	dvp->id_driver = device_get_driver(dev)->priv;
+	dvp->id_iobase = isa_get_port(dev);
+	dvp->id_irq = (1 << isa_get_irq(dev));
+	dvp->id_drq = isa_get_drq(dev);
+	dvp->id_maddr = (void *)isa_get_maddr(dev);
+	dvp->id_msize = isa_get_msize(dev);
+	dvp->id_unit = device_get_unit(dev);
+	dvp->id_flags = isa_get_flags(dev);
+	dvp->id_enabled = device_is_enabled(dev);
+
+	/*
+	 * Do the wrapped probe.
+	 */
+	if (dvp->id_driver->probe) {
+		int portsize;
+		isa_compat_alloc_resources(dev, &res);
+		if (res.memory)
+			dvp->id_maddr = rman_get_virtual(res.memory);
+		else
+			dvp->id_maddr = 0;
+		portsize = dvp->id_driver->probe(dvp);
+		isa_compat_release_resources(dev, &res);
+		if (portsize != 0) {
+			if (portsize > 0)
+				isa_set_portsize(dev, portsize);
+			if (dvp->id_iobase != isa_get_port(dev))
+				isa_set_port(dev, dvp->id_iobase);
+			if (dvp->id_irq != (1 << isa_get_irq(dev)))
+				isa_set_irq(dev, ffs(dvp->id_irq) - 1);
+			if (dvp->id_drq != isa_get_drq(dev))
+				isa_set_drq(dev, dvp->id_drq);
+			if (dvp->id_maddr != (void *) isa_get_maddr(dev))
+				isa_set_maddr(dev, (int) dvp->id_maddr);
+			if (dvp->id_msize != isa_get_msize(dev))
+				isa_set_msize(dev, dvp->id_msize);
+			return 0;
+		}
+	}
+	return ENXIO;
+}
+
+static int
+isa_compat_attach(device_t dev)
+{
+	struct isa_device *dvp = device_get_softc(dev);
+	struct isa_compat_resources res;
+	int error;
+
+	bzero(&res, sizeof(res));
+	isa_compat_alloc_resources(dev, &res);
+	if (dvp->id_driver->attach)
+		dvp->id_driver->attach(dvp);
+	if (res.irq && dvp->id_irq && dvp->id_intr) {
+		void *ih;
+
+		error = BUS_SETUP_INTR(device_get_parent(dev), dev,
+				       res.irq,
+				       dvp->id_intr,
+				       (void *)(uintptr_t)dvp->id_unit,
+				       &ih);
+		if (error)
+			printf("isa_compat_attach: failed to setup intr: %d\n",
+			       error);
+	}
+	return 0;
+}
+
+static device_method_t isa_compat_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		isa_compat_probe),
+	DEVMETHOD(device_attach,	isa_compat_attach),
+
+	{ 0, 0 }
+};
+
+/*
+ * Create a new style driver around each old isa driver.
+ */
+void
+isa_wrap_old_drivers(void)
+{
+	int i;
+	struct old_isa_driver *op;
+	devclass_t isa_devclass = devclass_find("isa");
+
+	for (i = 0, op = &old_drivers[0]; i < old_drivers_count; i++, op++) {
+		driver_t *driver;
+		driver = malloc(sizeof(driver_t), M_DEVBUF, M_NOWAIT);
+		if (!driver)
+			continue;
+		bzero(driver, sizeof(driver_t));
+		driver->name = op->driver->name;
+		driver->methods = isa_compat_methods;
+		driver->type = op->type;
+		driver->softc = sizeof(struct isa_device *);
+		driver->priv = op->driver;
+		devclass_add_driver(isa_devclass, driver);
+	}
+}
+
+int
+haveseen_isadev(dvp, checkbits)
+	struct isa_device *dvp;
+	u_int   checkbits;
+{
+	printf("haveseen_isadev() called - FIXME!\n");
+	return 0;
+}
+
+void
+reconfig_isadev(isdp, mp)
+	struct isa_device *isdp;
+	u_int *mp;
+{
+	printf("reconfig_isadev() called - FIXME!\n");
+}