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

years ago. Remove redunant copy of isaregs.h.

1 files changed, 1 insertions, 115 deletions

diff --git a/sys/isa/isareg.h b/sys/isa/isareg.h
index 534d76a59493..c959d74128d0 100644
--- a/sys/isa/isareg.h
+++ b/sys/isa/isareg.h
@@ -40,8 +40,6 @@
 #ifndef _ISA_ISA_H_
 #define	_ISA_ISA_H_
 
-/* BEWARE:  Included in both assembler and C code */
-
 /*
  * ISA Bus conventions
  */
@@ -51,134 +49,22 @@
  */
 #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 */
-					/* 0x100 - 0x16F Open */
-
-#define	IO_WD2		0x170		/* Secondary Fixed Disk Controller */
-
-#define	IO_PMP2		0x178		/* 82347 Power Management Peripheral */
-
-					/* 0x17A - 0x1EF Open */
-
-#define	IO_WD1		0x1F0		/* Primary Fixed Disk Controller */
-#define	IO_GAME		0x201		/* Game Controller */
-
-					/* 0x202 - 0x22A Open */
-
-#define	IO_ASC2		0x22B		/* AmiScan addr.grp. 2 */
-
-					/* 0x230 - 0x26A Open */
-
-#define	IO_ASC3		0x26B		/* AmiScan addr.grp. 3 */
-#define	IO_GSC1		0x270 /* -- 0x27B! GeniScan GS-4500 addr.grp. 1 */
-#define	IO_LPT2		0x278		/* Parallel Port #2 */
-
-					/* 0x280 - 0x2AA Open */
-
-#define	IO_ASC4		0x2AB		/* AmiScan addr.grp. 4 */
-
-					/* 0x2B0 - 0x2DF Open */
-
-#define	IO_GSC2		0x2E0		/* GeniScan GS-4500 addr.grp. 2 */
-#define	IO_COM4		0x2E8		/* COM4 i/o address */
-#define	IO_ASC5		0x2EB		/* AmiScan addr.grp. 5 */
-
-					/* 0x2F0 - 0x2F7 Open */
-
-#define	IO_COM2		0x2F8		/* COM2 i/o address */
-
-					/* 0x300 - 0x32A Open */
-
-#define	IO_ASC6		0x32B		/* AmiScan addr.grp. 6 */
-#define	IO_AHA0		0x330		/* adaptec 1542 default addr. */
-#define	IO_BT0		0x330		/* bustek 742a default addr. */
-#define	IO_UHA0		0x330		/* ultrastore 14f default addr. */
-#define	IO_AHA1		0x334		/* adaptec 1542 default addr. */
-#define	IO_BT1		0x334		/* bustek 742a default addr. */
-
-					/* 0x340 - 0x36A Open */
-
-#define	IO_ASC7		0x36B		/* AmiScan addr.grp. 7 */
-#define	IO_GSC3		0x370		/* GeniScan GS-4500 addr.grp. 3 */
-#define	IO_FD2		0x370		/* secondary base i/o address */
-#define	IO_LPT1		0x378		/* Parallel Port #1 */
-
-					/* 0x380 - 0x3AA Open */
-
-#define	IO_ASC8		0x3AB		/* AmiScan addr.grp. 8 */
 #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 */
-#define	IO_GSC4		0x3E0		/* GeniScan GS-4500 addr.grp. 4 */
-#define	IO_COM3		0x3E8		/* COM3 i/o address */
-#define	IO_ASC1		0x3EB		/* AmiScan addr.grp. 1 */
-#define	IO_FD1		0x3F0		/* primary base i/o address */
-#define	IO_COM1		0x3F8		/* COM1 i/o address */
 
-#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.
+ * Input / Output Port Sizes
  */
-#ifndef	IO_ISASIZES
-#define	IO_ISASIZES
-
-#define	IO_ASCSIZE	5		/* AmiScan GI1904-based hand scanner */
 #define	IO_CGASIZE	12		/* CGA controllers */
-#define	IO_EISASIZE	256		/* EISA controllers */
-#define	IO_FDCSIZE	8		/* Nec765 floppy controllers */
-#define	IO_GAMSIZE	16		/* AT compatible game controllers */
-#define	IO_GSCSIZE	8		/* GeniScan GS-4500G hand scanner */
-#define	IO_ICUSIZE	16		/* 8259A interrupt controllers */
-#define	IO_KBDSIZE	16		/* 8042 Keyboard controllers */
-
-/* The following line was changed to support more architectures (simpler
-   chipsets (like those for Alpha) only use 4, but more complex controllers
-   (usually modern i386's) can use an additional 4; the probe to see if
-   the additional 4 can be used by the specific chipset is now done in the ppc
-   code by ppc_probe()... */
-
-#define IO_LPTSIZE_EXTENDED	8	/* "Extended" LPT controllers */
-#define IO_LPTSIZE_NORMAL	4	/* "Normal" LPT controllers */
-
 #define	IO_MDASIZE	12		/* Monochrome display controllers */
-#define	IO_PMPSIZE	2		/* 82347 power management peripheral */
-#define	IO_PSMSIZE	5		/* 8042 Keyboard controllers */
-#define	IO_RTCSIZE	16		/* CMOS real time clock, NMI control */
-#define	IO_TMRSIZE	16		/* 8253 programmable timers */
 #define	IO_VGASIZE	16		/* VGA controllers */
-#define	IO_WDCSIZE	8		/* WD compatible disk 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 /* !_ISA_ISA_H_ */