From ec7ce2c9f8dadc19ef4683456ce769190ea83268 Mon Sep 17 00:00:00 2001
From: leo <leo@NetBSD.org>
Date: Tue, 15 Jul 1997 08:25:39 +0000
Subject: [PATCH] Isabus support.

---
 sys/arch/atari/atari/autoconf.c | 3 ++-
 sys/arch/atari/atari/vectors.s  | 6 +++---
 sys/arch/atari/include/mfp.h    | 8 +++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/sys/arch/atari/atari/autoconf.c b/sys/arch/atari/atari/autoconf.c
index 11e172320394..38eafb28c256 100644
--- a/sys/arch/atari/atari/autoconf.c
+++ b/sys/arch/atari/atari/autoconf.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: autoconf.c,v 1.23 1997/07/05 20:57:40 leo Exp $	*/
+/*	$NetBSD: autoconf.c,v 1.24 1997/07/15 08:25:39 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman
@@ -288,6 +288,7 @@ mbattach(pdp, dp, auxp)
 	printf ("\n");
 	config_found(dp, "clock"  , simple_devprint);
 	config_found(dp, "grfbus" , simple_devprint);
+	config_found(dp, "isabus" , simple_devprint);
 	config_found(dp, "pcibus" , simple_devprint);
 	config_found(dp, "vmebus" , simple_devprint);
 	config_found(dp, "kbd"    , simple_devprint);
diff --git a/sys/arch/atari/atari/vectors.s b/sys/arch/atari/atari/vectors.s
index a665a673980a..c5154a5d933e 100644
--- a/sys/arch/atari/atari/vectors.s
+++ b/sys/arch/atari/atari/vectors.s
@@ -1,4 +1,4 @@
-/*	$NetBSD: vectors.s,v 1.8 1997/06/04 13:50:25 leo Exp $	*/
+/*	$NetBSD: vectors.s,v 1.9 1997/07/15 08:25:43 leo Exp $	*/
 
 /*
  * Copyright (c) 1988 University of Utah
@@ -133,7 +133,7 @@ _uservects:
 	.long	_intr_glue	|  64: parallel port - BUSY
 	.long	_badmfpint	|  65: modem port 1 - DCD
 	.long	_badmfpint	|  66: modem port 1 - CTS
-	.long	_badmfpint	|  67: unassigned
+	.long	_badmfpint	|  67: ISA1 [ Hades only ]
 	.long	_badmfpint	|  68: modem port 1 baudgen (Timer D)
 #ifdef STATCLOCK
 	.long	mfp_timc	|  69: Timer C {stat,prof}clock
@@ -149,7 +149,7 @@ _uservects:
 	.long	_badmfpint	|  76: modem port 1 - RCV buffer full
 	.long	mfp_tima	|  77: Timer A (System clock)
 	.long	_badmfpint	|  78: modem port 1 - RI
-	.long	_badmfpint	|  79: Monochrome detect
+	.long	_badmfpint	|  79: Monochrome detect (ISA2 [ Hades only ])
 
 	/*
 	 * MFP 2 auto vectors (ipl 6)
diff --git a/sys/arch/atari/include/mfp.h b/sys/arch/atari/include/mfp.h
index c3c50886203a..18c21ce0021b 100644
--- a/sys/arch/atari/include/mfp.h
+++ b/sys/arch/atari/include/mfp.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: mfp.h,v 1.2 1995/03/26 07:24:37 leo Exp $	*/
+/*	$NetBSD: mfp.h,v 1.3 1997/07/15 08:26:08 leo Exp $	*/
 
 /*
  * Copyright (c) 1995 Leo Weppelman.
@@ -73,14 +73,16 @@ struct mfp {
 #define	IO_PBSY		0x01	/* Parallel Busy			*/
 #define	IO_SDCD		0x02	/* Serial Data Carrier Detect		*/
 #define	IO_SCTS		0x04	/* Serial Clear To Send			*/
-/*		0x08		*//* reserved				*/
+#define	IO_ISA1		0x08	/* ISA slot1 [ Hades only ]		*/
 #define	IO_AINT		0x10	/* ACIA interrupt (KB or MIDI)		*/
 #define	IO_DINT		0x20	/* DMA interrupt (FDC or HDC)		*/
 #define	IO_SRI		0x40	/* Serial Ring Indicator		*/
 #define	IO_MONO		0x80	/* Monochrome Monitor Detect		*/
+#define	IO_ISA2		0x80	/*  ISA slot2 [ Hades only ]		*/
 
 /* names of interrupts in register A: MFP1 */
 #define	IA_MONO		0x80	/* IO_MONO				*/
+#define	IA_ISA2		0x80	/* IO_ISA2				*/
 #define	IA_SRI		0x40	/* IO_SRI				*/
 #define	IA_TIMA		0x20	/* Timer A				*/
 #define	IA_RRDY		0x10	/* Serial Receiver Ready(=Full)		*/
@@ -104,7 +106,7 @@ struct mfp {
 #define	IB_AINT		0x40	/* IO_AINT: from kbd or midi		*/
 #define	IB_TIMC		0x20	/* Timer C				*/
 #define	IB_TIMD		0x10	/* Timer D				*/
-/*			0x08	*//* reserved				*/
+#define	IB_ISA1		0x08	/* ISA1 interrupt [ Hades only ]	*/
 #define	IB_SCTS		0x04	/* IO_SCTS				*/
 #define	IB_SDCD		0x02	/* IO_SDCD				*/
 #define	IB_PBSY		0x01	/* IO_PBSY				*/