1 files changed, 57 insertions, 59 deletions

diff --git a/sys/i386/isa/isa.h b/sys/i386/isa/isa.h
index 4357f42e6334..864b7e6405c7 100644
--- a/sys/i386/isa/isa.h
+++ b/sys/i386/isa/isa.h
@@ -34,13 +34,14 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id: isa.h,v 1.13 1995/01/25 20:11:50 jmz Exp $
+ *	$Id: isa.h,v 1.14 1995/02/25 20:26:14 phk Exp $
  */
 
 #ifndef _I386_ISA_ISA_H_
 #define	_I386_ISA_ISA_H_
 
 /* BEWARE:  Included in both assembler and C code */
+
 /*
  * ISA Bus conventions
  */
@@ -48,87 +49,86 @@
 /*
  * Input / Output Port Assignments
  */
-
-#ifndef IO_BEGIN
+#ifndef IO_ISABEGIN
 #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_PMP1		0x026		/* 82347 Power Management Peripheral */
-#define IO_TIMER1	0x040		/* 8253 Timer #1 */
-#define IO_TIMER2	0x048		/* 8253 Timer #2 */
-#define IO_KBD		0x060		/* 8042 Keyboard */
-#define IO_PPI		0x061		/* Programmable Peripheral Interface */
-#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 */
+#define	IO_DMA1		0x000		/* 8237A DMA Controller #1 */
+#define	IO_ICU1		0x020		/* 8259A Interrupt Controller #1 */
+#define	IO_PMP1		0x026		/* 82347 Power Management Peripheral */
+#define	IO_TIMER1	0x040		/* 8253 Timer #1 */
+#define	IO_TIMER2	0x048		/* 8253 Timer #2 */
+#define	IO_KBD		0x060		/* 8042 Keyboard */
+#define	IO_PPI		0x061		/* Programmable Peripheral Interface */
+#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 */
+#define	IO_WD2		0x170		/* Secondary Fixed Disk Controller */
 
-#define IO_PMP2		0x178		/* 82347 Power Management Peripheral */
+#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 */
+#define	IO_WD1		0x1F0		/* Primary Fixed Disk Controller */
+#define	IO_GAME		0x201		/* Game Controller */
 
-#define IO_GSC1         0x270 /* -- 0x27B! GeniScan GS-4500 addr.grp. 1 */
-#define IO_GSC2         0x2e0           /* GeniScan GS-4500 addr.grp. 2 */
-#define IO_GSC3         0x370           /* GeniScan GS-4500 addr.grp. 3 */
-#define IO_GSC4         0x3e0           /* GeniScan GS-4500 addr.grp. 4 */
+					/* 0x202 (?) - 0x26F Open */
 
-#define IO_LPT2		0x278		/* Parallel Port #2 */
+#define	IO_GSC1		0x270 /* -- 0x27B! GeniScan GS-4500 addr.grp. 1 */
+#define	IO_LPT2		0x278		/* Parallel Port #2 */
 
-#define	IO_COM4		0x2e8		/* COM4 i/o address */
+					/* 0x280 - 0x2DF Open */
+
+#define	IO_GSC2		0x2E0		/* GeniScan GS-4500 addr.grp. 2 */
+#define	IO_COM4		0x2E8		/* COM4 i/o address */
 
 					/* 0x2F0 - 0x2F7 Open */
 
-#define IO_COM2		0x2f8		/* COM2 i/o address */
+#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_BT0		0x330		/* bustek 742a 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 - 0x36F Open */
-
-#define IO_FD2		0x370		/* secondary base i/o address */
-#define IO_LPT1		0x378		/* Parallel Port #1 */
+#define	IO_BT1		0x334		/* bustek 742a default addr. */
 
-					/* 0x380 - 0x3AF Open */
+					/* 0x340 - 0x36F 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 */
+#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 */
 
-					/* 0x3E0 - 0x3E7 Open */
+					/* 0x380 - 0x3AF 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_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_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
+#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, ie COM ports can be 4, but some
- * boards do not fully decode the address, thus 8 ports are used.
+ * to be the larger of what was found.
  */
-
 #ifndef	IO_ISASIZES
 #define	IO_ISASIZES
 
-#define	IO_COMSIZE	8		/* 8250, 16X50 com controllers (4?) */
+#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 */
@@ -143,39 +143,37 @@
 #define	IO_TMRSIZE	16		/* 8253 programmable timers */
 #define	IO_NPXSIZE	16		/* 80387/80487 NPX registers */
 #define	IO_VGASIZE	16		/* VGA controllers */
-#define IO_EISASIZE	256		/* EISA controllers */
+#define	IO_EISASIZE	256		/* EISA controllers */
 #define	IO_PMPSIZE	2		/* 82347 power management peripheral */
 
-#endif	/* IO_ISASIZES */
+#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_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
+#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 /* 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	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
+#endif /* COMPAQ_RAMRELOC */
 
 #endif /* !_I386_ISA_ISA_H_ */