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, 506 insertions, 956 deletions

diff --git a/sys/i386/isa/isa.c b/sys/i386/isa/isa.c
index 1e91da8..4b48e36 100644
--- a/sys/i386/isa/isa.c
+++ b/sys/i386/isa/isa.c
@@ -1,10 +1,7 @@
 /*-
- * Copyright (c) 1991 The Regents of the University of California.
+ * Copyright (c) 1998 Doug Rabson
  * 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:
@@ -13,18 +10,11 @@
  * 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
+ * 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 REGENTS OR CONTRIBUTORS BE LIABLE
+ * 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)
@@ -33,1041 +23,601 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.117 1998/11/29 15:42:40 phk Exp $
+ *	$Id: isa.c,v 1.4 1998/09/16 08:23:51 dfr Exp $
  */
 
 /*
- * code to manage AT bus
+ * Modifications for Intel architecture by Garrett A. Wollman.
+ * Copyright 1998 Massachusetts Institute of Technology
  *
- * 92/08/18  Frank P. MacLachlan (fpm@crash.cts.com):
- * Fixed uninitialized variable problem and added code to deal
- * with DMA page boundaries in isa_dmarangecheck().  Fixed word
- * mode DMA count compution and reorganized DMA setup code in
- * isa_dmastart()
+ * Permission to use, copy, modify, and distribute this software and
+ * its documentation for any purpose and without fee is hereby
+ * granted, provided that both the above copyright notice and this
+ * permission notice appear in all copies, that both the above
+ * copyright notice and this permission notice appear in all
+ * supporting documentation, and that the name of M.I.T. not be used
+ * in advertising or publicity pertaining to distribution of the
+ * software without specific, written prior permission.  M.I.T. makes
+ * no representations about the suitability of this software for any
+ * purpose.  It is provided "as is" without express or implied
+ * warranty.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY M.I.T. ``AS IS''.  M.I.T. DISCLAIMS
+ * ALL EXPRESS OR IMPLIED WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT
+ * SHALL M.I.T. 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/param.h>
 #include <sys/systm.h>
-#include <sys/buf.h>
+#include <sys/kernel.h>
+#include <sys/bus.h>
 #include <sys/malloc.h>
-#include <machine/ipl.h>
-#include <machine/md_var.h>
-#ifdef APIC_IO
-#include <machine/smp.h>
-#endif /* APIC_IO */
-#include <vm/vm.h>
-#include <vm/vm_param.h>
-#include <vm/pmap.h>
-#include <i386/isa/isa_device.h>
-#include <i386/isa/intr_machdep.h>
-#include <i386/isa/isa.h>
-#include <i386/isa/ic/i8237.h>
-
-#include <sys/interrupt.h>
-
-#include "pnp.h"
-#if NPNP > 0
-#include <i386/isa/pnp.h>
-#endif
+#include <sys/module.h>
+#include <machine/bus.h>
+#include <sys/rman.h>
 
-/*
-**  Register definitions for DMA controller 1 (channels 0..3):
-*/
-#define	DMA1_CHN(c)	(IO_DMA1 + 1*(2*(c)))	/* addr reg for channel c */
-#define	DMA1_SMSK	(IO_DMA1 + 1*10)	/* single mask register */
-#define	DMA1_MODE	(IO_DMA1 + 1*11)	/* mode register */
-#define	DMA1_FFC	(IO_DMA1 + 1*12)	/* clear first/last FF */
+#include <machine/resource.h>
 
-/*
-**  Register definitions for DMA controller 2 (channels 4..7):
-*/
-#define	DMA2_CHN(c)	(IO_DMA2 + 2*(2*(c)))	/* addr reg for channel c */
-#define	DMA2_SMSK	(IO_DMA2 + 2*10)	/* single mask register */
-#define	DMA2_MODE	(IO_DMA2 + 2*11)	/* mode register */
-#define	DMA2_FFC	(IO_DMA2 + 2*12)	/* clear first/last FF */
+#include <isa/isavar.h>
 
-static void config_isadev __P((struct isa_device *isdp, u_int *mp));
-static void config_isadev_c __P((struct isa_device *isdp, u_int *mp,
-				 int reconfig));
-static void conflict __P((struct isa_device *dvp, struct isa_device *tmpdvp,
-			  int item, char const *whatnot, char const *reason,
-			  char const *format));
-static int haveseen __P((struct isa_device *dvp, struct isa_device *tmpdvp,
-			 u_int checkbits));
-static int isa_dmarangecheck __P((caddr_t va, u_int length, int chan));
+MALLOC_DEFINE(M_ISADEV, "isadev", "ISA device");
 
 /*
- * print a conflict message
+ * The structure used to attach devices to the isa bus.
  */
+struct isa_device {
+	short		id_port[ISA_NPORT_IVARS];
+	u_short		id_portsize[ISA_NPORT_IVARS];
+	vm_offset_t	id_maddr[ISA_NMEM_IVARS];
+	vm_size_t	id_msize[ISA_NMEM_IVARS];
+	int		id_irq[ISA_NIRQ_IVARS];
+	int		id_drq[ISA_NDRQ_IVARS];
+	int		id_flags;
+	struct resource	*id_portres[ISA_NPORT_IVARS];
+	struct resource	*id_memres[ISA_NMEM_IVARS];
+	struct resource	*id_irqres[ISA_NIRQ_IVARS];
+	struct resource	*id_drqres[ISA_NDRQ_IVARS];
+};
+
+#define DEVTOISA(dev)	((struct isa_device *) device_get_ivars(dev))
+
+static devclass_t isa_devclass;
+
 static void
-conflict(dvp, tmpdvp, item, whatnot, reason, format)
-	struct isa_device	*dvp;
-	struct isa_device	*tmpdvp;
-	int			item;
-	char const		*whatnot;
-	char const		*reason;
-	char const		*format;
+isa_add_device(device_t dev, const char *name, int unit)
 {
-	printf("%s%d not %sed due to %s conflict with %s%d at ",
-		dvp->id_driver->name, dvp->id_unit, whatnot, reason,
-		tmpdvp->id_driver->name, tmpdvp->id_unit);
-	printf(format, item);
-	printf("\n");
-}
+	struct	isa_device *idev;
+	device_t	child;
+	int		sensitive, t;
+	static	device_t last_sensitive;
 
-/*
- * Check to see if things are already in use, like IRQ's, I/O addresses
- * and Memory addresses.
- */
-static int
-haveseen(dvp, tmpdvp, checkbits)
-	struct isa_device *dvp;
-	struct isa_device *tmpdvp;
-	u_int	checkbits;
-{
-	/*
-	 * Ignore all conflicts except IRQ ones if conflicts are allowed.
-	 */
-	if (dvp->id_conflicts)
-		checkbits &= ~(CC_DRQ | CC_IOADDR | CC_MEMADDR);
-	/*
-	 * Only check against devices that have already been found.
-	 */
-	if (tmpdvp->id_alive) {
-		char const *whatnot;
+	if (resource_int_value(name, unit, "sensitive", &sensitive) != 0)
+		sensitive = 0;
 
-		/*
-		 * Check for device driver & unit conflict; just drop probing
-		 * a device which has already probed true.  This is usually
-		 * not strictly a conflict, but rather the case of somebody
-		 * having specified several mutually exclusive configurations
-		 * for a single device.
-		 */
-		if (tmpdvp->id_driver == dvp->id_driver &&
-		    tmpdvp->id_unit == dvp->id_unit) {
-		    	return 1;
-		}
+	idev = malloc(sizeof(struct isa_device), M_ISADEV, M_NOWAIT);
+	if (!idev)
+		return;
+	bzero(idev, sizeof *idev);
 
-		whatnot = checkbits & CC_ATTACH ? "attach" : "prob";
-		/*
-		 * Check for I/O address conflict.  We can only check the
-		 * starting address of the device against the range of the
-		 * device that has already been probed since we do not
-		 * know how many I/O addresses this device uses.
-		 */
-		if (checkbits & CC_IOADDR && tmpdvp->id_alive != -1) {
-			if ((dvp->id_iobase >= tmpdvp->id_iobase) &&
-			    (dvp->id_iobase <=
-				  (tmpdvp->id_iobase + tmpdvp->id_alive - 1))) {
-				if (!(checkbits & CC_QUIET))
-					conflict(dvp, tmpdvp, dvp->id_iobase,
-					    whatnot, "I/O address", "0x%x");
-				return 1;
-			}
-		}
-		/*
-		 * Check for Memory address conflict.  We can check for
-		 * range overlap, but it will not catch all cases since the
-		 * driver may adjust the msize paramater during probe, for
-		 * now we just check that the starting address does not
-		 * fall within any allocated region.
-		 * XXX could add a second check after the probe for overlap,
-		 * since at that time we would know the full range.
-		 * XXX KERNBASE is a hack, we should have vaddr in the table!
-		 */
-		if (checkbits & CC_MEMADDR && tmpdvp->id_maddr) {
-			if ((KERNBASE + dvp->id_maddr >= tmpdvp->id_maddr) &&
-			    (KERNBASE + dvp->id_maddr <=
-			     (tmpdvp->id_maddr + tmpdvp->id_msize - 1))) {
-				if (!(checkbits & CC_QUIET))
-					conflict(dvp, tmpdvp,
-					    (int)dvp->id_maddr, whatnot,
-					    "maddr", "0x%x");
-				return 1;
-			}
-		}
-		/*
-		 * Check for IRQ conflicts.
-		 */
-		if (checkbits & CC_IRQ && tmpdvp->id_irq) {
-			if (tmpdvp->id_irq == dvp->id_irq) {
-				if (!(checkbits & CC_QUIET))
-					conflict(dvp, tmpdvp,
-					    ffs(dvp->id_irq) - 1, whatnot,
-					    "irq", "%d");
-				return 1;
-			}
-		}
-		/*
-		 * Check for DRQ conflicts.
-		 */
-		if (checkbits & CC_DRQ && tmpdvp->id_drq != -1) {
-			if (tmpdvp->id_drq == dvp->id_drq) {
-				if (!(checkbits & CC_QUIET))
-					conflict(dvp, tmpdvp, dvp->id_drq,
-					    whatnot, "drq", "%d");
-				return 1;
-			}
-		}
-	}
-	return 0;
-}
+	if (resource_int_value(name, unit, "port", &t) == 0)
+		idev->id_port[0] = t;
+	else
+		idev->id_port[0] = -1;
+	idev->id_port[1] = 0;
 
-#ifdef RESOURCE_CHECK
-#include <sys/drvresource.h>
+	if (resource_int_value(name, unit, "portsize", &t) == 0)
+		idev->id_portsize[0] = t;
+	else
+		idev->id_portsize[0] = 0;
+	idev->id_portsize[1] = 0;
 
-static int
-checkone (struct isa_device *dvp, int type, addr_t low, addr_t high, 
-	  char *resname, char *resfmt, int attaching)
-{
-	int result = 0;
-	if (bootverbose) {
-		if (low == high)
-			printf("\tcheck %s: 0x%x\n", resname, low);
-		else
-			printf("\tcheck %s: 0x%x to 0x%x\n", 
-			       resname, low, high);
-	}
-	if (resource_check(type, RESF_NONE, low, high) != NULL) {
-		char *whatnot = attaching ? "attach" : "prob";
-		static struct isa_device dummydev;
-		static struct isa_driver dummydrv;
-		struct isa_device *tmpdvp = &dummydev;
+	if (resource_int_value(name, unit, "maddr", &t) == 0)
+		idev->id_maddr[0] = t;
+	else
+		idev->id_maddr[0] = 0;
+	idev->id_maddr[1] = 0;
 
-		dummydev.id_driver = &dummydrv;
-		dummydev.id_unit = 0;
-		dummydrv.name = "pci";
-		conflict(dvp, tmpdvp, low, whatnot, resname, resfmt);
-		result = 1;
-	} else if (attaching) {
-		if (low == high)
-			printf("\tregister %s: 0x%x\n", resname, low);
-		else
-			printf("\tregister %s: 0x%x to 0x%x\n",
-			       resname, low, high);
-		resource_claim(dvp, type, RESF_NONE, low, high);
-	}
-	return (result);
-}
+	if (resource_int_value(name, unit, "msize", &t) == 0)
+		idev->id_msize[0] = t;
+	else
+		idev->id_msize[0] = 0;
+	idev->id_msize[1] = 0;
 
-static int 
-check_pciconflict(struct isa_device *dvp, int checkbits)
-{
-	int result = 0;
-	int attaching = (checkbits & CC_ATTACH) != 0;
+	if (resource_int_value(name, unit, "flags", &t) == 0)
+		idev->id_flags = t;
+	else
+		idev->id_flags = 0;
 
-	if (checkbits & CC_MEMADDR) {
-		long maddr = dvp->id_maddr;
-		long msize = dvp->id_msize;
-		if (msize > 0) {
-			if (checkone(dvp, REST_MEM, maddr, maddr + msize - 1,
-				     "maddr", "0x%x", attaching) != 0) {
-				result = 1;
-				attaching = 0;
-			}
-		}
-	}
-	if (checkbits & CC_IOADDR) {
-		unsigned iobase = dvp->id_iobase;
-		unsigned iosize = dvp->id_alive;
-		if (iosize == -1)
-			iosize = 1; /* XXX can't do much about this ... */
-		if (iosize > 0) {
-			if (checkone(dvp, REST_PORT, iobase, iobase + iosize -1,
-				     "I/O address", "0x%x", attaching) != 0) {
-				result = 1;
-				attaching = 0;
-			}
-		}
-	}
-	if (checkbits & CC_IRQ) {
-		int irq = ffs(dvp->id_irq) - 1;
-		if (irq >= 0) {
-			if (checkone(dvp, REST_INT, irq, irq, 
-				     "irq", "%d", attaching) != 0) {
-				result = 1;
-				attaching = 0;
-			}
-		}
-	}
-	if (checkbits & CC_DRQ) {
-		int drq = dvp->id_drq;
-		if (drq >= 0) {
-			if (checkone(dvp, REST_DMA, drq, drq, 
-				     "drq", "%d", attaching) != 0) {
-				result = 1;
-				attaching = 0;
-			}
-		}
-	}
-	if (result != 0)
-		resource_free (dvp);
-	return (result);
-}
-#endif /* RESOURCE_CHECK */
+	if (resource_int_value(name, unit, "irq", &t) == 0)
+		idev->id_irq[0] = t;
+	else
+		idev->id_irq[0] = -1;
+	idev->id_irq[1] = -1;
 
-/*
- * Search through all the isa_devtab_* tables looking for anything that
- * conflicts with the current device.
- */
-int
-haveseen_isadev(dvp, checkbits)
-	struct isa_device *dvp;
-	u_int	checkbits;
-{
-#if NPNP > 0
-	struct pnp_dlist_node *nod;
-#endif
-	struct isa_device *tmpdvp;
-	int	status = 0;
+	if (resource_int_value(name, unit, "drq", &t) == 0)
+		idev->id_drq[0] = t;
+	else
+		idev->id_drq[0] = -1;
+	idev->id_drq[1] = -1;
 
-	for (tmpdvp = isa_devtab_tty; tmpdvp->id_driver; tmpdvp++) {
-		status |= haveseen(dvp, tmpdvp, checkbits);
-		if (status)
-			return status;
-	}
-	for (tmpdvp = isa_devtab_bio; tmpdvp->id_driver; tmpdvp++) {
-		status |= haveseen(dvp, tmpdvp, checkbits);
-		if (status)
-			return status;
-	}
-	for (tmpdvp = isa_devtab_net; tmpdvp->id_driver; tmpdvp++) {
-		status |= haveseen(dvp, tmpdvp, checkbits);
-		if (status)
-			return status;
-	}
-	for (tmpdvp = isa_devtab_cam; tmpdvp->id_driver; tmpdvp++) {
-		status |= haveseen(dvp, tmpdvp, checkbits);
-		if (status)
-			return status;
-	}
-	for (tmpdvp = isa_devtab_null; tmpdvp->id_driver; tmpdvp++) {
-		status |= haveseen(dvp, tmpdvp, checkbits);
-		if (status)
-			return status;
-	}
-#if NPNP > 0
-	for (nod = pnp_device_list; nod != NULL; nod = nod->next)
-		if (status |= haveseen(dvp, &(nod->dev), checkbits))
-			return status;
-#endif
-#ifdef RESOURCE_CHECK
-	if (!dvp->id_conflicts)
-		status = check_pciconflict(dvp, checkbits);
-	else if (bootverbose)
-		printf("\tnot checking for resource conflicts ...\n");
-#endif /* RESOURCE_CHECK */
-	return(status);
+	if (sensitive)
+		child = device_add_child_after(dev, last_sensitive, name, 
+					       unit, idev);
+	else
+		child = device_add_child(dev, name, unit, idev);
+	if (child == 0)
+		return;
+	else if (sensitive)
+		last_sensitive = child;
+
+	if (resource_int_value(name, unit, "disabled", &t) == 0 && t != 0)
+		device_disable(child);
 }
 
 /*
- * Configure all ISA devices
+ * At 'probe' time, we add all the devices which we know about to the
+ * bus.  The generic attach routine will probe and attach them if they
+ * are alive.
  */
-void
-isa_configure()
+static int
+isa_probe(device_t dev)
 {
-	struct isa_device *dvp;
+	int i;
+	static char buf[] = "isaXXX";
 
-	printf("Probing for devices on the ISA bus:\n");
-	/* First probe all the sensitive probes */
-	for (dvp = isa_devtab_tty; dvp->id_driver; dvp++)
-		if (dvp->id_driver->sensitive_hw)
-			config_isadev(dvp, &tty_imask);
-	for (dvp = isa_devtab_bio; dvp->id_driver; dvp++)
-		if (dvp->id_driver->sensitive_hw)
-			config_isadev(dvp, &bio_imask);
-	for (dvp = isa_devtab_net; dvp->id_driver; dvp++)
-		if (dvp->id_driver->sensitive_hw)
-			config_isadev(dvp, &net_imask);
-	for (dvp = isa_devtab_cam; dvp->id_driver; dvp++)
-		if (dvp->id_driver->sensitive_hw)
-			config_isadev(dvp, &cam_imask);
-	for (dvp = isa_devtab_null; dvp->id_driver; dvp++)
-		if (dvp->id_driver->sensitive_hw)
-			config_isadev(dvp, (u_int *)NULL);
-
-	/* Then all the bad ones */
-	for (dvp = isa_devtab_tty; dvp->id_driver; dvp++)
-		if (!dvp->id_driver->sensitive_hw)
-			config_isadev(dvp, &tty_imask);
-	for (dvp = isa_devtab_bio; dvp->id_driver; dvp++)
-		if (!dvp->id_driver->sensitive_hw)
-			config_isadev(dvp, &bio_imask);
-	for (dvp = isa_devtab_net; dvp->id_driver; dvp++)
-		if (!dvp->id_driver->sensitive_hw)
-			config_isadev(dvp, &net_imask);
-	for (dvp = isa_devtab_cam; dvp->id_driver; dvp++)
-		if (!dvp->id_driver->sensitive_hw)
-			config_isadev(dvp, &cam_imask);
-	for (dvp = isa_devtab_null; dvp->id_driver; dvp++)
-		if (!dvp->id_driver->sensitive_hw)
-			config_isadev(dvp, (u_int *)NULL);
-
-/*
- * XXX we should really add the tty device to net_imask when the line is
- * switched to SLIPDISC, and then remove it when it is switched away from
- * SLIPDISC.  No need to block out ALL ttys during a splimp when only one
- * of them is running slip.
- *
- * XXX actually, blocking all ttys during a splimp doesn't matter so much
- * with sio because the serial interrupt layer doesn't use tty_imask.  Only
- * non-serial ttys suffer.  It's more stupid that ALL 'net's are blocked
- * during spltty.
- */
-#include "sl.h"
-#if NSL > 0
-	net_imask |= tty_imask;
-	tty_imask = net_imask;
-#endif
-
-	if (bootverbose)
-		printf("imasks: bio %x, tty %x, net %x\n",
-		       bio_imask, tty_imask, net_imask);
+	device_set_desc(dev, "ISA bus");
 
 	/*
-	 * Finish initializing intr_mask[].  Note that the partly
-	 * constructed masks aren't actually used since we're at splhigh.
-	 * For fully dynamic initialization, register_intr() and
-	 * icu_unset() will have to adjust the masks for _all_
-	 * interrupts and for tty_imask, etc.
+	 * Add all devices configured to be attached to isa0.
 	 */
-	for (dvp = isa_devtab_tty; dvp->id_driver; dvp++)
-		register_imask(dvp, tty_imask);
-	for (dvp = isa_devtab_bio; dvp->id_driver; dvp++)
-		register_imask(dvp, bio_imask);
-	for (dvp = isa_devtab_net; dvp->id_driver; dvp++)
-		register_imask(dvp, net_imask);
-	for (dvp = isa_devtab_cam; dvp->id_driver; dvp++)
-		register_imask(dvp, cam_imask);
-	for (dvp = isa_devtab_null; dvp->id_driver; dvp++)
-		register_imask(dvp, SWI_CLOCK_MASK);
-}
-
-/*
- * Configure an ISA device.
- */
-static void
-config_isadev(isdp, mp)
-	struct isa_device *isdp;
-	u_int *mp;
-{
-	config_isadev_c(isdp, mp, 0);
-}
-
-void
-reconfig_isadev(isdp, mp)
-	struct isa_device *isdp;
-	u_int *mp;
-{
-	config_isadev_c(isdp, mp, 1);
-}
-
-static void
-config_isadev_c(isdp, mp, reconfig)
-	struct isa_device *isdp;
-	u_int *mp;
-	int reconfig;
-{
-	u_int checkbits;
-	int id_alive;
-	int last_alive;
-	struct isa_driver *dp = isdp->id_driver;
-
-	if (!isdp->id_enabled) {
-	    if (bootverbose)
-		printf("%s%d: disabled, not probed.\n", dp->name, isdp->id_unit);
-	    return;
+	sprintf(buf, "isa%d", device_get_unit(dev));
+	for (i = resource_query_string(-1, "at", buf);
+	     i != -1;
+	     i = resource_query_string(i, "at", buf)) {
+		isa_add_device(dev, resource_query_name(i),
+			       resource_query_unit(i));
 	}
-	checkbits = CC_DRQ | CC_IOADDR | CC_MEMADDR;
-	if (!reconfig && haveseen_isadev(isdp, checkbits))
-		return;
-	if (!reconfig && isdp->id_maddr) {
-		isdp->id_maddr -= ISA_HOLE_START;
-		isdp->id_maddr += atdevbase;
-	}
-	if (reconfig) {
-		last_alive = isdp->id_alive;
-		isdp->id_reconfig = 1;
-	}
-	else {
-		last_alive = 0;
-		isdp->id_reconfig = 0;
-	}
-	id_alive = (*dp->probe)(isdp);
-	if (id_alive) {
-		/*
-		 * Only print the I/O address range if id_alive != -1
-		 * Right now this is a temporary fix just for the new
-		 * NPX code so that if it finds a 486 that can use trap
-		 * 16 it will not report I/O addresses.
-		 * Rod Grimes 04/26/94
-		 */
-		if (!isdp->id_reconfig) {
-			printf("%s%d", dp->name, isdp->id_unit);
-			if (id_alive != -1) {
-				if (isdp->id_iobase == -1)
-					printf(" at");
-				else {
-					printf(" at 0x%x", isdp->id_iobase);
-					if (isdp->id_iobase + id_alive - 1 !=
-					    isdp->id_iobase) {
-						printf("-0x%x",
-						       isdp->id_iobase + id_alive - 1);
-					}
-				}
-			}
-			if (isdp->id_irq)
-				printf(" irq %d", ffs(isdp->id_irq) - 1);
-			if (isdp->id_drq != -1)
-				printf(" drq %d", isdp->id_drq);
-			if (isdp->id_maddr)
-				printf(" maddr 0x%lx", kvtop(isdp->id_maddr));
-			if (isdp->id_msize)
-				printf(" msize %d", isdp->id_msize);
-			if (isdp->id_flags)
-				printf(" flags 0x%x", isdp->id_flags);
-			if (isdp->id_iobase && !(isdp->id_iobase & 0xf300)) {
-				printf(" on motherboard");
-			} else if (isdp->id_iobase >= 0x1000 &&
-				    !(isdp->id_iobase & 0x300)) {
-				printf (" on eisa slot %d",
-					isdp->id_iobase >> 12);
-			} else {
-				printf (" on isa");
-			}
-			printf("\n");
-			/*
-			 * Check for conflicts again.  The driver may have
-			 * changed *dvp.  We should weaken the early check
-			 * since the driver may have been able to change
-			 * *dvp to avoid conflicts if given a chance.  We
-			 * already skip the early check for IRQs and force
-			 * a check for IRQs in the next group of checks.
-			 */
-			checkbits |= CC_ATTACH | CC_IRQ;
-			if (haveseen_isadev(isdp, checkbits))
-				return;
-			isdp->id_alive = id_alive;
-		}
-		(*dp->attach)(isdp);
-		if (isdp->id_irq != 0 && isdp->id_intr == NULL)
-			printf("%s%d: irq with no handler\n",
-			    dp->name, isdp->id_unit);
-		if (isdp->id_irq != 0 && isdp->id_intr != NULL) {
-#ifdef APIC_IO
-			/*
-			 * Some motherboards use upper IRQs for traditional
-			 * ISA INTerrupt sources.  In particular we have
-			 * seen the secondary IDE connected to IRQ20.
-			 * This code detects and fixes this situation.
-			 */
-			u_int	apic_mask;
-			int	rirq;
 
-			apic_mask = isa_apic_mask(isdp->id_irq);
-			if (apic_mask != isdp->id_irq) {
-				rirq = ffs(isdp->id_irq) - 1;
-				isdp->id_irq = apic_mask;
-				undirect_isa_irq(rirq);	/* free for ISA */
-			}
-#endif /* APIC_IO */
-			register_intr(ffs(isdp->id_irq) - 1, isdp->id_id,
-				      isdp->id_ri_flags, isdp->id_intr,
-				      mp, isdp->id_unit);
-		}
-	} else {
-		if (isdp->id_reconfig) {
-			(*dp->attach)(isdp); /* reconfiguration attach */
-		}
-		if (!last_alive) {
-			if (!isdp->id_reconfig) {
-				printf("%s%d not found",
-				       dp->name, isdp->id_unit);
-				if (isdp->id_iobase != -1)
-					printf(" at 0x%x", isdp->id_iobase);
-				printf("\n");
-			}
-		} else {
-#if 0
-			/* This code has not been tested.... */
-			if (isdp->id_irq != 0 && isdp->id_intr != NULL) {
-				icu_unset(ffs(isdp->id_irq) - 1,
-						isdp->id_intr);
-				if (mp)
-					INTRUNMASK(*mp, isdp->id_irq);
-			}
-#else
-			printf ("icu_unset() not supported here ...\n");
-#endif
-		}
+	/*
+	 * and isa?
+	 */
+	for (i = resource_query_string(-1, "at", "isa");
+	     i != -1;
+	     i = resource_query_string(i, "at", "isa")) {
+		isa_add_device(dev, resource_query_name(i),
+			       resource_query_unit(i));
 	}
-}
 
-static caddr_t	dma_bouncebuf[8];
-static u_int	dma_bouncebufsize[8];
-static u_int8_t	dma_bounced = 0;
-static u_int8_t	dma_busy = 0;		/* Used in isa_dmastart() */
-static u_int8_t	dma_inuse = 0;		/* User for acquire/release */
-static u_int8_t dma_auto_mode = 0;
+	isa_wrap_old_drivers();
 
-#define VALID_DMA_MASK (7)
+	return 0;
+}
 
-/* high byte of address is stored in this port for i-th dma channel */
-static int dmapageport[8] = { 0x87, 0x83, 0x81, 0x82, 0x8f, 0x8b, 0x89, 0x8a };
+extern device_t isa_bus_device;
 
-/*
- * Setup a DMA channel's bounce buffer.
- */
-void
-isa_dmainit(chan, bouncebufsize)
-	int chan;
-	u_int bouncebufsize;
+static int
+isa_attach(device_t dev)
 {
-	void *buf;
-
-#ifdef DIAGNOSTIC
-	if (chan & ~VALID_DMA_MASK)
-		panic("isa_dmainit: channel out of range");
-
-	if (dma_bouncebuf[chan] != NULL)
-		panic("isa_dmainit: impossible request"); 
-#endif
-
-	dma_bouncebufsize[chan] = bouncebufsize;
-
-	/* Try malloc() first.  It works better if it works. */
-	buf = malloc(bouncebufsize, M_DEVBUF, M_NOWAIT);
-	if (buf != NULL) {
-		if (isa_dmarangecheck(buf, bouncebufsize, chan) == 0) {
-			dma_bouncebuf[chan] = buf;
-			return;
-		}
-		free(buf, M_DEVBUF);
-	}
-	buf = contigmalloc(bouncebufsize, M_DEVBUF, M_NOWAIT, 0ul, 0xfffffful,
-			   1ul, chan & 4 ? 0x20000ul : 0x10000ul);
-	if (buf == NULL)
-		printf("isa_dmainit(%d, %d) failed\n", chan, bouncebufsize);
-	else
-		dma_bouncebuf[chan] = buf;
+	/*
+	 * Arrange for bus_generic_attach(dev) to be called later.
+	 */
+	isa_bus_device = dev;
+	return 0;
 }
 
-/*
- * Register a DMA channel's usage.  Usually called from a device driver
- * in open() or during its initialization.
- */
-int
-isa_dma_acquire(chan)
-	int chan;
+static void
+isa_print_child(device_t bus, device_t dev)
 {
-#ifdef DIAGNOSTIC
-	if (chan & ~VALID_DMA_MASK)
-		panic("isa_dma_acquire: channel out of range");
-#endif
-
-	if (dma_inuse & (1 << chan)) {
-		printf("isa_dma_acquire: channel %d already in use\n", chan);
-		return (EBUSY);
-	}
-	dma_inuse |= (1 << chan);
-	dma_auto_mode &= ~(1 << chan);
-
-	return (0);
+	struct	isa_device *id = DEVTOISA(dev);
+
+	if (id->id_port[0] > 0 || id->id_port[1] > 0
+	    || id->id_maddr[0] > 0 || id->id_maddr[1] > 0
+	    || id->id_irq[0] >= 0 || id->id_irq[1] >= 0
+	    || id->id_drq[0] >= 0 || id->id_drq[1] >= 0)
+		printf(" at");
+	if (id->id_port[0] > 0 && id->id_port[1] > 0) {
+		printf(" ports %#x", (u_int)id->id_port[0]);
+		if (id->id_portsize[0] > 1)
+			printf("-%#x", (u_int)(id->id_port[0] 
+					       + id->id_portsize[0] - 1));
+		printf(" and %#x", (u_int)id->id_port[1]);
+		if (id->id_portsize[1] > 1)
+			printf("-%#x", (u_int)(id->id_port[1] 
+					       + id->id_portsize[1] - 1));
+	} else if (id->id_port[0] > 0) {
+		printf(" port %#x", (u_int)id->id_port[0]);
+		if (id->id_portsize[0] > 1)
+			printf("-%#x", (u_int)(id->id_port[0]
+					       + id->id_portsize[0] - 1));
+	} else if (id->id_port[1] > 0) {
+		printf(" port %#x", (u_int)id->id_port[1]);
+		if (id->id_portsize[1] > 1)
+			printf("-%#x", (u_int)(id->id_port[1]
+					       + id->id_portsize[1] - 1));
+	}
+	if (id->id_maddr[0] && id->id_maddr[1]) {
+		printf(" iomem %#x", (u_int)id->id_maddr[0]);
+		if (id->id_msize[0])
+			printf("-%#x", (u_int)(id->id_maddr[0] 
+					       + id->id_msize[0] - 1));
+		printf(" and %#x", (u_int)id->id_maddr[1]);
+		if (id->id_msize[1])
+			printf("-%#x", (u_int)(id->id_maddr[1] 
+					       + id->id_msize[1] - 1));
+	} else if (id->id_maddr[0]) {
+		printf(" iomem %#x", (u_int)id->id_maddr[0]);
+		if (id->id_msize[0])
+			printf("-%#x", (u_int)(id->id_maddr[0]
+					       + id->id_msize[0] - 1));
+	} else if (id->id_maddr[1]) {
+		printf(" iomem %#x", (u_int)id->id_maddr[1]);
+		if (id->id_msize[1])
+			printf("-%#x", (u_int)(id->id_maddr[1]
+					       + id->id_msize[1] - 1));
+	}
+	if (id->id_irq[0] >= 0 && id->id_irq[1] >= 0)
+		printf(" irqs %d and %d", id->id_irq[0], id->id_irq[1]);
+	else if (id->id_irq[0] >= 0)
+		printf(" irq %d", id->id_irq[0]);
+	else if (id->id_irq[1] >= 0)
+		printf(" irq %d", id->id_irq[1]);
+	if (id->id_drq[0] >= 0 && id->id_drq[1] >= 0)
+		printf(" drqs %d and %d", id->id_drq[0], id->id_drq[1]);
+	else if (id->id_drq[0] >= 0)
+		printf(" drq %d", id->id_drq[0]);
+	else if (id->id_drq[1] >= 0)
+		printf(" drq %d", id->id_drq[1]);
+
+	if (id->id_flags)
+		printf(" flags %#x", id->id_flags);
+
+	printf(" on %s%d",
+	       device_get_name(bus), device_get_unit(bus));
 }
 
-/*
- * Unregister a DMA channel's usage.  Usually called from a device driver
- * during close() or during its shutdown.
- */
-void
-isa_dma_release(chan)
-	int chan;
+static int
+isa_read_ivar(device_t bus, device_t dev, int index, uintptr_t * result)
 {
-#ifdef DIAGNOSTIC
-	if (chan & ~VALID_DMA_MASK)
-		panic("isa_dma_release: channel out of range");
-
-	if ((dma_inuse & (1 << chan)) == 0)
-		printf("isa_dma_release: channel %d not in use\n", chan);
-#endif
-
-	if (dma_busy & (1 << chan)) {
-		dma_busy &= ~(1 << chan);
-		/* 
-		 * XXX We should also do "dma_bounced &= (1 << chan);"
-		 * because we are acting on behalf of isa_dmadone() which
-		 * was not called to end the last DMA operation.  This does
-		 * not matter now, but it may in the future.
-		 */
-	}
-
-	dma_inuse &= ~(1 << chan);
-	dma_auto_mode &= ~(1 << chan);
+	struct isa_device* idev = DEVTOISA(dev);
+
+	switch (index) {
+	case ISA_IVAR_PORT_0:
+		*result = idev->id_port[0];
+		break;
+	case ISA_IVAR_PORT_1:
+		*result = idev->id_port[1];
+		break;
+	case ISA_IVAR_PORTSIZE_0:
+		*result = idev->id_portsize[0];
+		break;
+	case ISA_IVAR_PORTSIZE_1:
+		*result = idev->id_portsize[1];
+		break;
+	case ISA_IVAR_MADDR_0:
+		*result = idev->id_maddr[0];
+		break;
+	case ISA_IVAR_MADDR_1:
+		*result = idev->id_maddr[1];
+		break;
+	case ISA_IVAR_MSIZE_0:
+		*result = idev->id_msize[0];
+		break;
+	case ISA_IVAR_MSIZE_1:
+		*result = idev->id_msize[1];
+		break;
+	case ISA_IVAR_IRQ_0:
+		*result = idev->id_irq[0];
+		break;
+	case ISA_IVAR_IRQ_1:
+		*result = idev->id_irq[1];
+		break;
+	case ISA_IVAR_DRQ_0:
+		*result = idev->id_drq[0];
+		break;
+	case ISA_IVAR_DRQ_1:
+		*result = idev->id_drq[1];
+		break;
+	case ISA_IVAR_FLAGS:
+		*result = idev->id_flags;
+		break;
+	}
+	return ENOENT;
 }
 
 /*
- * isa_dmacascade(): program 8237 DMA controller channel to accept
- * external dma control by a board.
+ * XXX -- this interface is pretty much irrelevant in the presence of
+ * BUS_ALLOC_RESOURCE / BUS_RELEASE_RESOURCE (at least for the ivars which
+ * are defined at this point).
  */
-void
-isa_dmacascade(chan)
-	int chan;
+static int
+isa_write_ivar(device_t bus, device_t dev,
+	       int index, uintptr_t value)
 {
-#ifdef DIAGNOSTIC
-	if (chan & ~VALID_DMA_MASK)
-		panic("isa_dmacascade: channel out of range");
-#endif
-
-	/* set dma channel mode, and set dma channel mode */
-	if ((chan & 4) == 0) {
-		outb(DMA1_MODE, DMA37MD_CASCADE | chan);
-		outb(DMA1_SMSK, chan);
-	} else {
-		outb(DMA2_MODE, DMA37MD_CASCADE | (chan & 3));
-		outb(DMA2_SMSK, chan & 3);
+	struct isa_device* idev = DEVTOISA(dev);
+
+	switch (index) {
+	case ISA_IVAR_PORT_0:
+		idev->id_port[0] = value;
+		break;
+	case ISA_IVAR_PORT_1:
+		idev->id_port[1] = value;
+		break;
+	case ISA_IVAR_PORTSIZE_0:
+		idev->id_portsize[0] = value;
+		break;
+	case ISA_IVAR_PORTSIZE_1:
+		idev->id_portsize[1] = value;
+		break;
+	case ISA_IVAR_MADDR_0:
+		idev->id_maddr[0] = value;
+		break;
+	case ISA_IVAR_MADDR_1:
+		idev->id_maddr[1] = value;
+		break;
+	case ISA_IVAR_MSIZE_0:
+		idev->id_msize[0] = value;
+		break;
+	case ISA_IVAR_MSIZE_1:
+		idev->id_msize[1] = value;
+		break;
+	case ISA_IVAR_IRQ_0:
+		idev->id_irq[0] = value;
+		break;
+	case ISA_IVAR_IRQ_1:
+		idev->id_irq[1] = value;
+		break;
+	case ISA_IVAR_DRQ_0:
+		idev->id_drq[0] = value;
+		break;
+	case ISA_IVAR_DRQ_1:
+		idev->id_drq[1] = value;
+		break;
+	case ISA_IVAR_FLAGS:
+		idev->id_flags = value;
+		break;
+	default:
+		return (ENOENT);
 	}
+	return (0);
 }
 
 /*
- * isa_dmastart(): program 8237 DMA controller channel, avoid page alignment
- * problems by using a bounce buffer.
+ * This implementation simply passes the request up to the parent
+ * bus, which in our case is the special i386 nexus, substituting any
+ * configured values if the caller defaulted.  We can get away with
+ * this because there is no special mapping for ISA resources on an Intel
+ * platform.  When porting this code to another architecture, it may be
+ * necessary to interpose a mapping layer here.
  */
-void
-isa_dmastart(int flags, caddr_t addr, u_int nbytes, int chan)
+static struct resource *
+isa_alloc_resource(device_t bus, device_t child, int type, int *rid,
+		   u_long start, u_long end, u_long count, u_int flags)
 {
-	vm_offset_t phys;
-	int waport;
-	caddr_t newaddr;
+	int	isdefault;
+	struct	resource *rv, **rvp = 0;
+	struct	isa_device *id = DEVTOISA(child);
 
-#ifdef DIAGNOSTIC
-	if (chan & ~VALID_DMA_MASK)
-		panic("isa_dmastart: channel out of range");
-
-	if ((chan < 4 && nbytes > (1<<16))
-	    || (chan >= 4 && (nbytes > (1<<17) || (u_int)addr & 1)))
-		panic("isa_dmastart: impossible request");
-
-	if ((dma_inuse & (1 << chan)) == 0)
-		printf("isa_dmastart: channel %d not acquired\n", chan);
-#endif
-
-#if 0
-	/*
-	 * XXX This should be checked, but drivers like ad1848 only call
-	 * isa_dmastart() once because they use Auto DMA mode.  If we
-	 * leave this in, drivers that do this will print this continuously.
-	 */
-	if (dma_busy & (1 << chan))
-		printf("isa_dmastart: channel %d busy\n", chan);
-#endif
-
-	dma_busy |= (1 << chan);
-
-	if (isa_dmarangecheck(addr, nbytes, chan)) {
-		if (dma_bouncebuf[chan] == NULL
-		    || dma_bouncebufsize[chan] < nbytes)
-			panic("isa_dmastart: bad bounce buffer"); 
-		dma_bounced |= (1 << chan);
-		newaddr = dma_bouncebuf[chan];
-
-		/* copy bounce buffer on write */
-		if (!(flags & B_READ))
-			bcopy(addr, newaddr, nbytes);
-		addr = newaddr;
-	}
-
-	/* translate to physical */
-	phys = pmap_extract(pmap_kernel(), (vm_offset_t)addr);
-
-	if (flags & B_RAW) {
-	    dma_auto_mode |= (1 << chan);
-	} else { 
-	    dma_auto_mode &= ~(1 << chan);
-	}
-
-	if ((chan & 4) == 0) {
+	if (child) {
 		/*
-		 * Program one of DMA channels 0..3.  These are
-		 * byte mode channels.
+		 * If this is our child, then use the isa_device to find 
+		 * defaults and to record results.
 		 */
-		/* set dma channel mode, and reset address ff */
-
-		/* If B_RAW flag is set, then use autoinitialise mode */
-		if (flags & B_RAW) {
-		  if (flags & B_READ)
-			outb(DMA1_MODE, DMA37MD_AUTO|DMA37MD_WRITE|chan);
-		  else
-			outb(DMA1_MODE, DMA37MD_AUTO|DMA37MD_READ|chan);
-		}
-		else
-		if (flags & B_READ)
-			outb(DMA1_MODE, DMA37MD_SINGLE|DMA37MD_WRITE|chan);
+		if (device_get_devclass(device_get_parent(child)) == isa_devclass)
+			id = DEVTOISA(child);
 		else
-			outb(DMA1_MODE, DMA37MD_SINGLE|DMA37MD_READ|chan);
-		outb(DMA1_FFC, 0);
-
-		/* send start address */
-		waport =  DMA1_CHN(chan);
-		outb(waport, phys);
-		outb(waport, phys>>8);
-		outb(dmapageport[chan], phys>>16);
-
-		/* send count */
-		outb(waport + 1, --nbytes);
-		outb(waport + 1, nbytes>>8);
-
-		/* unmask channel */
-		outb(DMA1_SMSK, chan);
-	} else {
-		/*
-		 * Program one of DMA channels 4..7.  These are
-		 * word mode channels.
-		 */
-		/* set dma channel mode, and reset address ff */
-
-		/* If B_RAW flag is set, then use autoinitialise mode */
-		if (flags & B_RAW) {
-		  if (flags & B_READ)
-			outb(DMA2_MODE, DMA37MD_AUTO|DMA37MD_WRITE|(chan&3));
-		  else
-			outb(DMA2_MODE, DMA37MD_AUTO|DMA37MD_READ|(chan&3));
+			id = NULL;
+	} else
+		id = NULL;
+	isdefault = (id != NULL && start == 0UL && end == ~0UL && *rid == 0);
+	if (*rid > 1)
+		return 0;
+
+	switch (type) {
+	case SYS_RES_IRQ:
+		if (isdefault && id->id_irq[0] >= 0) {
+			start = id->id_irq[0];
+			end = id->id_irq[0];
+			count = 1;
 		}
-		else
-		if (flags & B_READ)
-			outb(DMA2_MODE, DMA37MD_SINGLE|DMA37MD_WRITE|(chan&3));
-		else
-			outb(DMA2_MODE, DMA37MD_SINGLE|DMA37MD_READ|(chan&3));
-		outb(DMA2_FFC, 0);
-
-		/* send start address */
-		waport = DMA2_CHN(chan - 4);
-		outb(waport, phys>>1);
-		outb(waport, phys>>9);
-		outb(dmapageport[chan], phys>>16);
-
-		/* send count */
-		nbytes >>= 1;
-		outb(waport + 2, --nbytes);
-		outb(waport + 2, nbytes>>8);
+		if (id)
+			rvp = &id->id_irqres[*rid];
+		break;
+
+	case SYS_RES_DRQ:
+		if (isdefault && id->id_drq[0] >= 0) {
+			start = id->id_drq[0];
+			end = id->id_drq[0];
+			count = 1;
+		}
+		if (id)
+			rvp = &id->id_drqres[*rid];
+		break;
+
+	case SYS_RES_MEMORY:
+		if (isdefault && id->id_maddr[0]) {
+			start = id->id_maddr[0];
+			count = max(count, (u_long)id->id_msize[0]);
+			end = id->id_maddr[0] + count;
+		}
+		if (id)
+			rvp = &id->id_memres[*rid];
+		break;
+
+	case SYS_RES_IOPORT:
+		if (isdefault && id->id_port[0]) {
+			start = id->id_port[0];
+			count = max(count, (u_long)id->id_portsize[0]);
+			end = id->id_port[0] + count;
+		}
+		if (id)
+			rvp = &id->id_portres[*rid];
+		break;
 
-		/* unmask channel */
-		outb(DMA2_SMSK, chan & 3);
+	default:
+		return 0;
 	}
-}
-
-void
-isa_dmadone(int flags, caddr_t addr, int nbytes, int chan)
-{  
-#ifdef DIAGNOSTIC
-	if (chan & ~VALID_DMA_MASK)
-		panic("isa_dmadone: channel out of range");
-
-	if ((dma_inuse & (1 << chan)) == 0)
-		printf("isa_dmadone: channel %d not acquired\n", chan);
-#endif
-
-	if (((dma_busy & (1 << chan)) == 0) && 
-	    (dma_auto_mode & (1 << chan)) == 0 )
-		printf("isa_dmadone: channel %d not busy\n", chan);
 
-	if ((dma_auto_mode & (1 << chan)) == 0)
-		outb(chan & 4 ? DMA2_SMSK : DMA1_SMSK, (chan & 3) | 4);
-
-	if (dma_bounced & (1 << chan)) {
-		/* copy bounce buffer on read */
-		if (flags & B_READ)
-			bcopy(dma_bouncebuf[chan], addr, nbytes);
+	/*
+	 * If the client attempts to reallocate a resource without
+	 * releasing what was there previously, die horribly so that
+	 * he knows how he !@#$ed up.
+	 */
+	if (rvp && *rvp != 0)
+		panic("%s%d: (%d, %d) not free for %s%d\n",
+		      device_get_name(bus), device_get_unit(bus),
+		      type, *rid, 
+		      device_get_name(child), device_get_unit(child));
 
-		dma_bounced &= ~(1 << chan);
+	/*
+	 * nexus_alloc_resource had better not change *rid...
+	 */
+	rv = BUS_ALLOC_RESOURCE(device_get_parent(bus), child, type, rid,
+				start, end, count, flags);
+	if (rvp && (*rvp = rv) != 0) {
+		switch (type) {
+		case SYS_RES_MEMORY:
+			id->id_maddr[*rid] = rv->r_start;
+			id->id_msize[*rid] = count;
+			break;
+		case SYS_RES_IOPORT:
+			id->id_port[*rid] = rv->r_start;
+			id->id_portsize[*rid] = count;
+			break;
+		case SYS_RES_IRQ:
+			id->id_irq[*rid] = rv->r_start;
+			break;
+		case SYS_RES_DRQ:
+			id->id_drq[*rid] = rv->r_start;
+			break;
+		}
 	}
-	dma_busy &= ~(1 << chan);
+	return rv;
 }
 
-/*
- * Check for problems with the address range of a DMA transfer
- * (non-contiguous physical pages, outside of bus address space,
- * crossing DMA page boundaries).
- * Return true if special handling needed.
- */
-
 static int
-isa_dmarangecheck(caddr_t va, u_int length, int chan)
+isa_release_resource(device_t bus, device_t child, int type, int rid,
+		     struct resource *r)
 {
-	vm_offset_t phys, priorpage = 0, endva;
-	u_int dma_pgmsk = (chan & 4) ?  ~(128*1024-1) : ~(64*1024-1);
-
-	endva = (vm_offset_t)round_page((vm_offset_t)va + length);
-	for (; va < (caddr_t) endva ; va += PAGE_SIZE) {
-		phys = trunc_page(pmap_extract(pmap_kernel(), (vm_offset_t)va));
-#define ISARAM_END	RAM_END
-		if (phys == 0)
-			panic("isa_dmacheck: no physical page present");
-		if (phys >= ISARAM_END)
-			return (1);
-		if (priorpage) {
-			if (priorpage + PAGE_SIZE != phys)
-				return (1);
-			/* check if crossing a DMA page boundary */
-			if (((u_int)priorpage ^ (u_int)phys) & dma_pgmsk)
-				return (1);
-		}
-		priorpage = phys;
-	}
-	return (0);
-}
+	int	rv;
+	struct	isa_device *id = DEVTOISA(child);
 
-/*
- * Query the progress of a transfer on a DMA channel.
- *
- * To avoid having to interrupt a transfer in progress, we sample
- * each of the high and low databytes twice, and apply the following
- * logic to determine the correct count.
- *
- * Reads are performed with interrupts disabled, thus it is to be
- * expected that the time between reads is very small.  At most
- * one rollover in the low count byte can be expected within the
- * four reads that are performed.
- *
- * There are three gaps in which a rollover can occur :
- *
- * - read low1
- *              gap1
- * - read high1
- *              gap2
- * - read low2
- *              gap3
- * - read high2
- *
- * If a rollover occurs in gap1 or gap2, the low2 value will be
- * greater than the low1 value.  In this case, low2 and high2 are a
- * corresponding pair. 
- *
- * In any other case, low1 and high1 can be considered to be correct.
- *
- * The function returns the number of bytes remaining in the transfer,
- * or -1 if the channel requested is not active.
- *
- */
-int
-isa_dmastatus(int chan)
-{
-	u_long	cnt = 0;
-	int	ffport, waport;
-	u_long	low1, high1, low2, high2;
+	if (rid > 1)
+		return EINVAL;
 
-	/* channel active? */
-	if ((dma_inuse & (1 << chan)) == 0) {
-		printf("isa_dmastatus: channel %d not active\n", chan);
-		return(-1);
+	switch (type) {
+	case SYS_RES_IRQ:
+	case SYS_RES_DRQ:
+	case SYS_RES_IOPORT:
+	case SYS_RES_MEMORY:
+		break;
+	default:
+		return (ENOENT);
 	}
-	/* channel busy? */
 
-	if (((dma_busy & (1 << chan)) == 0) &&
-	    (dma_auto_mode & (1 << chan)) == 0 ) {
-	    printf("chan %d not busy\n", chan);
-	    return -2 ;
-	}	
-	if (chan < 4) {			/* low DMA controller */
-		ffport = DMA1_FFC;
-		waport = DMA1_CHN(chan) + 1;
-	} else {			/* high DMA controller */
-		ffport = DMA2_FFC;
-		waport = DMA2_CHN(chan - 4) + 2;
-	}
+	rv = BUS_RELEASE_RESOURCE(device_get_parent(bus), child, type, rid, r);
 
-	disable_intr();			/* no interrupts Mr Jones! */
-	outb(ffport, 0);		/* clear register LSB flipflop */
-	low1 = inb(waport);
-	high1 = inb(waport);
-	outb(ffport, 0);		/* clear again */
-	low2 = inb(waport);
-	high2 = inb(waport);
-	enable_intr();			/* enable interrupts again */
+#if 0
+	if (rv) {
+		/* Kludge, isa as a child of pci doesn't have mapping regs */
+		printf("WARNING: isa_release_resource: BUS_RELEASE_RESOURCE() failed: %d\n", rv);
+		rv = 0;
+	}
+#endif
 
-	/* 
-	 * Now decide if a wrap has tried to skew our results.
-	 * Note that after TC, the count will read 0xffff, while we want 
-	 * to return zero, so we add and then mask to compensate.
-	 */
-	if (low1 >= low2) {
-		cnt = (low1 + (high1 << 8) + 1) & 0xffff;
-	} else {
-		cnt = (low2 + (high2 << 8) + 1) & 0xffff;
+	if (rv == 0) {
+		switch (type) {
+		case SYS_RES_IRQ:
+			id->id_irqres[rid] = 0;
+			id->id_irq[rid] = -1;
+			break;
+
+		case SYS_RES_DRQ:
+			id->id_drqres[rid] = 0;
+			id->id_drq[rid] = -1;
+			break;
+
+		case SYS_RES_MEMORY:
+			id->id_memres[rid] = 0;
+			id->id_maddr[rid] = 0;
+			id->id_msize[rid] = 0;
+			break;
+
+		case SYS_RES_IOPORT:
+			id->id_portres[rid] = 0;
+			id->id_port[rid] = 0;
+			id->id_portsize[rid] = 0;
+			break;
+
+		default:
+			return ENOENT;
+		}
 	}
 
-	if (chan >= 4)			/* high channels move words */
-		cnt *= 2;
-	return(cnt);
+	return rv;
 }
 
 /*
- * Stop a DMA transfer currently in progress.
+ * We can't use the bus_generic_* versions of these methods because those
+ * methods always pass the bus param as the requesting device, and we need
+ * to pass the child (the i386 nexus knows about this and is prepared to
+ * deal).
  */
-int
-isa_dmastop(int chan) 
+static int
+isa_setup_intr(device_t bus, device_t child, struct resource *r,
+	       void (*ihand)(void *), void *arg, void **cookiep)
 {
-	if ((dma_inuse & (1 << chan)) == 0)
-		printf("isa_dmastop: channel %d not acquired\n", chan);  
-
-	if (((dma_busy & (1 << chan)) == 0) &&
-	    ((dma_auto_mode & (1 << chan)) == 0)) {
-		printf("chan %d not busy\n", chan);
-		return -2 ;
-	}
-    
-	if ((chan & 4) == 0) {
-		outb(DMA1_SMSK, (chan & 3) | 4 /* disable mask */);
-	} else {
-		outb(DMA2_SMSK, (chan & 3) | 4 /* disable mask */);
-	}
-	return(isa_dmastatus(chan));
+	return (BUS_SETUP_INTR(device_get_parent(bus), child, r, ihand, arg,
+			       cookiep));
 }
 
-/*
- * Find the highest priority enabled display device.  Since we can't
- * distinguish display devices from ttys, depend on display devices
- * being sensitive and before sensitive non-display devices (if any)
- * in isa_devtab_tty.
- *
- * XXX we should add capability flags IAMDISPLAY and ISUPPORTCONSOLES.
- */
-struct isa_device *
-find_display()
+static int
+isa_teardown_intr(device_t bus, device_t child, struct resource *r,
+		  void *cookie)
 {
-	struct isa_device *dvp;
-
-	for (dvp = isa_devtab_tty; dvp->id_driver != NULL; dvp++)
-		if (dvp->id_driver->sensitive_hw && dvp->id_enabled)
-			return (dvp);
-	return (NULL);
+	return (BUS_TEARDOWN_INTR(device_get_parent(bus), child, r, cookie));
 }
 
+static device_method_t isa_methods[] = {
+	/* Device interface */
+	DEVMETHOD(device_probe,		isa_probe),
+	DEVMETHOD(device_attach,	isa_attach),
+	DEVMETHOD(device_detach,	bus_generic_detach),
+	DEVMETHOD(device_shutdown,	bus_generic_shutdown),
+	DEVMETHOD(device_suspend,	bus_generic_suspend),
+	DEVMETHOD(device_resume,	bus_generic_resume),
+
+	/* Bus interface */
+	DEVMETHOD(bus_print_child,	isa_print_child),
+	DEVMETHOD(bus_read_ivar,	isa_read_ivar),
+	DEVMETHOD(bus_write_ivar,	isa_write_ivar),
+	DEVMETHOD(bus_alloc_resource,	isa_alloc_resource),
+	DEVMETHOD(bus_release_resource,	isa_release_resource),
+	DEVMETHOD(bus_activate_resource, bus_generic_activate_resource),
+	DEVMETHOD(bus_deactivate_resource, bus_generic_deactivate_resource),
+	DEVMETHOD(bus_setup_intr,	isa_setup_intr),
+	DEVMETHOD(bus_teardown_intr,	isa_teardown_intr),
+
+	{ 0, 0 }
+};
+
+static driver_t isa_driver = {
+	"isa",
+	isa_methods,
+	DRIVER_TYPE_MISC,
+	1,			/* no softc */
+};
+
 /*
- * find an ISA device in a given isa_devtab_* table, given
- * the table to search, the expected id_driver entry, and the unit number.
- *
- * this function is defined in isa_device.h, and this location is debatable;
- * i put it there because it's useless w/o, and directly operates on
- * the other stuff in that file.
- *
+ * ISA can be attached to a PCI-ISA bridge or directly to the nexus.
  */
-
-struct isa_device *
-find_isadev(table, driverp, unit)
-	struct isa_device *table;
-	struct isa_driver *driverp;
-	int unit;
-{
-	if (driverp == NULL) /* sanity check */
-		return (NULL);
-
-	while ((table->id_driver != driverp) || (table->id_unit != unit)) {
-		if (table->id_driver == 0)
-			return NULL;
-
-		table++;
-	}
-
-	return (table);
-}
+DRIVER_MODULE(isa, isab, isa_driver, isa_devclass, 0, 0);
+DRIVER_MODULE(isa, nexus, isa_driver, isa_devclass, 0, 0);