From submitter:

The attached diff attempts to eliminate as much of the difference
between the i386 and the pc98 version of the file as possible.  It
should not make any semantic difference (it consists of whitespace
changes, order changes, comment changes, changes of case for hex
constants, and merging in a couple of constants that hadn't made it
from the i386 version.)

Submitted by:	eivind

2 files changed, 106 insertions, 114 deletions

diff --git a/sys/pc98/cbus/cbus.h b/sys/pc98/cbus/cbus.h
index 0fe8e5a..50abf69 100644
--- a/sys/pc98/cbus/cbus.h
+++ b/sys/pc98/cbus/cbus.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id$
+ *	$Id: pc98.h,v 1.10 1997/02/22 09:43:42 peter Exp $
  */
 
 #ifndef _PC98_PC98_PC98_H_
@@ -44,9 +44,6 @@
 
 /*
  * PC98 Bus conventions
- */
-/*
- * PC98 Bus conventions
  * modified for PC9801 by A.Kojima F.Ukai M.Ishii 
  *			Kyoto University Microcomputer Club (KMC)
  */
@@ -54,51 +51,50 @@
 /*
  * Input / Output Port Assignments
  */
-
 #ifndef IO_ISABEGIN
 #define	IO_ISABEGIN	0x000		/* 0x000 - Beginning of I/O Registers */
 
 /* PC98 IO address ... very dirty (^_^; */
 
-#define IO_ICU1		0x000		/* 8259A Interrupt Controller #1 */
-#define IO_DMA		0x001		/* 8237A DMA Controller */
-#define IO_ICU2		0x008		/* 8259A Interrupt Controller #2 */
-#define IO_RTC		0x020		/* 4990A RTC */
-#define IO_DMAPG	0x021		/* DMA Page Registers */
-#define IO_COM1		0x030		/* 8251A RS232C serial I/O (int) */
-#define IO_SYSPORT	0x031		/* 8255A System Port */
-#define IO_PPI		0x035		/* Programmable Peripheral Interface */
-#define IO_LPT		0x040		/* 8255A Printer Port */
-#define IO_KBD		0x041		/* 8251A Keyboard */
-#define IO_NMI		0x050		/* NMI Control */
-#define IO_WAIT		0x05F		/* WAIT 0.6 us */
-#define IO_GDC1		0x060		/* 7220 GDC Text Control */
-#define IO_TIMER1	0x071		/* 8253C Timer */
-#define IO_SASI		0x080		/* SASI Hard Disk Controller */
-#define IO_FD1		0x090		/* 765A 1MB FDC */
-#define	IO_GDC2		0x0a0		/* 7220 GDC Graphic Control */
-#define	IO_CGROM	0x0a1		/* Character ROM */
-#define	IO_COM2		0x0b1		/* 8251A RS232C serial I/O (ext) */
-#define	IO_COM3		0x0b9		/* 8251A RS232C serial I/O (ext) */
-#define IO_FDPORT	0x0be		/* FD I/F port (1M<->640K,EMTON) */
-#define IO_FD2		0x0c8		/* 765A 640KB FDC */
-#define IO_SIO1		0x0d0		/* MC16550II ext RS232C */
-#define IO_REEST	0x0F0		/* CPU FPU reset */
-#define IO_A2OEN	0x0F2		/* A20 enable */
-#define IO_A20CT	0x0F6		/* A20 control enable/disable */
-#define IO_NPX		0x0F8		/* Numeric Coprocessor */
+#define	IO_ICU1		0x000		/* 8259A Interrupt Controller #1 */
+#define	IO_DMA		0x001		/* 8237A DMA Controller */
+#define	IO_ICU2		0x008		/* 8259A Interrupt Controller #2 */
+#define	IO_RTC		0x020		/* 4990A RTC */
+#define	IO_DMAPG	0x021		/* DMA Page Registers */
+#define	IO_COM1		0x030		/* 8251A RS232C serial I/O (int) */
+#define	IO_SYSPORT	0x031		/* 8255A System Port */
+#define	IO_PPI		0x035		/* Programmable Peripheral Interface */
+#define	IO_LPT		0x040		/* 8255A Printer Port */
+#define	IO_KBD		0x041		/* 8251A Keyboard */
+#define	IO_NMI		0x050		/* NMI Control */
+#define	IO_WAIT		0x05F		/* WAIT 0.6 us */
+#define	IO_GDC1		0x060		/* 7220 GDC Text Control */
+#define	IO_TIMER1	0x071		/* 8253C Timer */
+#define	IO_SASI		0x080		/* SASI Hard Disk Controller */
+#define	IO_FD1		0x090		/* 765A 1MB FDC */
+#define	IO_GDC2		0x0A0		/* 7220 GDC Graphic Control */
+#define	IO_CGROM	0x0A1		/* Character ROM */
+#define	IO_COM2		0x0B1		/* 8251A RS232C serial I/O (ext) */
+#define	IO_COM3		0x0B9		/* 8251A RS232C serial I/O (ext) */
+#define	IO_FDPORT	0x0BE		/* FD I/F port (1M<->640K,EMTON) */
+#define	IO_FD2		0x0C8		/* 765A 640KB FDC */
+#define	IO_SIO1		0x0D0		/* MC16550II ext RS232C */
+#define	IO_REEST	0x0F0		/* CPU FPU reset */
+#define	IO_A2OEN	0x0F2		/* A20 enable */
+#define	IO_A20CT	0x0F6		/* A20 control enable/disable */
+#define	IO_NPX		0x0F8		/* Numeric Coprocessor */
 #define	IO_SOUND	0x188		/* YM2203 FM sound board */
-#define	IO_EGC		0x4a0		/* 7220 GDC Graphic Control */
-#define IO_SCSI		0xcc0		/* SCSI Controller */
-#define IO_SIO2		0x8d0		/* MC16550II ext RS232C */
-#define IO_BEEPF	0x3fdb		/* beep frequency */
-#define IO_MOUSE	0x7fd9		/* mouse */
-#define IO_BMS		0x7fd9		/* Bus Mouse */
-#define IO_MSE		0x7fd9		/* Bus Mouse */
-#define IO_MOUSETM	0xdfbd		/* mouse timer */
-
-#define IO_WD1_NEC	0x640		/* 98note IDE Hard disk controller */
-#define IO_WD1_EPSON	0x80		/* 386note Hard disk controller */
+#define	IO_EGC		0x4A0		/* 7220 GDC Graphic Control */
+#define	IO_SCSI		0xCC0		/* SCSI Controller */
+#define	IO_SIO2		0x8D0		/* MC16550II ext RS232C */
+#define	IO_BEEPF	0x3FDB		/* beep frequency */
+#define	IO_MOUSE	0x7FD9		/* mouse */
+#define	IO_BMS		0x7FD9		/* Bus Mouse */
+#define	IO_MSE		0x7FD9		/* Bus Mouse */
+#define	IO_MOUSETM	0xDFBD		/* mouse timer */
+	
+#define	IO_WD1_NEC	0x640		/* 98note IDE Hard disk controller */
+#define	IO_WD1_EPSON	0x80		/* 386note Hard disk controller */
 #define	IO_WD1		IO_WD1_NEC	/* IDE Hard disk controller */
 
 #define	IO_ISAEND	0xFFFF		/* - 0x3FF End of I/O Registers */
@@ -109,44 +105,44 @@
  * 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 (4?) */
+#define	IO_ASCSIZE	5		/* AmiScan GI1904-based hand scanner */
 #define	IO_CGASIZE	16		/* CGA controllers */
+#define	IO_COMSIZE	8		/* 8250, 16X50 com controllers (4?) */
 #define	IO_DMASIZE	16		/* 8237 DMA controllers */
 #define	IO_DPGSIZE	32		/* 74LS612 DMA page registers */
+#define	IO_EISASIZE	4096		/* EISA controllers */
 #define	IO_FDCSIZE	8		/* Nec765 floppy controllers */
-#define	IO_WDCSIZE	8		/* WD compatible disk 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 */
 #define	IO_LPTSIZE	8		/* LPT controllers, some use only 4 */
 #define	IO_MDASIZE	16		/* Monochrome display controllers */
+#define	IO_NPXSIZE	16		/* 80387/80487 NPX registers */
+#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_NPXSIZE	16		/* 80387/80487 NPX registers */
 #define	IO_VGASIZE	16		/* VGA controllers */
-#define IO_EISASIZE	4096		/* EISA controllers */
-#define	IO_PMPSIZE	2		/* 82347 power management peripheral */
+#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_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 /* !RAM_BEGIN */
+#endif /* !IOM_BEGIN */
 
 /*
  * RAM Physical Address Space (ignoring the above mentioned "hole")
  */
-
 #ifndef	RAM_BEGIN
 #define	RAM_BEGIN	0x0000000	/* Start of RAM Memory */
 #ifdef	EPSON_BOUNCEDMA
@@ -162,11 +158,11 @@
  * 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
 
 #define	M_NEC_PC98	0x0001
diff --git a/sys/pc98/pc98/pc98.h b/sys/pc98/pc98/pc98.h
index 0fe8e5a..50abf69 100644
--- a/sys/pc98/pc98/pc98.h
+++ b/sys/pc98/pc98/pc98.h
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)isa.h	5.7 (Berkeley) 5/9/91
- *	$Id$
+ *	$Id: pc98.h,v 1.10 1997/02/22 09:43:42 peter Exp $
  */
 
 #ifndef _PC98_PC98_PC98_H_
@@ -44,9 +44,6 @@
 
 /*
  * PC98 Bus conventions
- */
-/*
- * PC98 Bus conventions
  * modified for PC9801 by A.Kojima F.Ukai M.Ishii 
  *			Kyoto University Microcomputer Club (KMC)
  */
@@ -54,51 +51,50 @@
 /*
  * Input / Output Port Assignments
  */
-
 #ifndef IO_ISABEGIN
 #define	IO_ISABEGIN	0x000		/* 0x000 - Beginning of I/O Registers */
 
 /* PC98 IO address ... very dirty (^_^; */
 
-#define IO_ICU1		0x000		/* 8259A Interrupt Controller #1 */
-#define IO_DMA		0x001		/* 8237A DMA Controller */
-#define IO_ICU2		0x008		/* 8259A Interrupt Controller #2 */
-#define IO_RTC		0x020		/* 4990A RTC */
-#define IO_DMAPG	0x021		/* DMA Page Registers */
-#define IO_COM1		0x030		/* 8251A RS232C serial I/O (int) */
-#define IO_SYSPORT	0x031		/* 8255A System Port */
-#define IO_PPI		0x035		/* Programmable Peripheral Interface */
-#define IO_LPT		0x040		/* 8255A Printer Port */
-#define IO_KBD		0x041		/* 8251A Keyboard */
-#define IO_NMI		0x050		/* NMI Control */
-#define IO_WAIT		0x05F		/* WAIT 0.6 us */
-#define IO_GDC1		0x060		/* 7220 GDC Text Control */
-#define IO_TIMER1	0x071		/* 8253C Timer */
-#define IO_SASI		0x080		/* SASI Hard Disk Controller */
-#define IO_FD1		0x090		/* 765A 1MB FDC */
-#define	IO_GDC2		0x0a0		/* 7220 GDC Graphic Control */
-#define	IO_CGROM	0x0a1		/* Character ROM */
-#define	IO_COM2		0x0b1		/* 8251A RS232C serial I/O (ext) */
-#define	IO_COM3		0x0b9		/* 8251A RS232C serial I/O (ext) */
-#define IO_FDPORT	0x0be		/* FD I/F port (1M<->640K,EMTON) */
-#define IO_FD2		0x0c8		/* 765A 640KB FDC */
-#define IO_SIO1		0x0d0		/* MC16550II ext RS232C */
-#define IO_REEST	0x0F0		/* CPU FPU reset */
-#define IO_A2OEN	0x0F2		/* A20 enable */
-#define IO_A20CT	0x0F6		/* A20 control enable/disable */
-#define IO_NPX		0x0F8		/* Numeric Coprocessor */
+#define	IO_ICU1		0x000		/* 8259A Interrupt Controller #1 */
+#define	IO_DMA		0x001		/* 8237A DMA Controller */
+#define	IO_ICU2		0x008		/* 8259A Interrupt Controller #2 */
+#define	IO_RTC		0x020		/* 4990A RTC */
+#define	IO_DMAPG	0x021		/* DMA Page Registers */
+#define	IO_COM1		0x030		/* 8251A RS232C serial I/O (int) */
+#define	IO_SYSPORT	0x031		/* 8255A System Port */
+#define	IO_PPI		0x035		/* Programmable Peripheral Interface */
+#define	IO_LPT		0x040		/* 8255A Printer Port */
+#define	IO_KBD		0x041		/* 8251A Keyboard */
+#define	IO_NMI		0x050		/* NMI Control */
+#define	IO_WAIT		0x05F		/* WAIT 0.6 us */
+#define	IO_GDC1		0x060		/* 7220 GDC Text Control */
+#define	IO_TIMER1	0x071		/* 8253C Timer */
+#define	IO_SASI		0x080		/* SASI Hard Disk Controller */
+#define	IO_FD1		0x090		/* 765A 1MB FDC */
+#define	IO_GDC2		0x0A0		/* 7220 GDC Graphic Control */
+#define	IO_CGROM	0x0A1		/* Character ROM */
+#define	IO_COM2		0x0B1		/* 8251A RS232C serial I/O (ext) */
+#define	IO_COM3		0x0B9		/* 8251A RS232C serial I/O (ext) */
+#define	IO_FDPORT	0x0BE		/* FD I/F port (1M<->640K,EMTON) */
+#define	IO_FD2		0x0C8		/* 765A 640KB FDC */
+#define	IO_SIO1		0x0D0		/* MC16550II ext RS232C */
+#define	IO_REEST	0x0F0		/* CPU FPU reset */
+#define	IO_A2OEN	0x0F2		/* A20 enable */
+#define	IO_A20CT	0x0F6		/* A20 control enable/disable */
+#define	IO_NPX		0x0F8		/* Numeric Coprocessor */
 #define	IO_SOUND	0x188		/* YM2203 FM sound board */
-#define	IO_EGC		0x4a0		/* 7220 GDC Graphic Control */
-#define IO_SCSI		0xcc0		/* SCSI Controller */
-#define IO_SIO2		0x8d0		/* MC16550II ext RS232C */
-#define IO_BEEPF	0x3fdb		/* beep frequency */
-#define IO_MOUSE	0x7fd9		/* mouse */
-#define IO_BMS		0x7fd9		/* Bus Mouse */
-#define IO_MSE		0x7fd9		/* Bus Mouse */
-#define IO_MOUSETM	0xdfbd		/* mouse timer */
-
-#define IO_WD1_NEC	0x640		/* 98note IDE Hard disk controller */
-#define IO_WD1_EPSON	0x80		/* 386note Hard disk controller */
+#define	IO_EGC		0x4A0		/* 7220 GDC Graphic Control */
+#define	IO_SCSI		0xCC0		/* SCSI Controller */
+#define	IO_SIO2		0x8D0		/* MC16550II ext RS232C */
+#define	IO_BEEPF	0x3FDB		/* beep frequency */
+#define	IO_MOUSE	0x7FD9		/* mouse */
+#define	IO_BMS		0x7FD9		/* Bus Mouse */
+#define	IO_MSE		0x7FD9		/* Bus Mouse */
+#define	IO_MOUSETM	0xDFBD		/* mouse timer */
+	
+#define	IO_WD1_NEC	0x640		/* 98note IDE Hard disk controller */
+#define	IO_WD1_EPSON	0x80		/* 386note Hard disk controller */
 #define	IO_WD1		IO_WD1_NEC	/* IDE Hard disk controller */
 
 #define	IO_ISAEND	0xFFFF		/* - 0x3FF End of I/O Registers */
@@ -109,44 +105,44 @@
  * 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 (4?) */
+#define	IO_ASCSIZE	5		/* AmiScan GI1904-based hand scanner */
 #define	IO_CGASIZE	16		/* CGA controllers */
+#define	IO_COMSIZE	8		/* 8250, 16X50 com controllers (4?) */
 #define	IO_DMASIZE	16		/* 8237 DMA controllers */
 #define	IO_DPGSIZE	32		/* 74LS612 DMA page registers */
+#define	IO_EISASIZE	4096		/* EISA controllers */
 #define	IO_FDCSIZE	8		/* Nec765 floppy controllers */
-#define	IO_WDCSIZE	8		/* WD compatible disk 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 */
 #define	IO_LPTSIZE	8		/* LPT controllers, some use only 4 */
 #define	IO_MDASIZE	16		/* Monochrome display controllers */
+#define	IO_NPXSIZE	16		/* 80387/80487 NPX registers */
+#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_NPXSIZE	16		/* 80387/80487 NPX registers */
 #define	IO_VGASIZE	16		/* VGA controllers */
-#define IO_EISASIZE	4096		/* EISA controllers */
-#define	IO_PMPSIZE	2		/* 82347 power management peripheral */
+#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_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 /* !RAM_BEGIN */
+#endif /* !IOM_BEGIN */
 
 /*
  * RAM Physical Address Space (ignoring the above mentioned "hole")
  */
-
 #ifndef	RAM_BEGIN
 #define	RAM_BEGIN	0x0000000	/* Start of RAM Memory */
 #ifdef	EPSON_BOUNCEDMA
@@ -162,11 +158,11 @@
  * 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
 
 #define	M_NEC_PC98	0x0001