GC some unused stuff relating to the old conflict checking and other lint.

Change haveseen_isadev() to something a little easier to emulate.
Store the device_t for the wrapper in isa_device.
Implement a replacement for haveseen_isadev - namely haveseen_ioport()
which takes a port size as an extra argument for a proper range check.
This (haveseen_ioport()) has not been tested, but I think it'll work.

1 files changed, 3 insertions, 14 deletions

diff --git a/sys/i386/isa/isa_device.h b/sys/i386/isa/isa_device.h
index 92a3d14..b8c0ed0 100644
--- a/sys/i386/isa/isa_device.h
+++ b/sys/i386/isa/isa_device.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa_device.h	7.1 (Berkeley) 5/9/91
- *	$Id: isa_device.h,v 1.59 1999/04/19 20:16:22 peter Exp $
+ *	$Id: isa_device.h,v 1.60 1999/04/21 07:26:28 peter Exp $
  */
 
 #ifndef _I386_ISA_ISA_DEVICE_H_
@@ -69,7 +69,6 @@ struct isa_device {
 #define	id_ointr	id_iu.id_oi
 	int	id_unit;	/* unit number */
 	int	id_flags;	/* flags */
-	int	id_scsiid;	/* scsi id if needed */
 	int	id_alive;	/* device is present */
 #define	RI_FAST		1		/* fast interrupt handler */
 	u_int	id_ri_flags;	/* flags for register_intr() */
@@ -77,19 +76,10 @@ struct isa_device {
 	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() */
+	struct device *id_device; /* new-bus wrapper device */
 };
 
 /*
- * Bits to specify the type and amount of conflict checking.
- */
-#define	CC_ATTACH	(1 << 0)
-#define	CC_DRQ		(1 << 1)
-#define	CC_IOADDR	(1 << 2)
-#define	CC_IRQ		(1 << 3)
-#define	CC_MEMADDR	(1 << 4)
-#define	CC_QUIET	(1 << 5)
-
-/*
  * Per-driver structure.
  *
  * Each device driver defines entries for a set of routines
@@ -107,10 +97,9 @@ struct isa_driver {
 
 #ifdef KERNEL
 
-int	haveseen_isadev __P((struct isa_device *dvp, u_int checkbits));
+int	haveseen_iobase __P((struct isa_device *dvp, int iosize));
 void	reconfig_isadev __P((struct isa_device *isdp, u_int *mp));
 int	isa_compat_nextid __P((void));
-void	isa_wrap_old_drivers __P((void));
 
 #endif /* KERNEL */