NetBSD 960317 merge

1 files changed, 19 insertions, 8 deletions

diff --git a/sys/dev/isa/isavar.h b/sys/dev/isa/isavar.h
index 94954943b09..551375712f0 100644
--- a/sys/dev/isa/isavar.h
+++ b/sys/dev/isa/isavar.h
@@ -1,5 +1,5 @@
-/*	$OpenBSD: isavar.h,v 1.6 1996/03/20 01:00:55 mickey Exp $	*/
-/*	$NetBSD: isavar.h,v 1.17 1995/12/24 02:31:38 mycroft Exp $      */
+/*	$OpenBSD: isavar.h,v 1.7 1996/04/18 23:47:43 niklas Exp $	*/
+/*	$NetBSD: isavar.h,v 1.20 1996/03/16 02:00:43 cgd Exp $	*/
 
 /*
  * Copyright (c) 1995 Chris G. Demetriou
@@ -37,16 +37,30 @@
  *	BSDI Id: isavar.h,v 1.5 1992/12/01 18:06:00 karels Exp 
  */
 
+#ifndef _DEV_ISA_ISAVAR_H_
+#define	_DEV_ISA_ISAVAR_H_
+
 /*
  * Definitions for ISA autoconfiguration.
  */
 
 #include <sys/queue.h>
+#include <machine/bus.h>
+
+/*
+ * ISA bus attach arguments
+ */
+struct isabus_attach_args {
+	char	*iba_busname;			/* XXX should be common */
+	bus_chipset_tag_t iba_bc;		/* XXX should be common */
+};
 
 /*
  * ISA driver attach arguments
  */
 struct isa_attach_args {
+	bus_chipset_tag_t ia_bc;	/* bus chipset tag */
+
 	int	ia_iobase;		/* base i/o address */
 	int	ia_iosize;		/* span of ports used */
 	int	ia_irq;			/* interrupt request */
@@ -77,6 +91,8 @@ struct isa_softc {
 	struct	device sc_dev;		/* base device */
 	TAILQ_HEAD(, isadev)
 		sc_subdevs;		/* list of all children */
+
+	bus_chipset_tag_t sc_bc;	/* bus chipset tag */
 };
 
 #define		cf_iobase		cf_loc[0]
@@ -116,9 +132,4 @@ char	*isa_intr_typename __P((int type));
 void isa_establish __P((struct isadev *, struct device *));
 #endif
 
-/*
- * software conventions
- */
-typedef enum { BUS_ISA, BUS_EISA } isa_type;
-
-extern isa_type isa_bustype;	/* type of bus; XXX should be in softc */
+#endif /* _DEV_ISA_ISAVAR_H_ */