8 files changed, 5 insertions, 13 deletions
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 041b4dd..dfeb69a 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -507,7 +507,7 @@ sioattach(isdp)
 		isdp->id_unit = adapter;	/* XXX */
 	}
 	isdp->id_ointr = siointr;
-	isdp->id_ri_flags |= RI_FAST;
+	/* isdp->id_ri_flags |= RI_FAST; XXX unimplemented - use newbus! */
 	return (1);
 }
 
diff --git a/sys/dev/cy/cy_isa.c b/sys/dev/cy/cy_isa.c
index 041b4dd..dfeb69a 100644
--- a/sys/dev/cy/cy_isa.c
+++ b/sys/dev/cy/cy_isa.c
@@ -507,7 +507,7 @@ sioattach(isdp)
 		isdp->id_unit = adapter;	/* XXX */
 	}
 	isdp->id_ointr = siointr;
-	isdp->id_ri_flags |= RI_FAST;
+	/* isdp->id_ri_flags |= RI_FAST; XXX unimplemented - use newbus! */
 	return (1);
 }
 
diff --git a/sys/i386/i386/userconfig.c b/sys/i386/i386/userconfig.c
index 5ca0911..f16565b 100644
--- a/sys/i386/i386/userconfig.c
+++ b/sys/i386/i386/userconfig.c
@@ -3340,7 +3340,6 @@ lsdevtab(struct isa_device *dt)
 	    dname, /* dt->id_id, dt->id_driver(by name), */ dt->id_iobase,
 	    ffs(dt->id_irq) - 1, dt->id_drq, dt->id_maddr, dt->id_msize,
 	    /* dt->id_intr(by name), */ dt->id_unit, dt->id_flags,
-	    /* dt->id_scsiid, dt->id_alive, dt->id_ri_flags, */
 	    dt->id_enabled ? "Yes" : "No",
 	    dt->id_conflicts ? "Yes" : "No");
 	++lineno;
diff --git a/sys/i386/isa/cy.c b/sys/i386/isa/cy.c
index 041b4dd..dfeb69a 100644
--- a/sys/i386/isa/cy.c
+++ b/sys/i386/isa/cy.c
@@ -507,7 +507,7 @@ sioattach(isdp)
 		isdp->id_unit = adapter;	/* XXX */
 	}
 	isdp->id_ointr = siointr;
-	isdp->id_ri_flags |= RI_FAST;
+	/* isdp->id_ri_flags |= RI_FAST; XXX unimplemented - use newbus! */
 	return (1);
 }
 
diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 494af8b..9f5484c 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -72,9 +72,6 @@ struct isa_device {
 #define	id_ointr	id_iu.id_oi
 	int	id_unit;	/* unit number */
 	int	id_flags;	/* flags */
-	int	id_alive;	/* device is present */
-#define	RI_FAST		1		/* fast interrupt handler */
-	u_int	id_ri_flags;	/* flags for register_intr() */
 	int	id_enabled;	/* is device enabled */
 	int	id_conflicts;	/* we're allowed to conflict with things */
 	struct isa_device *id_next; /* used in isa_devlist in userconfig() */
diff --git a/sys/i386/isa/loran.c b/sys/i386/isa/loran.c
index 7964c6a..23db1a4 100644
--- a/sys/i386/isa/loran.c
+++ b/sys/i386/isa/loran.c
@@ -244,9 +244,6 @@ loranprobe(struct isa_device *dvp)
 
 	if (!once++)
 		cdevsw_add(&loran_cdevsw);
-	/* We need to be a "fast-intr" */
-	dvp->id_ri_flags |= RI_FAST;
-
 	dvp->id_iobase = PORT;
 	return (8);
 }
@@ -284,7 +281,7 @@ loranattach(struct isa_device *isdp)
 	isdp->id_ointr = loranintr;
 
 	/* We need to be a "fast-intr" */
-	isdp->id_ri_flags |= RI_FAST;
+	/* isdp->id_ri_flags |= RI_FAST; XXX unimplemented - use newbus! */
 
 	printf("loran0: LORAN-C Receiver\n");
 
diff --git a/sys/pc98/i386/userconfig.c b/sys/pc98/i386/userconfig.c
index bff788e..15cf837 100644
--- a/sys/pc98/i386/userconfig.c
+++ b/sys/pc98/i386/userconfig.c
@@ -3367,7 +3367,6 @@ lsdevtab(struct isa_device *dt)
 	    dname, /* dt->id_id, dt->id_driver(by name), */ dt->id_iobase,
 	    ffs(dt->id_irq) - 1, dt->id_drq, dt->id_maddr, dt->id_msize,
 	    /* dt->id_intr(by name), */ dt->id_unit, dt->id_flags,
-	    /* dt->id_scsiid, dt->id_alive, dt->id_ri_flags, */
 	    dt->id_enabled ? "Yes" : "No",
 	    dt->id_conflicts ? "Yes" : "No");
 	++lineno;
diff --git a/sys/pc98/pc98/if_ed.c b/sys/pc98/pc98/if_ed.c
index b363288..395a044 100644
--- a/sys/pc98/pc98/if_ed.c
+++ b/sys/pc98/pc98/if_ed.c
@@ -4304,7 +4304,7 @@ edpnp_attach(u_long csn, u_long vend_id, char *name, struct isa_device *dev)
 		dev->id_id = isa_compat_nextid();
 	}
 
-	if ((dev->id_alive = ed_probe(dev)) != 0)
+	if (ed_probe(dev) != 0)
 		ed_attach_isa(dev);
 	else
 		printf("ed%d: probe failed\n", dev->id_unit);