Clean up some more loose ends..

isa_device->id_ri_flags and RI_FAST were not implemented and did nothing.
The two drivers that were mistakenly thinking this was working were
cy.c and loran.c - these should be converted to newbus.
GC (garbage collect) isa_device->id_alive
GC userconfig.c references to isa_device->id_scsiid (!).

3 files changed, 2 insertions, 8 deletions

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");