* Add hooks to allow the X server to access I/O ports and memory.

* Update drivers to the latest version of the bus interface.

The ISA drivers' use of the new resource api is minimal.  Garrett has
some much cleaner drivers which should be more easily shared between
i386 and alpha.  This has only been tested on cia based machines.  It
should work on lca and apecs but I might have broken something.

1 files changed, 25 insertions, 5 deletions

diff --git a/sys/isa/isavar.h b/sys/isa/isavar.h
index 756333a..bb8ee55 100644
--- a/sys/isa/isavar.h
+++ b/sys/isa/isavar.h
@@ -23,14 +23,34 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- *	$Id$
+ *	$Id: isavar.h,v 1.1 1998/08/06 08:49:09 dfr Exp $
  */
 
+#define	ISA_NPORT_IVARS	2
+#define	ISA_NMEM_IVARS	2
+#define	ISA_NIRQ_IVARS	2
+#define	ISA_NDRQ_IVARS	2
+
 enum isa_device_ivars {
-    ISA_IVAR_PORT,
-    ISA_IVAR_PORTSIZE,
-    ISA_IVAR_FLAGS,
-    ISA_IVAR_IRQ
+	ISA_IVAR_PORT,
+	ISA_IVAR_PORT_0 = ISA_IVAR_PORT,
+	ISA_IVAR_PORT_1,
+	ISA_IVAR_PORTSIZE,
+	ISA_IVAR_PORTSIZE_0 = ISA_IVAR_PORTSIZE,
+	ISA_IVAR_PORTSIZE_1,
+	ISA_IVAR_MADDR,
+	ISA_IVAR_MADDR_0 = ISA_IVAR_MADDR,
+	ISA_IVAR_MADDR_1,
+	ISA_IVAR_MSIZE,
+	ISA_IVAR_MSIZE_0 = ISA_IVAR_MSIZE,
+	ISA_IVAR_MSIZE_1,
+	ISA_IVAR_FLAGS,
+	ISA_IVAR_IRQ,
+	ISA_IVAR_IRQ_0 = ISA_IVAR_IRQ,
+	ISA_IVAR_IRQ_1,
+	ISA_IVAR_DRQ,
+	ISA_IVAR_DRQ_0 = ISA_IVAR_DRQ,
+	ISA_IVAR_DRQ_1
 };
 
 extern int isa_irq_pending(void);