Remove vestiges of knowing the ISA bus, which we gave up on around 20

years ago. Remove redunant copy of isaregs.h.

3 files changed, 2 insertions, 104 deletions

diff --git a/sys/x86/isa/atpic.c b/sys/x86/isa/atpic.c
index 1eab543..6ce6d1a 100644
--- a/sys/x86/isa/atpic.c
+++ b/sys/x86/isa/atpic.c
@@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
 #ifdef PC98
 #include <pc98/cbus/cbus.h>
 #else
-#include <x86/isa/isa.h>
+#include <isa/isareg.h>
 #endif
 #include <isa/isavar.h>
 
diff --git a/sys/x86/isa/isa.h b/sys/x86/isa/isa.h
deleted file mode 100644
index 78bd956..0000000
--- a/sys/x86/isa/isa.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/*-
- * 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.
- * 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
- * $FreeBSD$
- */
-
-#ifdef PC98
-#error isa.h is included from PC-9801 source
-#endif
-
-#ifndef _X86_ISA_ISA_H_
-#define	_X86_ISA_ISA_H_
-
-/* BEWARE:  Included in both assembler and C code */
-
-/*
- * ISA Bus conventions
- */
-
-/*
- * Input / Output Port Assignments
- */
-#ifndef IO_ISABEGIN
-#define	IO_ISABEGIN	0x000		/* 0x000 - Beginning of I/O Registers */
-
-		/* CPU Board */
-#define	IO_ICU1		0x020		/* 8259A Interrupt Controller #1 */
-#define	IO_PMP1		0x026		/* 82347 Power Management Peripheral */
-#define	IO_KBD		0x060		/* 8042 Keyboard */
-#define	IO_RTC		0x070		/* RTC */
-#define	IO_NMI		IO_RTC		/* NMI Control */
-#define	IO_ICU2		0x0A0		/* 8259A Interrupt Controller #2 */
-
-		/* Cards */
-#define	IO_VGA		0x3C0		/* E/VGA Ports */
-#define	IO_CGA		0x3D0		/* CGA Ports */
-#define	IO_MDA		0x3B0		/* Monochome Adapter */
-
-#define	IO_ISAEND	0x3FF		/* End (actually Max) of I/O Regs */
-#endif /* !IO_ISABEGIN */
-
-/*
- * Input / Output Port Sizes - these are from several sources, and tend
- * to be the larger of what was found.
- */
-#ifndef	IO_ISASIZES
-#define	IO_ISASIZES
-
-#define	IO_CGASIZE	12		/* CGA controllers */
-#define	IO_MDASIZE	12		/* Monochrome display controllers */
-#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 */
-
-#endif /* !_X86_ISA_ISA_H_ */
diff --git a/sys/x86/isa/isa_dma.c b/sys/x86/isa/isa_dma.c
index 90ee14d..6b869cd 100644
--- a/sys/x86/isa/isa_dma.c
+++ b/sys/x86/isa/isa_dma.c
@@ -61,7 +61,7 @@ __FBSDID("$FreeBSD$");
 #include <isa/isavar.h>
 #include <isa/isa_dmareg.h>
 
-#define	ISARAM_END	RAM_END
+#define	ISARAM_END	0x1000000
 
 static int isa_dmarangecheck(caddr_t va, u_int length, int chan);