diff --git a/sys/arch/i386/isa/clock.c b/sys/arch/i386/isa/clock.c
index e229f13a5c14..80f485e7f65e 100644
--- a/sys/arch/i386/isa/clock.c
+++ b/sys/arch/i386/isa/clock.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)clock.c	7.2 (Berkeley) 5/12/91
- *	$Id: clock.c,v 1.20 1994/04/07 06:50:24 mycroft Exp $
+ *	$Id: clock.c,v 1.21 1994/04/24 01:34:05 mycroft Exp $
  */
 /* 
  * Mach Operating System
@@ -97,7 +97,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <machine/cpufunc.h>
 
 #include <i386/isa/icu.h>
-#include <i386/isa/isa.h>
+#include <i386/isa/isareg.h>
 #include <i386/isa/isavar.h>
 #include <i386/isa/clock.h>
 #include <i386/isa/rtc.h>
diff --git a/sys/arch/i386/isa/dma.c b/sys/arch/i386/isa/dma.c
index 06e22e1a23ac..98ed271c9e7f 100644
--- a/sys/arch/i386/isa/dma.c
+++ b/sys/arch/i386/isa/dma.c
@@ -10,7 +10,7 @@
 
 #include <machine/pio.h>
 
-#include <i386/isa/isa.h>
+#include <i386/isa/isareg.h>
 #include <i386/isa/dmavar.h>
 #include <i386/isa/dmareg.h>
 
diff --git a/sys/arch/i386/isa/intr.c b/sys/arch/i386/isa/intr.c
index bd70f613d8a7..88e67b428c66 100644
--- a/sys/arch/i386/isa/intr.c
+++ b/sys/arch/i386/isa/intr.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: intr.c,v 1.17 1994/04/07 17:00:55 mycroft Exp $
+ *	$Id: intr.c,v 1.18 1994/04/24 01:34:08 mycroft Exp $
  */
 
 #include <sys/param.h>
@@ -45,7 +45,7 @@
 #include <machine/pio.h>
 #include <machine/cpufunc.h>
 
-#include <i386/isa/isa.h>
+#include <i386/isa/isareg.h>
 #include <i386/isa/isavar.h>
 #include <i386/isa/icu.h>
 
diff --git a/sys/arch/i386/isa/isa.c b/sys/arch/i386/isa/isa.c
index 7a435610dd78..bfcb50fb9018 100644
--- a/sys/arch/i386/isa/isa.c
+++ b/sys/arch/i386/isa/isa.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.51 1994/04/22 22:58:59 mycroft Exp $
+ *	$Id: isa.c,v 1.52 1994/04/24 01:34:09 mycroft Exp $
  */
 
 /*
@@ -52,12 +52,12 @@
 #include <machine/pio.h>
 #include <machine/cpufunc.h>
 
-#include <i386/isa/isa.h>
+#include <i386/isa/isareg.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/isavar.h>
 #include <i386/isa/ic/i8042.h>
 #include <i386/isa/timerreg.h>
-#include <i386/isa/spkr_reg.h>
+#include <i386/isa/spkrreg.h>
 
 /* sorry, has to be here, no place else really suitable */
 #include <machine/pc/display.h>
diff --git a/sys/arch/i386/isa/isareg.h b/sys/arch/i386/isa/isareg.h
new file mode 100644
index 000000000000..c18ab1a77c30
--- /dev/null
+++ b/sys/arch/i386/isa/isareg.h
@@ -0,0 +1,207 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * William Jolitz.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
+ *	$Id: isareg.h,v 1.1 1994/04/24 01:34:11 mycroft Exp $
+ */
+
+/*
+ * ISA Bus conventions
+ */
+
+#ifndef LOCORE
+#include <sys/cdefs.h>
+
+unsigned char rtcin __P((int));
+void sysbeep __P((int, int));
+unsigned kbd_8042cmd __P((int));
+#endif
+
+
+/*
+ * Input / Output Port Assignments
+ */
+
+#ifndef IO_BEGIN
+#define	IO_ISABEGIN	0x000		/* 0x000 - Beginning of I/O Registers */
+
+		/* CPU Board */
+#define IO_DMA1		0x000		/* 8237A DMA Controller #1 */
+#define IO_ICU1		0x020		/* 8259A Interrupt Controller #1 */
+#define IO_TIMER1	0x040		/* 8252 Timer #1 */
+#define IO_TIMER2	0x048		/* 8252 Timer #2 (EISA only) */
+#define IO_KBD		0x060		/* 8042 Keyboard */
+#define IO_RTC		0x070		/* RTC */
+#define IO_NMI		IO_RTC		/* NMI Control */
+#define IO_DMAPG	0x080		/* DMA Page Registers */
+#define IO_ICU2		0x0A0		/* 8259A Interrupt Controller #2 */
+#define IO_DMA2		0x0C0		/* 8237A DMA Controller #2 */
+#define IO_NPX		0x0F0		/* Numeric Coprocessor */
+
+		/* Cards */
+					/* 0x100 - 0x16F Open */
+
+#define IO_WD2		0x170		/* Secondary Fixed Disk Controller */
+
+					/* 0x178 - 0x1EF Open */
+
+#define IO_WD1		0x1f0		/* Primary Fixed Disk Controller */
+#define IO_GAME		0x200		/* Game Controller */
+
+					/* 0x208 - 0x237 Open */
+
+#define IO_BMS2		0x238		/* secondary InPort Bus Mouse */
+#define IO_BMS1		0x23c		/* primary InPort Bus Mouse */
+
+					/* 0x240 - 0x277 Open */
+
+#define IO_LPT2		0x278		/* Parallel Port #2 */
+
+					/* 0x280 - 0x2E7 Open */
+
+#define	IO_COM4		0x2e8		/* COM4 i/o address */
+
+					/* 0x2F0 - 0x2F7 Open */
+
+#define IO_COM2		0x2f8		/* COM2 i/o address */
+
+					/* 0x300 - 0x32F Open */
+
+#define	IO_BT0		0x330		/* bustek 742a default addr. */
+#define	IO_AHA0		0x330		/* adaptec 1542 default addr. */
+#define	IO_UHA0		0x330		/* ultrastore 14f default addr. */
+#define	IO_BT1          0x334		/* bustek 742a default addr. */
+#define IO_AHA1         0x334		/* adaptec 1542 default addr. */
+
+					/* 0x338 - 0x34F Open */
+
+#define IO_WDS		0x350		/* WD7000 scsi */
+
+					/* 0x354 - 0x36F Open */
+
+#define IO_FD2		0x370		/* secondary base i/o address */
+#define IO_LPT1		0x378		/* Parallel Port #1 */
+
+					/* 0x380 - 0x3AF Open */
+
+#define IO_MDA		0x3B0		/* Monochome Adapter */
+#define IO_LPT3		0x3BC		/* Monochome Adapter Printer Port */
+#define IO_VGA		0x3C0		/* E/VGA Ports */
+#define IO_CGA		0x3D0		/* CGA Ports */
+
+					/* 0x3E0 - 0x3E7 Open */
+
+#define	IO_COM3		0x3e8		/* COM3 i/o address */
+#define IO_FD1		0x3f0		/* primary base i/o address */
+#define IO_COM1		0x3f8		/* COM1 i/o address */
+
+#define	IO_ISAEND	0x3FF		/* - 0x3FF End of I/O Registers */
+#endif	IO_ISABEGIN
+
+/*
+ * Input / Output Port Sizes - these are from several sources, and tend
+ * to be the larger of what was found, ie COM ports can be 4, but some
+ * boards do not fully decode the address, thus 8 ports are used.
+ */
+
+#ifndef	IO_ISASIZES
+#define	IO_ISASIZES
+
+#define	IO_COMSIZE	8	/* 8250, 16X50 com controllers (*/
+#define	IO_CGASIZE	16	/* CGA controllers */
+#define	IO_DMASIZE	16	/* 8237 DMA controllers */
+#define	IO_DPGSIZE	32	/* 74LS612 DMA page reisters */
+#define	IO_FDCSIZE	8	/* Nec765 floppy controllers */
+#define	IO_WDCSIZE	8	/* WD compatible disk controller */
+#define	IO_GAMSIZE	16	/* AT compatible game controller */
+#define	IO_ICUSIZE	16	/* 8259A interrupt controllers */
+#define	IO_KBDSIZE	16	/* 8042 Keyboard controllers */
+#define	IO_LPTSIZE	8	/* LPT controllers, some use onl */
+#define	IO_MDASIZE	16	/* Monochrome display controller */
+#define	IO_RTCSIZE	16	/* CMOS real time clock, NMI con */
+#define	IO_TMRSIZE	16	/* 8253 programmable timers */
+#define	IO_NPXSIZE	16	/* 80387/80487 NPX registers */
+#define	IO_VGASIZE	16	/* VGA controllers */
+
+#endif	/* IO_ISASIZES */
+
+/*
+ * Input / Output Memory Physical Addresses
+ */
+
+#ifndef	IOM_BEGIN
+#define	IOM_BEGIN	0x0a0000		/* Start of I/O Memory "hole" */
+#define	IOM_END		0x100000		/* End of I/O Memory "hole" */
+#define	IOM_SIZE	(IOM_END - IOM_BEGIN)
+#endif	IOM_BEGIN
+
+/*
+ * RAM Physical Address Space (ignoring the above mentioned "hole")
+ */
+
+#ifndef	RAM_BEGIN
+#define	RAM_BEGIN	0x0000000	/* Start of RAM Memory */
+#define	RAM_END		0x1000000	/* End of RAM Memory */
+#define	RAM_SIZE	(RAM_END - RAM_BEGIN)
+#endif	RAM_BEGIN
+
+/*
+ * Oddball Physical Memory Addresses
+ */
+#ifndef	COMPAQ_RAMRELOC
+#define	COMPAQ_RAMRELOC	0x80c00000	/* Compaq RAM relocation/diag */
+#define	COMPAQ_RAMSETUP	0x80c00002	/* Compaq RAM setup */
+#define	WEITEK_FPU	0xC0000000	/* WTL 2167 */
+#define	CYRIX_EMC	0xC0000000	/* Cyrix EMC */
+#endif	COMPAQ_RAMRELOC
+
+/* stuff that used to be in pccons.c */
+#define MONO_BASE	0x3B4
+#define MONO_BUF	(KERNBASE + 0xB0000)
+#define CGA_BASE	0x3D4
+#define CGA_BUF		(KERNBASE + 0xB8000)
+#define IOPHYSMEM	0xA0000
+
+/*
+ * size of dma bounce buffer in pages
+ * - currently 1 page per channel
+ */
+#ifndef DMA_BOUNCE
+#define DMA_BOUNCE      8
+#endif
+
+#ifndef LOCORE
+extern vm_offset_t isaphysmem;
+#endif
diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c
index 069617fee649..b6c0440e055e 100644
--- a/sys/arch/i386/isa/npx.c
+++ b/sys/arch/i386/isa/npx.c
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.c	7.2 (Berkeley) 5/12/91
- *	$Id: npx.c,v 1.18 1994/04/07 06:51:05 mycroft Exp $
+ *	$Id: npx.c,v 1.19 1994/04/24 01:34:12 mycroft Exp $
  */
 #include "npx.h"
 #if NNPX > 0
@@ -56,7 +56,7 @@
 
 #include <i386/isa/icu.h>
 #include <i386/isa/isavar.h>
-#include <i386/isa/isa.h>
+#include <i386/isa/isareg.h>
 
 /*
  * 387 and 287 Numeric Coprocessor Extension (NPX) Driver.
diff --git a/sys/arch/i386/isa/pccons.c b/sys/arch/i386/isa/pccons.c
index 5027ebcf92a2..2d6613b6ba40 100644
--- a/sys/arch/i386/isa/pccons.c
+++ b/sys/arch/i386/isa/pccons.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pccons.c	5.11 (Berkeley) 5/21/91
- *	$Id: pccons.c,v 1.62 1994/04/07 06:51:08 mycroft Exp $
+ *	$Id: pccons.c,v 1.63 1994/04/24 01:34:14 mycroft Exp $
  */
 
 /*
@@ -65,7 +65,7 @@
 #include <machine/pc/display.h>
 #include <machine/pccons.h>
 
-#include <i386/isa/isa.h>
+#include <i386/isa/isareg.h>
 #include <i386/isa/isavar.h>
 #include <i386/isa/icu.h>
 #include <i386/isa/kbdreg.h>
@@ -155,8 +155,10 @@ kbd_wait()
 	u_int i;
 
 	for (i = 100000; i; i--)
-		if ((inb(KBSTATP) & KBS_IBF) == 0)
+		if ((inb(KBSTATP) & KBS_IBF) == 0) {
+			delay(6);
 			return 1;
+		}
 	return 0;
 }
 
@@ -214,6 +216,7 @@ kbd_cmd(val, polling)
 			for (i = 100000; i; i--) {
 				if (inb(KBSTATP) & KBS_DIB) {
 					register u_char c;
+					delay(6);
 					c = inb(KBDATAP);
 					if (c == KBR_ACK || c == KBR_ECHO) {
 						ack = 1;
@@ -330,14 +333,17 @@ pcprobe(parent, self, aux)
 
 #if 1
 	/* Flush any garbage. */
-	while (inb(KBSTATP) & KBS_DIB)
+	while (inb(KBSTATP) & KBS_DIB) {
+		delay(6);
 		(void) inb(KBDATAP);
+	}
 	/* Reset the keyboard. */
 	if (!kbd_cmd(KBC_RESET, 1)) {
 		printf("pcprobe: reset error %d\n", 1);
 		goto lose;
 	}
 	while ((inb(KBSTATP) & KBS_DIB) == 0);
+	delay(6);
 	if (inb(KBDATAP) != KBR_RSTDONE) {
 		printf("pcprobe: reset error %d\n", 2);
 		goto lose;
@@ -347,8 +353,10 @@ pcprobe(parent, self, aux)
 	 * This is kind of stupid, but we account for them anyway by just
 	 * flushing the buffer.
 	 */
-	while (inb(KBSTATP) & KBS_DIB)
+	while (inb(KBSTATP) & KBS_DIB) {
+		delay(6);
 		(void) inb(KBDATAP);
+	}
 	/* Just to be sure. */
 	if (!kbd_cmd(KBC_ENABLE, 1)) {
 		printf("pcprobe: reset error %d\n", 3);
diff --git a/sys/arch/i386/isa/spkr.c b/sys/arch/i386/isa/spkr.c
index f1ba20792183..3355d9ef61be 100644
--- a/sys/arch/i386/isa/spkr.c
+++ b/sys/arch/i386/isa/spkr.c
@@ -6,7 +6,7 @@
  *      386bsd only clean version, all SYSV stuff removed
  *      use hz value from param.c
  *
- *	$Id: spkr.c,v 1.11 1994/04/24 01:30:02 mycroft Exp $
+ *	$Id: spkr.c,v 1.12 1994/04/24 01:34:16 mycroft Exp $
  */
 
 #include "speaker.h"
@@ -23,7 +23,7 @@
 #include <machine/spkr.h>
 
 #include <i386/isa/timerreg.h>
-#include <i386/isa/spkr_reg.h>
+#include <i386/isa/spkrreg.h>
 
 /**************** MACHINE DEPENDENT PART STARTS HERE *************************
  *
diff --git a/sys/arch/i386/isa/spkrreg.h b/sys/arch/i386/isa/spkrreg.h
new file mode 100644
index 000000000000..743a8525af38
--- /dev/null
+++ b/sys/arch/i386/isa/spkrreg.h
@@ -0,0 +1,11 @@
+/*
+ * PIT port addresses and speaker control values
+ *
+ *	$Id: spkrreg.h,v 1.1 1994/04/24 01:34:17 mycroft Exp $
+ */
+
+#define PITAUX_PORT	0x61	/* port of Programmable Peripheral Interface */
+#define PIT_ENABLETMR2	0x01	/* Enable timer/counter 2 */
+#define PIT_SPKRDATA	0x02	/* Direct to speaker */
+
+#define PIT_SPKR	(PIT_ENABLETMR2|PIT_SPKRDATA)
diff --git a/sys/dev/isa/isa.c b/sys/dev/isa/isa.c
index 7a435610dd78..bfcb50fb9018 100644
--- a/sys/dev/isa/isa.c
+++ b/sys/dev/isa/isa.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.c	7.2 (Berkeley) 5/13/91
- *	$Id: isa.c,v 1.51 1994/04/22 22:58:59 mycroft Exp $
+ *	$Id: isa.c,v 1.52 1994/04/24 01:34:09 mycroft Exp $
  */
 
 /*
@@ -52,12 +52,12 @@
 #include <machine/pio.h>
 #include <machine/cpufunc.h>
 
-#include <i386/isa/isa.h>
+#include <i386/isa/isareg.h>
 #include <i386/isa/isa_device.h>
 #include <i386/isa/isavar.h>
 #include <i386/isa/ic/i8042.h>
 #include <i386/isa/timerreg.h>
-#include <i386/isa/spkr_reg.h>
+#include <i386/isa/spkrreg.h>
 
 /* sorry, has to be here, no place else really suitable */
 #include <machine/pc/display.h>
diff --git a/sys/dev/isa/isadma.c b/sys/dev/isa/isadma.c
index 06e22e1a23ac..98ed271c9e7f 100644
--- a/sys/dev/isa/isadma.c
+++ b/sys/dev/isa/isadma.c
@@ -10,7 +10,7 @@
 
 #include <machine/pio.h>
 
-#include <i386/isa/isa.h>
+#include <i386/isa/isareg.h>
 #include <i386/isa/dmavar.h>
 #include <i386/isa/dmareg.h>
 
diff --git a/sys/dev/isa/isareg.h b/sys/dev/isa/isareg.h
new file mode 100644
index 000000000000..c18ab1a77c30
--- /dev/null
+++ b/sys/dev/isa/isareg.h
@@ -0,0 +1,207 @@
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * William Jolitz.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
+ *	$Id: isareg.h,v 1.1 1994/04/24 01:34:11 mycroft Exp $
+ */
+
+/*
+ * ISA Bus conventions
+ */
+
+#ifndef LOCORE
+#include <sys/cdefs.h>
+
+unsigned char rtcin __P((int));
+void sysbeep __P((int, int));
+unsigned kbd_8042cmd __P((int));
+#endif
+
+
+/*
+ * Input / Output Port Assignments
+ */
+
+#ifndef IO_BEGIN
+#define	IO_ISABEGIN	0x000		/* 0x000 - Beginning of I/O Registers */
+
+		/* CPU Board */
+#define IO_DMA1		0x000		/* 8237A DMA Controller #1 */
+#define IO_ICU1		0x020		/* 8259A Interrupt Controller #1 */
+#define IO_TIMER1	0x040		/* 8252 Timer #1 */
+#define IO_TIMER2	0x048		/* 8252 Timer #2 (EISA only) */
+#define IO_KBD		0x060		/* 8042 Keyboard */
+#define IO_RTC		0x070		/* RTC */
+#define IO_NMI		IO_RTC		/* NMI Control */
+#define IO_DMAPG	0x080		/* DMA Page Registers */
+#define IO_ICU2		0x0A0		/* 8259A Interrupt Controller #2 */
+#define IO_DMA2		0x0C0		/* 8237A DMA Controller #2 */
+#define IO_NPX		0x0F0		/* Numeric Coprocessor */
+
+		/* Cards */
+					/* 0x100 - 0x16F Open */
+
+#define IO_WD2		0x170		/* Secondary Fixed Disk Controller */
+
+					/* 0x178 - 0x1EF Open */
+
+#define IO_WD1		0x1f0		/* Primary Fixed Disk Controller */
+#define IO_GAME		0x200		/* Game Controller */
+
+					/* 0x208 - 0x237 Open */
+
+#define IO_BMS2		0x238		/* secondary InPort Bus Mouse */
+#define IO_BMS1		0x23c		/* primary InPort Bus Mouse */
+
+					/* 0x240 - 0x277 Open */
+
+#define IO_LPT2		0x278		/* Parallel Port #2 */
+
+					/* 0x280 - 0x2E7 Open */
+
+#define	IO_COM4		0x2e8		/* COM4 i/o address */
+
+					/* 0x2F0 - 0x2F7 Open */
+
+#define IO_COM2		0x2f8		/* COM2 i/o address */
+
+					/* 0x300 - 0x32F Open */
+
+#define	IO_BT0		0x330		/* bustek 742a default addr. */
+#define	IO_AHA0		0x330		/* adaptec 1542 default addr. */
+#define	IO_UHA0		0x330		/* ultrastore 14f default addr. */
+#define	IO_BT1          0x334		/* bustek 742a default addr. */
+#define IO_AHA1         0x334		/* adaptec 1542 default addr. */
+
+					/* 0x338 - 0x34F Open */
+
+#define IO_WDS		0x350		/* WD7000 scsi */
+
+					/* 0x354 - 0x36F Open */
+
+#define IO_FD2		0x370		/* secondary base i/o address */
+#define IO_LPT1		0x378		/* Parallel Port #1 */
+
+					/* 0x380 - 0x3AF Open */
+
+#define IO_MDA		0x3B0		/* Monochome Adapter */
+#define IO_LPT3		0x3BC		/* Monochome Adapter Printer Port */
+#define IO_VGA		0x3C0		/* E/VGA Ports */
+#define IO_CGA		0x3D0		/* CGA Ports */
+
+					/* 0x3E0 - 0x3E7 Open */
+
+#define	IO_COM3		0x3e8		/* COM3 i/o address */
+#define IO_FD1		0x3f0		/* primary base i/o address */
+#define IO_COM1		0x3f8		/* COM1 i/o address */
+
+#define	IO_ISAEND	0x3FF		/* - 0x3FF End of I/O Registers */
+#endif	IO_ISABEGIN
+
+/*
+ * Input / Output Port Sizes - these are from several sources, and tend
+ * to be the larger of what was found, ie COM ports can be 4, but some
+ * boards do not fully decode the address, thus 8 ports are used.
+ */
+
+#ifndef	IO_ISASIZES
+#define	IO_ISASIZES
+
+#define	IO_COMSIZE	8	/* 8250, 16X50 com controllers (*/
+#define	IO_CGASIZE	16	/* CGA controllers */
+#define	IO_DMASIZE	16	/* 8237 DMA controllers */
+#define	IO_DPGSIZE	32	/* 74LS612 DMA page reisters */
+#define	IO_FDCSIZE	8	/* Nec765 floppy controllers */
+#define	IO_WDCSIZE	8	/* WD compatible disk controller */
+#define	IO_GAMSIZE	16	/* AT compatible game controller */
+#define	IO_ICUSIZE	16	/* 8259A interrupt controllers */
+#define	IO_KBDSIZE	16	/* 8042 Keyboard controllers */
+#define	IO_LPTSIZE	8	/* LPT controllers, some use onl */
+#define	IO_MDASIZE	16	/* Monochrome display controller */
+#define	IO_RTCSIZE	16	/* CMOS real time clock, NMI con */
+#define	IO_TMRSIZE	16	/* 8253 programmable timers */
+#define	IO_NPXSIZE	16	/* 80387/80487 NPX registers */
+#define	IO_VGASIZE	16	/* VGA controllers */
+
+#endif	/* IO_ISASIZES */
+
+/*
+ * Input / Output Memory Physical Addresses
+ */
+
+#ifndef	IOM_BEGIN
+#define	IOM_BEGIN	0x0a0000		/* Start of I/O Memory "hole" */
+#define	IOM_END		0x100000		/* End of I/O Memory "hole" */
+#define	IOM_SIZE	(IOM_END - IOM_BEGIN)
+#endif	IOM_BEGIN
+
+/*
+ * RAM Physical Address Space (ignoring the above mentioned "hole")
+ */
+
+#ifndef	RAM_BEGIN
+#define	RAM_BEGIN	0x0000000	/* Start of RAM Memory */
+#define	RAM_END		0x1000000	/* End of RAM Memory */
+#define	RAM_SIZE	(RAM_END - RAM_BEGIN)
+#endif	RAM_BEGIN
+
+/*
+ * Oddball Physical Memory Addresses
+ */
+#ifndef	COMPAQ_RAMRELOC
+#define	COMPAQ_RAMRELOC	0x80c00000	/* Compaq RAM relocation/diag */
+#define	COMPAQ_RAMSETUP	0x80c00002	/* Compaq RAM setup */
+#define	WEITEK_FPU	0xC0000000	/* WTL 2167 */
+#define	CYRIX_EMC	0xC0000000	/* Cyrix EMC */
+#endif	COMPAQ_RAMRELOC
+
+/* stuff that used to be in pccons.c */
+#define MONO_BASE	0x3B4
+#define MONO_BUF	(KERNBASE + 0xB0000)
+#define CGA_BASE	0x3D4
+#define CGA_BUF		(KERNBASE + 0xB8000)
+#define IOPHYSMEM	0xA0000
+
+/*
+ * size of dma bounce buffer in pages
+ * - currently 1 page per channel
+ */
+#ifndef DMA_BOUNCE
+#define DMA_BOUNCE      8
+#endif
+
+#ifndef LOCORE
+extern vm_offset_t isaphysmem;
+#endif