Remove obsolete defines.

2 files changed, 0 insertions, 126 deletions

diff --git a/sys/pc98/cbus/cbus.h b/sys/pc98/cbus/cbus.h
index f066f49..9788cb0 100644
--- a/sys/pc98/cbus/cbus.h
+++ b/sys/pc98/cbus/cbus.h
@@ -56,43 +56,15 @@
 #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_WD1		IO_WD1_NEC	/* IDE Hard disk controller */
-
 #define	IO_ISAEND	0xFFFF		/* - 0x3FF End of I/O Registers */
 #endif /* !IO_ISABEGIN */
 
@@ -104,27 +76,11 @@
 #ifndef	IO_ISASIZES
 #define	IO_ISASIZES
 
-#define	IO_ASCSIZE	5		/* AmiScan GI1904-based hand scanner */
-#define	IO_CGASIZE	16		/* CGA controllers */
-#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_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_LPTSIZE_EXTENDED	8	/* "Extended" LPT controllers */
 #define	IO_LPTSIZE_NORMAL	4	/* "Normal" LPT controllers */
-#define	IO_MDASIZE	16		/* Monochrome display controllers */
 #define	IO_NPXSIZE	8		/* 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_VGASIZE	16		/* VGA controllers */
-#define	IO_WDCSIZE	8		/* WD compatible disk controllers */
 
 #endif /* !IO_ISASIZES */
 
@@ -150,18 +106,6 @@
 #define	RAM_SIZE	(RAM_END - RAM_BEGIN)
 #endif /* !RAM_BEGIN */
 
-#ifndef PC98 /* IBM-PC */
-/*
- * 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 */
-#endif
-
 #define	M_NEC_PC98	0x0001
 #define	M_EPSON_PC98	0x0002
 #define	M_NOT_H98	0x0010
@@ -170,11 +114,4 @@
 #define	M_NORMAL	0x1000
 #define	M_8M		0x8000
 
-/*
- * Obtained from NetBSD/pc98
- */
-#define MADDRUNK	-1
-#define IRQUNK		 0
-#define DRQUNK		-1
-
 #endif /* !_PC98_PC98_PC98_H_ */
diff --git a/sys/pc98/pc98/pc98.h b/sys/pc98/pc98/pc98.h
index f066f49..9788cb0 100644
--- a/sys/pc98/pc98/pc98.h
+++ b/sys/pc98/pc98/pc98.h
@@ -56,43 +56,15 @@
 #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_WD1		IO_WD1_NEC	/* IDE Hard disk controller */
-
 #define	IO_ISAEND	0xFFFF		/* - 0x3FF End of I/O Registers */
 #endif /* !IO_ISABEGIN */
 
@@ -104,27 +76,11 @@
 #ifndef	IO_ISASIZES
 #define	IO_ISASIZES
 
-#define	IO_ASCSIZE	5		/* AmiScan GI1904-based hand scanner */
-#define	IO_CGASIZE	16		/* CGA controllers */
-#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_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_LPTSIZE_EXTENDED	8	/* "Extended" LPT controllers */
 #define	IO_LPTSIZE_NORMAL	4	/* "Normal" LPT controllers */
-#define	IO_MDASIZE	16		/* Monochrome display controllers */
 #define	IO_NPXSIZE	8		/* 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_VGASIZE	16		/* VGA controllers */
-#define	IO_WDCSIZE	8		/* WD compatible disk controllers */
 
 #endif /* !IO_ISASIZES */
 
@@ -150,18 +106,6 @@
 #define	RAM_SIZE	(RAM_END - RAM_BEGIN)
 #endif /* !RAM_BEGIN */
 
-#ifndef PC98 /* IBM-PC */
-/*
- * 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 */
-#endif
-
 #define	M_NEC_PC98	0x0001
 #define	M_EPSON_PC98	0x0002
 #define	M_NOT_H98	0x0010
@@ -170,11 +114,4 @@
 #define	M_NORMAL	0x1000
 #define	M_8M		0x8000
 
-/*
- * Obtained from NetBSD/pc98
- */
-#define MADDRUNK	-1
-#define IRQUNK		 0
-#define DRQUNK		-1
-
 #endif /* !_PC98_PC98_PC98_H_ */