Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/dev/isa/esp_isa.c,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/dev/isa/esp_isa.c,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.21.4.5
retrieving revision 1.22
diff -u -p -r1.21.4.5 -r1.22
--- src/sys/dev/isa/esp_isa.c	2002/10/18 02:42:10	1.21.4.5
+++ src/sys/dev/isa/esp_isa.c	2001/04/25 17:53:35	1.22
@@ -1,4 +1,4 @@
-/*	$NetBSD: esp_isa.c,v 1.21.4.5 2002/10/18 02:42:10 nathanw Exp $	*/
+/*	$NetBSD: esp_isa.c,v 1.22 2001/04/25 17:53:35 bouyer Exp $	*/
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
@@ -112,9 +112,6 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: esp_isa.c,v 1.21.4.5 2002/10/18 02:42:10 nathanw Exp $");
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
@@ -138,8 +135,9 @@ __KERNEL_RCSID(0, "$NetBSD: esp_isa.c,v 
 int	esp_isa_match __P((struct device *, struct cfdata *, void *)); 
 void	esp_isa_attach __P((struct device *, struct device *, void *));  
 
-CFATTACH_DECL(esp_isa, sizeof(struct esp_isa_softc),
-    esp_isa_match, esp_isa_attach, NULL, NULL);
+struct cfattach esp_isa_ca = {
+	sizeof(struct esp_isa_softc), esp_isa_match, esp_isa_attach
+};
 
 int esp_isa_debug = 0;	/* ESP_SHOWTRAC | ESP_SHOWREGS | ESP_SHOWMISC */
 
@@ -329,22 +327,12 @@ esp_isa_match(parent, match, aux)
 	struct esp_isa_probe_data epd;
 	int rv;
 
-	if (ia->ia_nio < 1)
-		return (0);
-	if (ia->ia_nirq < 1)
-		return (0);
-	if (ia->ia_ndrq < 1)
-		return (0);
-
-	if (ISA_DIRECT_CONFIG(ia))
-		return (0);
-
 	ESP_TRACE(("[esp_isa_match] "));
 
-	if (ia->ia_io[0].ir_addr == ISACF_PORT_DEFAULT)
+	if (ia->ia_iobase == -1)
 		return 0;
 
-	if (bus_space_map(iot, ia->ia_io[0].ir_addr, ESP_ISA_IOSIZE, 0, &ioh))
+	if (bus_space_map(iot, ia->ia_iobase, ESP_ISA_IOSIZE, 0, &ioh))
 		return 0;
 
 	rv = esp_isa_find(iot, ioh, &epd);
@@ -352,18 +340,17 @@ esp_isa_match(parent, match, aux)
 	bus_space_unmap(iot, ioh, ESP_ISA_IOSIZE);
 
 	if (rv) {
-		if (ia->ia_irq[0].ir_irq != ISACF_IRQ_DEFAULT &&
-		    ia->ia_irq[0].ir_irq != epd.sc_irq) {
+		if (ia->ia_irq != IRQUNK && ia->ia_irq != epd.sc_irq) {
 #ifdef DIAGNOSTIC
 		printf("esp_isa_match: configured IRQ (%0d) does not "
 		       "match board IRQ (%0d), device not configured\n",
-		       ia->ia_irq[0].ir_irq, epd.sc_irq);
+		       ia->ia_irq, epd.sc_irq);
 #endif
 			return 0;
 		}
-		ia->ia_irq[0].ir_irq = epd.sc_irq;
-		ia->ia_iomem[0].ir_size = 0;
-		ia->ia_io[0].ir_size = ESP_ISA_IOSIZE;
+		ia->ia_irq = epd.sc_irq;
+		ia->ia_msize = 0;
+		ia->ia_iosize = ESP_ISA_IOSIZE;
 	}
 	return (rv);
 }
@@ -388,7 +375,7 @@ esp_isa_attach(parent, self, aux)
 	printf("\n");
 	ESP_TRACE(("[esp_isa_attach] "));
 
-	if (bus_space_map(iot, ia->ia_io[0].ir_addr, ESP_ISA_IOSIZE, 0, &ioh)) {
+	if (bus_space_map(iot, ia->ia_iobase, ESP_ISA_IOSIZE, 0, &ioh)) {
 		printf("%s: can't map i/o space\n", sc->sc_dev.dv_xname);
 		return;
 	}
@@ -398,16 +385,16 @@ esp_isa_attach(parent, self, aux)
 		return;
 	}
 
-	if (ia->ia_drq[0].ir_drq != ISACF_DRQ_DEFAULT) {
-		if ((error = isa_dmacascade(ic, ia->ia_drq[0].ir_drq)) != 0) {
+	if (ia->ia_drq != DRQUNK) {
+		if ((error = isa_dmacascade(ic, ia->ia_drq)) != 0) {
 			printf("%s: unable to cascade DRQ, error = %d\n",
 			    sc->sc_dev.dv_xname, error);
 			return;
 		}
 	}
 
-	esc->sc_ih = isa_intr_establish(ic, ia->ia_irq[0].ir_irq, IST_EDGE,
-	    IPL_BIO, ncr53c9x_intr, esc);
+	esc->sc_ih = isa_intr_establish(ic, ia->ia_irq, IST_EDGE, IPL_BIO,
+	    ncr53c9x_intr, esc);
 	if (esc->sc_ih == NULL) {
 		printf("%s: couldn't establish interrupt\n",
 		    sc->sc_dev.dv_xname);