From 7d34994c2f718133fa2f2f1a8094d36cd53f0fe6 Mon Sep 17 00:00:00 2001
From: Sascha Wildner <swildner@dragonflybsd.org>
Date: Sun, 27 Feb 2005 10:57:24 +0000
Subject: [PATCH] Remove PC98 support. Leave the machdep.ispc98 sysctl in
 because make(1) wants it.

---
 sys/i386/i386/genassym.c             |   9 +--
 sys/i386/i386/initcpu.c              | 108 +++------------------------
 sys/i386/i386/locore.s               |  45 +----------
 sys/i386/i386/machdep.c              |   6 +-
 sys/i386/i386/mp_machdep.c           |  15 +---
 sys/i386/i386/mpboot.s               |   4 +-
 sys/i386/i386/nexus.c                |  45 +----------
 sys/i386/i386/vm_machdep.c           |  22 +-----
 sys/i386/isa/sound/local.h           |  13 +---
 sys/i386/isa/sound/sbcard.h          |  17 +----
 sys/platform/pc32/i386/genassym.c    |   9 +--
 sys/platform/pc32/i386/initcpu.c     | 108 +++------------------------
 sys/platform/pc32/i386/locore.s      |  45 +----------
 sys/platform/pc32/i386/machdep.c     |   6 +-
 sys/platform/pc32/i386/mp_machdep.c  |  15 +---
 sys/platform/pc32/i386/mpboot.s      |   4 +-
 sys/platform/pc32/i386/nexus.c       |  45 +----------
 sys/platform/pc32/i386/vm_machdep.c  |  22 +-----
 sys/platform/pc32/isa/sound/local.h  |  13 +---
 sys/platform/pc32/isa/sound/sbcard.h |  17 +----
 sys/platform/vkernel/i386/genassym.c |   9 +--
 21 files changed, 43 insertions(+), 534 deletions(-)

diff --git a/sys/i386/i386/genassym.c b/sys/i386/i386/genassym.c
index 5b16edee3e..660f97d191 100644
--- a/sys/i386/i386/genassym.c
+++ b/sys/i386/i386/genassym.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
  * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.86.2.3 2002/03/03 05:42:49 nyan Exp $
- * $DragonFly: src/sys/i386/i386/Attic/genassym.c,v 1.40 2004/08/12 19:59:30 eirikn Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/genassym.c,v 1.41 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -229,10 +229,3 @@ ASSYM(KPSEL, GSEL(GPRIV_SEL, SEL_KPL));
 ASSYM(BC32SEL, GSEL(GBIOSCODE32_SEL, SEL_KPL));
 ASSYM(GPROC0_SEL, GPROC0_SEL);
 ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame));
-
-#ifdef PC98
-#include <machine/bus.h>
-
-ASSYM(BUS_SPACE_HANDLE_BASE, offsetof(struct bus_space_handle, bsh_base));
-ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(struct bus_space_handle, bsh_iat));
-#endif
diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c
index 2764ef425d..6aad5a79e0 100644
--- a/sys/i386/i386/initcpu.c
+++ b/sys/i386/i386/initcpu.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/initcpu.c,v 1.19.2.9 2003/04/05 13:47:19 dwmalone Exp $
- * $DragonFly: src/sys/i386/i386/Attic/initcpu.c,v 1.5 2003/08/01 10:58:59 rob Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/initcpu.c,v 1.6 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include "opt_cpu.h"
@@ -82,10 +82,6 @@ init_bluelightning(void)
 {
 	u_long	eflags;
 
-#if defined(PC98) && !defined(CPU_UPGRADE_HW_CACHE)
-	need_post_dma_flush = 1;
-#endif
-
 	eflags = read_eflags();
 	cpu_disable_intr();
 
@@ -175,14 +171,6 @@ init_cy486dx(void)
 	ccr2 |= CCR2_SUSP_HLT;
 #endif
 
-#ifdef PC98
-	/* Enables WB cache interface pin and Lock NW bit in CR0. */
-	ccr2 |= CCR2_WB | CCR2_LOCK_NW;
-	/* Unlock NW bit in CR0. */
-	write_cyrix_reg(CCR2, ccr2 & ~CCR2_LOCK_NW);
-	load_cr0((rcr0() & ~CR0_CD) | CR0_NW);	/* CD = 0, NW = 1 */
-#endif
-
 	write_cyrix_reg(CCR2, ccr2);
 	write_eflags(eflags);
 }
@@ -297,10 +285,6 @@ init_i486_on_386(void)
 {
 	u_long	eflags;
 
-#if defined(PC98) && !defined(CPU_UPGRADE_HW_CACHE)
-	need_post_dma_flush = 1;
-#endif
-
 	eflags = read_eflags();
 	cpu_disable_intr();
 
@@ -594,52 +578,6 @@ initializecpu(void)
 		break;
 	}
 	enable_sse();
-
-#if defined(PC98) && !defined(CPU_UPGRADE_HW_CACHE)
-	/*
-	 * OS should flush L1 cache by itself because no PC-98 supports
-	 * non-Intel CPUs.  Use wbinvd instruction before DMA transfer
-	 * when need_pre_dma_flush = 1, use invd instruction after DMA
-	 * transfer when need_post_dma_flush = 1.  If your CPU upgrade
-	 * product supports hardware cache control, you can add the
-	 * CPU_UPGRADE_HW_CACHE option in your kernel configuration file.
-	 * This option eliminates unneeded cache flush instruction(s).
-	 */
-	if (strcmp(cpu_vendor, "CyrixInstead") == 0) {
-		switch (cpu) {
-#ifdef I486_CPU
-		case CPU_486DLC:
-			need_post_dma_flush = 1;
-			break;
-		case CPU_M1SC:
-			need_pre_dma_flush = 1;
-			break;
-		case CPU_CY486DX:
-			need_pre_dma_flush = 1;
-#ifdef CPU_I486_ON_386
-			need_post_dma_flush = 1;
-#endif
-			break;
-#endif
-		default:
-			break;
-		}
-	} else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) {
-		switch (cpu_id & 0xFF0) {
-		case 0x470:		/* Enhanced Am486DX2 WB */
-		case 0x490:		/* Enhanced Am486DX4 WB */
-		case 0x4F0:		/* Am5x86 WB */
-			need_pre_dma_flush = 1;
-			break;
-		}
-	} else if (strcmp(cpu_vendor, "IBM") == 0) {
-		need_post_dma_flush = 1;
-	} else {
-#ifdef CPU_I486_ON_386
-		need_pre_dma_flush = 1;
-#endif
-	}
-#endif /* PC98 && !CPU_UPGRADE_HW_CACHE */
 }
 
 #if defined(I586_CPU) && defined(CPU_WT_ALLOC)
@@ -671,19 +609,13 @@ enable_K5_wt_alloc(void)
 		else
 		  msr = 0;
 		msr |= AMD_WT_ALLOC_TME | AMD_WT_ALLOC_FRE;
-#ifdef PC98
-		if (!(inb(0x43b) & 4)) {
-			wrmsr(0x86, 0x0ff00f0);
-			msr |= AMD_WT_ALLOC_PRE;
-		}
-#else
+
 		/*
 		 * There is no way to know wheter 15-16M hole exists or not. 
 		 * Therefore, we disable write allocate for this range.
 		 */
-			wrmsr(0x86, 0x0ff00f0);
-			msr |= AMD_WT_ALLOC_PRE;
-#endif
+		wrmsr(0x86, 0x0ff00f0);
+		msr |= AMD_WT_ALLOC_PRE;
 		wrmsr(0x85, msr);
 
 		msr=rdmsr(0x83);
@@ -729,19 +661,9 @@ enable_K6_wt_alloc(void)
 		size = 0x7f;
 	whcr = (rdmsr(0xc0000082) & ~(0x7fLL << 1)) | (size << 1);
 
-#if defined(PC98) || defined(NO_MEMORY_HOLE)
-	if (whcr & (0x7fLL << 1)) {
-#ifdef PC98
-		/*
-		 * If bit 2 of port 0x43b is 0, disable wrte allocate for the
-		 * 15-16M range.
-		 */
-		if (!(inb(0x43b) & 4))
-			whcr &= ~0x0001LL;
-		else
-#endif
-			whcr |=  0x0001LL;
-	}
+#if defined(NO_MEMORY_HOLE)
+	if (whcr & (0x7fLL << 1))
+		whcr |=  0x0001LL;
 #else
 	/*
 	 * There is no way to know wheter 15-16M hole exists or not. 
@@ -790,19 +712,9 @@ enable_K6_2_wt_alloc(void)
 		size = 0x3ff;
 	whcr = (rdmsr(0xc0000082) & ~(0x3ffLL << 22)) | (size << 22);
 
-#if defined(PC98) || defined(NO_MEMORY_HOLE)
-	if (whcr & (0x3ffLL << 22)) {
-#ifdef PC98
-		/*
-		 * If bit 2 of port 0x43b is 0, disable wrte allocate for the
-		 * 15-16M range.
-		 */
-		if (!(inb(0x43b) & 4))
-			whcr &= ~(1LL << 16);
-		else
-#endif
-			whcr |=  1LL << 16;
-	}
+#if defined(NO_MEMORY_HOLE)
+	if (whcr & (0x3ffLL << 22))
+		whcr |=  1LL << 16;
 #else
 	/*
 	 * There is no way to know wheter 15-16M hole exists or not. 
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index c335a9f7fe..67a5f119ca 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -35,7 +35,7 @@
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
  * $FreeBSD: src/sys/i386/i386/locore.s,v 1.132.2.10 2003/02/03 20:54:49 jhb Exp $
- * $DragonFly: src/sys/i386/i386/Attic/locore.s,v 1.9 2003/11/12 22:08:01 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/locore.s,v 1.10 2005/02/27 10:57:24 swildner Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -146,12 +146,6 @@ vm86pa:		.long	0			/* phys addr of vm86 region */
 bdb_exists:	.long	0
 #endif
 
-#ifdef PC98
-	.globl	pc98_system_parameter
-pc98_system_parameter:
-	.space	0x240
-#endif
-
 /**********************************************************************
  *
  * Some handy macros
@@ -209,15 +203,6 @@ pc98_system_parameter:
  */
 NON_GPROF_ENTRY(btext)
 
-#ifdef PC98
-	/* save SYSTEM PARAMETER for resume (NS/T or other) */
-	movl	$0xa1400,%esi
-	movl	$R(pc98_system_parameter),%edi
-	movl	$0x0240,%ecx
-	cld
-	rep
-	movsb
-#else	/* IBM-PC */
 #ifdef BDE_DEBUGGER
 #ifdef BIOS_STEALS_3K
 	cmpl	$0x0375c339,0x95504
@@ -230,7 +215,6 @@ NON_GPROF_ENTRY(btext)
 #endif
 /* Tell the bios to warmboot next time */
 	movw	$0x1234,0x472
-#endif	/* PC98 */
 
 /* Set up a real frame in case the double return in newboot is executed. */
 	pushl	%ebp
@@ -276,33 +260,6 @@ NON_GPROF_ENTRY(btext)
  */
 	movl	$R(.tmpstk),%esp
 
-#ifdef PC98
-	/* pc98_machine_type & M_EPSON_PC98 */
-	testb	$0x02,R(_pc98_system_parameter)+220
-	jz	3f
-	/* epson_machine_id <= 0x0b */
-	cmpb	$0x0b,R(_pc98_system_parameter)+224
-	ja	3f
-
-	/* count up memory */
-	movl	$0x100000,%eax		/* next, talley remaining memory */
-	movl	$0xFFF-0x100,%ecx
-1:	movl	0(%eax),%ebx		/* save location to check */
-	movl	$0xa55a5aa5,0(%eax)	/* write test pattern */
-	cmpl	$0xa55a5aa5,0(%eax)	/* does not check yet for rollover */
-	jne	2f
-	movl	%ebx,0(%eax)		/* restore memory */
-	addl	$PAGE_SIZE,%eax
-	loop	1b
-2:	subl	$0x100000,%eax
-	shrl	$17,%eax
-	movb	%al,R(_pc98_system_parameter)+1
-3:
-
-	movw	R(_pc98_system_parameter+0x86),%ax
-	movw	%ax,R(cpu_id)
-#endif
-
 	call	identify_cpu
 
 	call	create_pagetables
diff --git a/sys/i386/i386/machdep.c b/sys/i386/i386/machdep.c
index d19b0e81e8..8ec898f069 100644
--- a/sys/i386/i386/machdep.c
+++ b/sys/i386/i386/machdep.c
@@ -36,7 +36,7 @@
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
  * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $
- * $DragonFly: src/sys/i386/i386/Attic/machdep.c,v 1.70 2005/02/21 21:40:53 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/machdep.c,v 1.71 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include "use_apm.h"
@@ -150,11 +150,7 @@ SYSCTL_INT(_debug, OID_AUTO, tlb_flush_count,
 	CTLFLAG_RD, &tlb_flush_count, 0, "");
 #endif
 
-#ifdef PC98
-static int	ispc98 = 1;
-#else
 static int	ispc98 = 0;
-#endif
 SYSCTL_INT(_machdep, OID_AUTO, ispc98, CTLFLAG_RD, &ispc98, 0, "");
 
 int physmem = 0;
diff --git a/sys/i386/i386/mp_machdep.c b/sys/i386/i386/mp_machdep.c
index a33efe04e1..32fdc911f8 100644
--- a/sys/i386/i386/mp_machdep.c
+++ b/sys/i386/i386/mp_machdep.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.115.2.15 2003/03/14 21:22:35 jhb Exp $
- * $DragonFly: src/sys/i386/i386/Attic/mp_machdep.c,v 1.31 2005/02/15 16:47:41 joerg Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/mp_machdep.c,v 1.32 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include "opt_cpu.h"
@@ -77,13 +77,8 @@
 #define WARMBOOT_OFF		(KERNBASE + 0x0467)
 #define WARMBOOT_SEG		(KERNBASE + 0x0469)
 
-#ifdef PC98
-#define BIOS_BASE		(0xe8000)
-#define BIOS_SIZE		(0x18000)
-#else
 #define BIOS_BASE		(0xf0000)
 #define BIOS_SIZE		(0x10000)
-#endif
 #define BIOS_COUNT		(BIOS_SIZE/4)
 
 #define CMOS_REG		(0x70)
@@ -176,7 +171,7 @@ typedef struct BASETABLE_ENTRY {
  * it NORMALLY will never be needed and thus the primitive method for enabling.
  *
  */
-#if defined(CHECK_POINTS) && !defined(PC98)
+#if defined(CHECK_POINTS)
 #define CHECK_READ(A)	 (outb(CMOS_REG, (A)), inb(CMOS_DATA))
 #define CHECK_WRITE(A,D) (outb(CMOS_REG, (A)), outb(CMOS_DATA, (D)))
 
@@ -1983,10 +1978,8 @@ start_all_aps(u_int boot_addr)
 
 	/* save the current value of the warm-start vector */
 	mpbioswarmvec = *((u_long *) WARMBOOT_OFF);
-#ifndef PC98
 	outb(CMOS_REG, BIOS_RESET);
 	mpbiosreason = inb(CMOS_DATA);
-#endif
 
 	/* set up temporary P==V mapping for AP boot */
 	/* XXX this is a hack, we should boot the AP on its own stack/PTD */
@@ -2043,10 +2036,8 @@ start_all_aps(u_int boot_addr)
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
 		*((volatile u_short *) WARMBOOT_SEG) = (boot_addr >> 4);
-#ifndef PC98
 		outb(CMOS_REG, BIOS_RESET);
 		outb(CMOS_DATA, BIOS_WARM);	/* 'warm-start' */
-#endif
 
 		/*
 		 * Setup the AP boot stack
@@ -2090,10 +2081,8 @@ start_all_aps(u_int boot_addr)
 
 	/* restore the warmstart vector */
 	*(u_long *) WARMBOOT_OFF = mpbioswarmvec;
-#ifndef PC98
 	outb(CMOS_REG, BIOS_RESET);
 	outb(CMOS_DATA, mpbiosreason);
-#endif
 
 	/*
 	 * NOTE!  The idlestack for the BSP was setup by locore.  Finish
diff --git a/sys/i386/i386/mpboot.s b/sys/i386/i386/mpboot.s
index 89a06cd652..14cc109252 100644
--- a/sys/i386/i386/mpboot.s
+++ b/sys/i386/i386/mpboot.s
@@ -32,7 +32,7 @@
  *		multiprocessor systems.
  *
  * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.13.2.3 2000/09/07 01:18:26 tegge Exp $
- * $DragonFly: src/sys/i386/i386/Attic/mpboot.s,v 1.7 2004/02/21 06:37:07 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/mpboot.s,v 1.8 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
@@ -52,7 +52,7 @@
 #define CHECK_POINTS
  */
 
-#if defined(CHECK_POINTS) && !defined(PC98)
+#if defined(CHECK_POINTS)
 
 #define CMOS_REG	(0x70)
 #define CMOS_DATA	(0x71)
diff --git a/sys/i386/i386/nexus.c b/sys/i386/i386/nexus.c
index 83421325bc..89468dc0c6 100644
--- a/sys/i386/i386/nexus.c
+++ b/sys/i386/i386/nexus.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/nexus.c,v 1.26.2.10 2003/02/22 13:16:45 imp Exp $
- * $DragonFly: src/sys/i386/i386/Attic/nexus.c,v 1.11 2004/10/14 03:05:52 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/nexus.c,v 1.12 2005/02/27 10:57:24 swildner Exp $
  */
 
 /*
@@ -65,11 +65,7 @@
 #endif
 
 #include <bus/isa/isavar.h>
-#ifdef PC98
-#include <pc98/pc98/pc98.h>
-#else
 #include <bus/isa/i386/isa.h>
-#endif
 #include <i386/isa/intr_machdep.h>
 
 static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device");
@@ -192,17 +188,10 @@ nexus_probe(device_t dev)
 		panic("nexus_probe irq_rman");
 #else
 	irq_rman.rm_end = 15;
-#ifdef PC98
-	if (rman_init(&irq_rman)
-	    || rman_manage_region(&irq_rman,
-				  irq_rman.rm_start, irq_rman.rm_end))
-		panic("nexus_probe irq_rman");
-#else
 	if (rman_init(&irq_rman)
 	    || rman_manage_region(&irq_rman, irq_rman.rm_start, 1)
 	    || rman_manage_region(&irq_rman, 3, irq_rman.rm_end))
 		panic("nexus_probe irq_rman");
-#endif /* PC98 */
 #endif
 
 	/*
@@ -211,11 +200,7 @@ nexus_probe(device_t dev)
 	 * multiple bridges.  (eg: laptops with docking stations)
 	 */
 	drq_rman.rm_start = 0;
-#ifdef PC98
-	drq_rman.rm_end = 3;
-#else
 	drq_rman.rm_end = 7;
-#endif
 	drq_rman.rm_type = RMAN_ARRAY;
 	drq_rman.rm_descr = "DMA request lines";
 	/* XXX drq 0 not available on some machines */
@@ -435,28 +420,11 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 		rman_set_bustag(rv, I386_BUS_SPACE_MEM);
 	} else if (type == SYS_RES_IOPORT) {
 		rman_set_bustag(rv, I386_BUS_SPACE_IO);
-#ifndef PC98
 		rman_set_bushandle(rv, rv->r_start);
-#endif
 	}
 
-#ifdef PC98
-	if ((type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) &&
-	    i386_bus_space_handle_alloc(rv->r_bustag, rv->r_start, count,
-					&rv->r_bushandle) != 0) {
-		rman_release_resource(rv);
-		return 0;
-	}
-#endif
-
 	if (needactivate) {
 		if (bus_activate_resource(child, type, *rid, rv)) {
-#ifdef PC98
-			if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
-				i386_bus_space_handle_free(rv->r_bustag,
-				  rv->r_bushandle, rv->r_bushandle->bsh_sz);
-			}
-#endif
 			rman_release_resource(rv);
 			return 0;
 		}
@@ -492,13 +460,8 @@ nexus_activate_resource(device_t bus, device_t child, int type, int rid,
 			vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs;
 		}
 		rman_set_virtual(r, vaddr);
-#ifdef PC98
-		/* PC-98: the type of bus_space_handle_t is the structure. */
-		r->r_bushandle->bsh_base = (bus_addr_t) vaddr;
-#else
 		/* IBM-PC: the type of bus_space_handle_t is u_int */
 		rman_set_bushandle(r, (bus_space_handle_t) vaddr);
-#endif
 	}
 	return (rman_activate_resource(r));
 }
@@ -530,12 +493,6 @@ nexus_release_resource(device_t bus, device_t child, int type, int rid,
 		if (error)
 			return error;
 	}
-#ifdef PC98
-	if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
-		i386_bus_space_handle_free(r->r_bustag, r->r_bushandle,
-					   r->r_bushandle->bsh_sz);
-	}
-#endif
 	return (rman_release_resource(r));
 }
 
diff --git a/sys/i386/i386/vm_machdep.c b/sys/i386/i386/vm_machdep.c
index 983abc5693..a999ef0d95 100644
--- a/sys/i386/i386/vm_machdep.c
+++ b/sys/i386/i386/vm_machdep.c
@@ -39,14 +39,11 @@
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $
- * $DragonFly: src/sys/i386/i386/Attic/vm_machdep.c,v 1.33 2005/02/21 21:40:53 dillon Exp $
+ * $DragonFly: src/sys/i386/i386/Attic/vm_machdep.c,v 1.34 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include "use_npx.h"
 #include "use_isa.h"
-#ifdef PC98
-#include "opt_pc98.h"
-#endif
 #include "opt_reset.h"
 
 #include <sys/param.h>
@@ -84,11 +81,7 @@
 #include <sys/user.h>
 #include <sys/thread2.h>
 
-#ifdef PC98
-#include <pc98/pc98/pc98.h>
-#else
 #include <bus/isa/i386/isa.h>
-#endif
 
 static void	cpu_reset_real (void);
 #ifdef SMP
@@ -457,18 +450,6 @@ cpu_reset()
 static void
 cpu_reset_real()
 {
-
-#ifdef PC98
-	/*
-	 * Attempt to do a CPU reset via CPU reset port.
-	 */
-	cpu_disable_intr();
-	if ((inb(0x35) & 0xa0) != 0xa0) {
-		outb(0x37, 0x0f);		/* SHUT0 = 0. */
-		outb(0x37, 0x0b);		/* SHUT1 = 0. */
-	}
-	outb(0xf0, 0x00);		/* Reset. */
-#else
 	/*
 	 * Attempt to do a CPU reset via the keyboard controller,
 	 * do not turn of the GateA20, as any machine that fails
@@ -481,7 +462,6 @@ cpu_reset_real()
 	printf("Keyboard reset did not work, attempting CPU shutdown\n");
 	DELAY(1000000);	/* wait 1 sec for printf to complete */
 #endif
-#endif /* PC98 */
 	/* force a shutdown by unmapping entire address space ! */
 	bzero((caddr_t) PTD, PAGE_SIZE);
 
diff --git a/sys/i386/isa/sound/local.h b/sys/i386/isa/sound/local.h
index b79b6341e9..3aca4de4f5 100644
--- a/sys/i386/isa/sound/local.h
+++ b/sys/i386/isa/sound/local.h
@@ -6,7 +6,7 @@
  * will become more like that of standard bsd code.
  * lr 970714
  *
- * $DragonFly: src/sys/i386/isa/sound/Attic/local.h,v 1.3 2005/01/31 23:44:35 joerg Exp $
+ * $DragonFly: src/sys/i386/isa/sound/Attic/local.h,v 1.4 2005/02/27 10:57:24 swildner Exp $
  */
 
 /* build hex2hex /tmp/foo.x trix_boot.h trix_boot */
@@ -97,13 +97,6 @@
 #define CONFIG_YM3812
 #endif
 
-#ifdef PC98
-#include "use_nss.h"
-#if NNSS != 0
-#define CONFIG_NSS
-#endif
-#endif
-
 #define ALLOW_POLL
 
 /* #undef  CONFIG_PAS */
@@ -126,11 +119,7 @@
 
 #define CONFIG_MPU_EMU
 
-#ifdef PC98
-#define DSP_BUFFSIZE 61440
-#else
 #define DSP_BUFFSIZE 32768*2
-#endif
 /* #define SELECTED_SOUND_OPTIONS	0x0188090a */
 
 #ifndef TRIX_SB_BASE
diff --git a/sys/i386/isa/sound/sbcard.h b/sys/i386/isa/sound/sbcard.h
index 4490aa5c45..d18e5754d8 100644
--- a/sys/i386/isa/sound/sbcard.h
+++ b/sys/i386/isa/sound/sbcard.h
@@ -2,7 +2,7 @@
  * file: sbcard.h
  *
  * $FreeBSD: src/sys/i386/isa/sound/sbcard.h,v 1.4 1999/12/27 04:37:19 tanimura Exp $
- * $DragonFly: src/sys/i386/isa/sound/Attic/sbcard.h,v 1.2 2003/06/17 04:28:38 dillon Exp $
+ * $DragonFly: src/sys/i386/isa/sound/Attic/sbcard.h,v 1.3 2005/02/27 10:57:24 swildner Exp $
  *
  */
 
@@ -11,20 +11,6 @@ extern int sbc_major, sbc_minor ;
  * sound blaster registers
  */
 
-#ifdef PC98
-#define DSP_RESET      (sbc_base + 0x600)
-#define DSP_READ       (sbc_base + 0xA00)
-#define DSP_WRITE      (sbc_base + 0xC00)
-#define DSP_COMMAND    (sbc_base + 0xC00)
-#define DSP_STATUS     (sbc_base + 0xC00)
-#define DSP_DATA_AVAIL (sbc_base + 0xE00)
-#define DSP_DATA_AVL16 (sbc_base + 0xF00)
-#define MIXER_ADDR     (sbc_base + 0x400)
-#define MIXER_DATA     (sbc_base + 0x500)
-#define OPL3_LEFT      (sbc_base + 0x000)
-#define OPL3_RIGHT     (sbc_base + 0x200)
-#define OPL3_BOTH      (sbc_base + 0x800)
-#else
 #define DSP_RESET	(sbc_base + 0x6)
 #define DSP_READ	(sbc_base + 0xA)
 #define DSP_WRITE	(sbc_base + 0xC)
@@ -37,7 +23,6 @@ extern int sbc_major, sbc_minor ;
 #define OPL3_LEFT	(sbc_base + 0x0)
 #define OPL3_RIGHT	(sbc_base + 0x2)
 #define OPL3_BOTH	(sbc_base + 0x8)
-#endif
 
 /*
  * DSP Commands. There are many, and in many cases they are used explicitly
diff --git a/sys/platform/pc32/i386/genassym.c b/sys/platform/pc32/i386/genassym.c
index 9ffb22ca4c..4ce3b890e4 100644
--- a/sys/platform/pc32/i386/genassym.c
+++ b/sys/platform/pc32/i386/genassym.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
  * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.86.2.3 2002/03/03 05:42:49 nyan Exp $
- * $DragonFly: src/sys/platform/pc32/i386/genassym.c,v 1.40 2004/08/12 19:59:30 eirikn Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/genassym.c,v 1.41 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -229,10 +229,3 @@ ASSYM(KPSEL, GSEL(GPRIV_SEL, SEL_KPL));
 ASSYM(BC32SEL, GSEL(GBIOSCODE32_SEL, SEL_KPL));
 ASSYM(GPROC0_SEL, GPROC0_SEL);
 ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame));
-
-#ifdef PC98
-#include <machine/bus.h>
-
-ASSYM(BUS_SPACE_HANDLE_BASE, offsetof(struct bus_space_handle, bsh_base));
-ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(struct bus_space_handle, bsh_iat));
-#endif
diff --git a/sys/platform/pc32/i386/initcpu.c b/sys/platform/pc32/i386/initcpu.c
index 2752126c82..9949701c73 100644
--- a/sys/platform/pc32/i386/initcpu.c
+++ b/sys/platform/pc32/i386/initcpu.c
@@ -27,7 +27,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/initcpu.c,v 1.19.2.9 2003/04/05 13:47:19 dwmalone Exp $
- * $DragonFly: src/sys/platform/pc32/i386/initcpu.c,v 1.5 2003/08/01 10:58:59 rob Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/initcpu.c,v 1.6 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include "opt_cpu.h"
@@ -82,10 +82,6 @@ init_bluelightning(void)
 {
 	u_long	eflags;
 
-#if defined(PC98) && !defined(CPU_UPGRADE_HW_CACHE)
-	need_post_dma_flush = 1;
-#endif
-
 	eflags = read_eflags();
 	cpu_disable_intr();
 
@@ -175,14 +171,6 @@ init_cy486dx(void)
 	ccr2 |= CCR2_SUSP_HLT;
 #endif
 
-#ifdef PC98
-	/* Enables WB cache interface pin and Lock NW bit in CR0. */
-	ccr2 |= CCR2_WB | CCR2_LOCK_NW;
-	/* Unlock NW bit in CR0. */
-	write_cyrix_reg(CCR2, ccr2 & ~CCR2_LOCK_NW);
-	load_cr0((rcr0() & ~CR0_CD) | CR0_NW);	/* CD = 0, NW = 1 */
-#endif
-
 	write_cyrix_reg(CCR2, ccr2);
 	write_eflags(eflags);
 }
@@ -297,10 +285,6 @@ init_i486_on_386(void)
 {
 	u_long	eflags;
 
-#if defined(PC98) && !defined(CPU_UPGRADE_HW_CACHE)
-	need_post_dma_flush = 1;
-#endif
-
 	eflags = read_eflags();
 	cpu_disable_intr();
 
@@ -594,52 +578,6 @@ initializecpu(void)
 		break;
 	}
 	enable_sse();
-
-#if defined(PC98) && !defined(CPU_UPGRADE_HW_CACHE)
-	/*
-	 * OS should flush L1 cache by itself because no PC-98 supports
-	 * non-Intel CPUs.  Use wbinvd instruction before DMA transfer
-	 * when need_pre_dma_flush = 1, use invd instruction after DMA
-	 * transfer when need_post_dma_flush = 1.  If your CPU upgrade
-	 * product supports hardware cache control, you can add the
-	 * CPU_UPGRADE_HW_CACHE option in your kernel configuration file.
-	 * This option eliminates unneeded cache flush instruction(s).
-	 */
-	if (strcmp(cpu_vendor, "CyrixInstead") == 0) {
-		switch (cpu) {
-#ifdef I486_CPU
-		case CPU_486DLC:
-			need_post_dma_flush = 1;
-			break;
-		case CPU_M1SC:
-			need_pre_dma_flush = 1;
-			break;
-		case CPU_CY486DX:
-			need_pre_dma_flush = 1;
-#ifdef CPU_I486_ON_386
-			need_post_dma_flush = 1;
-#endif
-			break;
-#endif
-		default:
-			break;
-		}
-	} else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) {
-		switch (cpu_id & 0xFF0) {
-		case 0x470:		/* Enhanced Am486DX2 WB */
-		case 0x490:		/* Enhanced Am486DX4 WB */
-		case 0x4F0:		/* Am5x86 WB */
-			need_pre_dma_flush = 1;
-			break;
-		}
-	} else if (strcmp(cpu_vendor, "IBM") == 0) {
-		need_post_dma_flush = 1;
-	} else {
-#ifdef CPU_I486_ON_386
-		need_pre_dma_flush = 1;
-#endif
-	}
-#endif /* PC98 && !CPU_UPGRADE_HW_CACHE */
 }
 
 #if defined(I586_CPU) && defined(CPU_WT_ALLOC)
@@ -671,19 +609,13 @@ enable_K5_wt_alloc(void)
 		else
 		  msr = 0;
 		msr |= AMD_WT_ALLOC_TME | AMD_WT_ALLOC_FRE;
-#ifdef PC98
-		if (!(inb(0x43b) & 4)) {
-			wrmsr(0x86, 0x0ff00f0);
-			msr |= AMD_WT_ALLOC_PRE;
-		}
-#else
+
 		/*
 		 * There is no way to know wheter 15-16M hole exists or not. 
 		 * Therefore, we disable write allocate for this range.
 		 */
-			wrmsr(0x86, 0x0ff00f0);
-			msr |= AMD_WT_ALLOC_PRE;
-#endif
+		wrmsr(0x86, 0x0ff00f0);
+		msr |= AMD_WT_ALLOC_PRE;
 		wrmsr(0x85, msr);
 
 		msr=rdmsr(0x83);
@@ -729,19 +661,9 @@ enable_K6_wt_alloc(void)
 		size = 0x7f;
 	whcr = (rdmsr(0xc0000082) & ~(0x7fLL << 1)) | (size << 1);
 
-#if defined(PC98) || defined(NO_MEMORY_HOLE)
-	if (whcr & (0x7fLL << 1)) {
-#ifdef PC98
-		/*
-		 * If bit 2 of port 0x43b is 0, disable wrte allocate for the
-		 * 15-16M range.
-		 */
-		if (!(inb(0x43b) & 4))
-			whcr &= ~0x0001LL;
-		else
-#endif
-			whcr |=  0x0001LL;
-	}
+#if defined(NO_MEMORY_HOLE)
+	if (whcr & (0x7fLL << 1))
+		whcr |=  0x0001LL;
 #else
 	/*
 	 * There is no way to know wheter 15-16M hole exists or not. 
@@ -790,19 +712,9 @@ enable_K6_2_wt_alloc(void)
 		size = 0x3ff;
 	whcr = (rdmsr(0xc0000082) & ~(0x3ffLL << 22)) | (size << 22);
 
-#if defined(PC98) || defined(NO_MEMORY_HOLE)
-	if (whcr & (0x3ffLL << 22)) {
-#ifdef PC98
-		/*
-		 * If bit 2 of port 0x43b is 0, disable wrte allocate for the
-		 * 15-16M range.
-		 */
-		if (!(inb(0x43b) & 4))
-			whcr &= ~(1LL << 16);
-		else
-#endif
-			whcr |=  1LL << 16;
-	}
+#if defined(NO_MEMORY_HOLE)
+	if (whcr & (0x3ffLL << 22))
+		whcr |=  1LL << 16;
 #else
 	/*
 	 * There is no way to know wheter 15-16M hole exists or not. 
diff --git a/sys/platform/pc32/i386/locore.s b/sys/platform/pc32/i386/locore.s
index cca0df65b6..77b6037ffa 100644
--- a/sys/platform/pc32/i386/locore.s
+++ b/sys/platform/pc32/i386/locore.s
@@ -35,7 +35,7 @@
  *
  *	from: @(#)locore.s	7.3 (Berkeley) 5/13/91
  * $FreeBSD: src/sys/i386/i386/locore.s,v 1.132.2.10 2003/02/03 20:54:49 jhb Exp $
- * $DragonFly: src/sys/platform/pc32/i386/locore.s,v 1.9 2003/11/12 22:08:01 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/locore.s,v 1.10 2005/02/27 10:57:24 swildner Exp $
  *
  *		originally from: locore.s, by William F. Jolitz
  *
@@ -146,12 +146,6 @@ vm86pa:		.long	0			/* phys addr of vm86 region */
 bdb_exists:	.long	0
 #endif
 
-#ifdef PC98
-	.globl	pc98_system_parameter
-pc98_system_parameter:
-	.space	0x240
-#endif
-
 /**********************************************************************
  *
  * Some handy macros
@@ -209,15 +203,6 @@ pc98_system_parameter:
  */
 NON_GPROF_ENTRY(btext)
 
-#ifdef PC98
-	/* save SYSTEM PARAMETER for resume (NS/T or other) */
-	movl	$0xa1400,%esi
-	movl	$R(pc98_system_parameter),%edi
-	movl	$0x0240,%ecx
-	cld
-	rep
-	movsb
-#else	/* IBM-PC */
 #ifdef BDE_DEBUGGER
 #ifdef BIOS_STEALS_3K
 	cmpl	$0x0375c339,0x95504
@@ -230,7 +215,6 @@ NON_GPROF_ENTRY(btext)
 #endif
 /* Tell the bios to warmboot next time */
 	movw	$0x1234,0x472
-#endif	/* PC98 */
 
 /* Set up a real frame in case the double return in newboot is executed. */
 	pushl	%ebp
@@ -276,33 +260,6 @@ NON_GPROF_ENTRY(btext)
  */
 	movl	$R(.tmpstk),%esp
 
-#ifdef PC98
-	/* pc98_machine_type & M_EPSON_PC98 */
-	testb	$0x02,R(_pc98_system_parameter)+220
-	jz	3f
-	/* epson_machine_id <= 0x0b */
-	cmpb	$0x0b,R(_pc98_system_parameter)+224
-	ja	3f
-
-	/* count up memory */
-	movl	$0x100000,%eax		/* next, talley remaining memory */
-	movl	$0xFFF-0x100,%ecx
-1:	movl	0(%eax),%ebx		/* save location to check */
-	movl	$0xa55a5aa5,0(%eax)	/* write test pattern */
-	cmpl	$0xa55a5aa5,0(%eax)	/* does not check yet for rollover */
-	jne	2f
-	movl	%ebx,0(%eax)		/* restore memory */
-	addl	$PAGE_SIZE,%eax
-	loop	1b
-2:	subl	$0x100000,%eax
-	shrl	$17,%eax
-	movb	%al,R(_pc98_system_parameter)+1
-3:
-
-	movw	R(_pc98_system_parameter+0x86),%ax
-	movw	%ax,R(cpu_id)
-#endif
-
 	call	identify_cpu
 
 	call	create_pagetables
diff --git a/sys/platform/pc32/i386/machdep.c b/sys/platform/pc32/i386/machdep.c
index 0b7133b635..7b94744c88 100644
--- a/sys/platform/pc32/i386/machdep.c
+++ b/sys/platform/pc32/i386/machdep.c
@@ -36,7 +36,7 @@
  *
  *	from: @(#)machdep.c	7.4 (Berkeley) 6/3/91
  * $FreeBSD: src/sys/i386/i386/machdep.c,v 1.385.2.30 2003/05/31 08:48:05 alc Exp $
- * $DragonFly: src/sys/platform/pc32/i386/machdep.c,v 1.70 2005/02/21 21:40:53 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/machdep.c,v 1.71 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include "use_apm.h"
@@ -150,11 +150,7 @@ SYSCTL_INT(_debug, OID_AUTO, tlb_flush_count,
 	CTLFLAG_RD, &tlb_flush_count, 0, "");
 #endif
 
-#ifdef PC98
-static int	ispc98 = 1;
-#else
 static int	ispc98 = 0;
-#endif
 SYSCTL_INT(_machdep, OID_AUTO, ispc98, CTLFLAG_RD, &ispc98, 0, "");
 
 int physmem = 0;
diff --git a/sys/platform/pc32/i386/mp_machdep.c b/sys/platform/pc32/i386/mp_machdep.c
index 6c4f40c37a..1c39c24305 100644
--- a/sys/platform/pc32/i386/mp_machdep.c
+++ b/sys/platform/pc32/i386/mp_machdep.c
@@ -23,7 +23,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/mp_machdep.c,v 1.115.2.15 2003/03/14 21:22:35 jhb Exp $
- * $DragonFly: src/sys/platform/pc32/i386/mp_machdep.c,v 1.31 2005/02/15 16:47:41 joerg Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/mp_machdep.c,v 1.32 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include "opt_cpu.h"
@@ -77,13 +77,8 @@
 #define WARMBOOT_OFF		(KERNBASE + 0x0467)
 #define WARMBOOT_SEG		(KERNBASE + 0x0469)
 
-#ifdef PC98
-#define BIOS_BASE		(0xe8000)
-#define BIOS_SIZE		(0x18000)
-#else
 #define BIOS_BASE		(0xf0000)
 #define BIOS_SIZE		(0x10000)
-#endif
 #define BIOS_COUNT		(BIOS_SIZE/4)
 
 #define CMOS_REG		(0x70)
@@ -176,7 +171,7 @@ typedef struct BASETABLE_ENTRY {
  * it NORMALLY will never be needed and thus the primitive method for enabling.
  *
  */
-#if defined(CHECK_POINTS) && !defined(PC98)
+#if defined(CHECK_POINTS)
 #define CHECK_READ(A)	 (outb(CMOS_REG, (A)), inb(CMOS_DATA))
 #define CHECK_WRITE(A,D) (outb(CMOS_REG, (A)), outb(CMOS_DATA, (D)))
 
@@ -1983,10 +1978,8 @@ start_all_aps(u_int boot_addr)
 
 	/* save the current value of the warm-start vector */
 	mpbioswarmvec = *((u_long *) WARMBOOT_OFF);
-#ifndef PC98
 	outb(CMOS_REG, BIOS_RESET);
 	mpbiosreason = inb(CMOS_DATA);
-#endif
 
 	/* set up temporary P==V mapping for AP boot */
 	/* XXX this is a hack, we should boot the AP on its own stack/PTD */
@@ -2043,10 +2036,8 @@ start_all_aps(u_int boot_addr)
 		/* setup a vector to our boot code */
 		*((volatile u_short *) WARMBOOT_OFF) = WARMBOOT_TARGET;
 		*((volatile u_short *) WARMBOOT_SEG) = (boot_addr >> 4);
-#ifndef PC98
 		outb(CMOS_REG, BIOS_RESET);
 		outb(CMOS_DATA, BIOS_WARM);	/* 'warm-start' */
-#endif
 
 		/*
 		 * Setup the AP boot stack
@@ -2090,10 +2081,8 @@ start_all_aps(u_int boot_addr)
 
 	/* restore the warmstart vector */
 	*(u_long *) WARMBOOT_OFF = mpbioswarmvec;
-#ifndef PC98
 	outb(CMOS_REG, BIOS_RESET);
 	outb(CMOS_DATA, mpbiosreason);
-#endif
 
 	/*
 	 * NOTE!  The idlestack for the BSP was setup by locore.  Finish
diff --git a/sys/platform/pc32/i386/mpboot.s b/sys/platform/pc32/i386/mpboot.s
index 0402b2fcdd..15a03e7cd6 100644
--- a/sys/platform/pc32/i386/mpboot.s
+++ b/sys/platform/pc32/i386/mpboot.s
@@ -32,7 +32,7 @@
  *		multiprocessor systems.
  *
  * $FreeBSD: src/sys/i386/i386/mpboot.s,v 1.13.2.3 2000/09/07 01:18:26 tegge Exp $
- * $DragonFly: src/sys/platform/pc32/i386/mpboot.s,v 1.7 2004/02/21 06:37:07 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/mpboot.s,v 1.8 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include <machine/asmacros.h>		/* miscellaneous asm macros */
@@ -52,7 +52,7 @@
 #define CHECK_POINTS
  */
 
-#if defined(CHECK_POINTS) && !defined(PC98)
+#if defined(CHECK_POINTS)
 
 #define CMOS_REG	(0x70)
 #define CMOS_DATA	(0x71)
diff --git a/sys/platform/pc32/i386/nexus.c b/sys/platform/pc32/i386/nexus.c
index a958abc36a..de0f197118 100644
--- a/sys/platform/pc32/i386/nexus.c
+++ b/sys/platform/pc32/i386/nexus.c
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  * $FreeBSD: src/sys/i386/i386/nexus.c,v 1.26.2.10 2003/02/22 13:16:45 imp Exp $
- * $DragonFly: src/sys/platform/pc32/i386/nexus.c,v 1.11 2004/10/14 03:05:52 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/nexus.c,v 1.12 2005/02/27 10:57:24 swildner Exp $
  */
 
 /*
@@ -65,11 +65,7 @@
 #endif
 
 #include <bus/isa/isavar.h>
-#ifdef PC98
-#include <pc98/pc98/pc98.h>
-#else
 #include <bus/isa/i386/isa.h>
-#endif
 #include <i386/isa/intr_machdep.h>
 
 static MALLOC_DEFINE(M_NEXUSDEV, "nexusdev", "Nexus device");
@@ -192,17 +188,10 @@ nexus_probe(device_t dev)
 		panic("nexus_probe irq_rman");
 #else
 	irq_rman.rm_end = 15;
-#ifdef PC98
-	if (rman_init(&irq_rman)
-	    || rman_manage_region(&irq_rman,
-				  irq_rman.rm_start, irq_rman.rm_end))
-		panic("nexus_probe irq_rman");
-#else
 	if (rman_init(&irq_rman)
 	    || rman_manage_region(&irq_rman, irq_rman.rm_start, 1)
 	    || rman_manage_region(&irq_rman, 3, irq_rman.rm_end))
 		panic("nexus_probe irq_rman");
-#endif /* PC98 */
 #endif
 
 	/*
@@ -211,11 +200,7 @@ nexus_probe(device_t dev)
 	 * multiple bridges.  (eg: laptops with docking stations)
 	 */
 	drq_rman.rm_start = 0;
-#ifdef PC98
-	drq_rman.rm_end = 3;
-#else
 	drq_rman.rm_end = 7;
-#endif
 	drq_rman.rm_type = RMAN_ARRAY;
 	drq_rman.rm_descr = "DMA request lines";
 	/* XXX drq 0 not available on some machines */
@@ -435,28 +420,11 @@ nexus_alloc_resource(device_t bus, device_t child, int type, int *rid,
 		rman_set_bustag(rv, I386_BUS_SPACE_MEM);
 	} else if (type == SYS_RES_IOPORT) {
 		rman_set_bustag(rv, I386_BUS_SPACE_IO);
-#ifndef PC98
 		rman_set_bushandle(rv, rv->r_start);
-#endif
 	}
 
-#ifdef PC98
-	if ((type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) &&
-	    i386_bus_space_handle_alloc(rv->r_bustag, rv->r_start, count,
-					&rv->r_bushandle) != 0) {
-		rman_release_resource(rv);
-		return 0;
-	}
-#endif
-
 	if (needactivate) {
 		if (bus_activate_resource(child, type, *rid, rv)) {
-#ifdef PC98
-			if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
-				i386_bus_space_handle_free(rv->r_bustag,
-				  rv->r_bushandle, rv->r_bushandle->bsh_sz);
-			}
-#endif
 			rman_release_resource(rv);
 			return 0;
 		}
@@ -492,13 +460,8 @@ nexus_activate_resource(device_t bus, device_t child, int type, int rid,
 			vaddr = (caddr_t) pmap_mapdev(paddr-poffs, psize+poffs) + poffs;
 		}
 		rman_set_virtual(r, vaddr);
-#ifdef PC98
-		/* PC-98: the type of bus_space_handle_t is the structure. */
-		r->r_bushandle->bsh_base = (bus_addr_t) vaddr;
-#else
 		/* IBM-PC: the type of bus_space_handle_t is u_int */
 		rman_set_bushandle(r, (bus_space_handle_t) vaddr);
-#endif
 	}
 	return (rman_activate_resource(r));
 }
@@ -530,12 +493,6 @@ nexus_release_resource(device_t bus, device_t child, int type, int rid,
 		if (error)
 			return error;
 	}
-#ifdef PC98
-	if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
-		i386_bus_space_handle_free(r->r_bustag, r->r_bushandle,
-					   r->r_bushandle->bsh_sz);
-	}
-#endif
 	return (rman_release_resource(r));
 }
 
diff --git a/sys/platform/pc32/i386/vm_machdep.c b/sys/platform/pc32/i386/vm_machdep.c
index a059dded78..b5e26c0f5e 100644
--- a/sys/platform/pc32/i386/vm_machdep.c
+++ b/sys/platform/pc32/i386/vm_machdep.c
@@ -39,14 +39,11 @@
  *	from: @(#)vm_machdep.c	7.3 (Berkeley) 5/13/91
  *	Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
  * $FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.132.2.9 2003/01/25 19:02:23 dillon Exp $
- * $DragonFly: src/sys/platform/pc32/i386/vm_machdep.c,v 1.33 2005/02/21 21:40:53 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/i386/vm_machdep.c,v 1.34 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include "use_npx.h"
 #include "use_isa.h"
-#ifdef PC98
-#include "opt_pc98.h"
-#endif
 #include "opt_reset.h"
 
 #include <sys/param.h>
@@ -84,11 +81,7 @@
 #include <sys/user.h>
 #include <sys/thread2.h>
 
-#ifdef PC98
-#include <pc98/pc98/pc98.h>
-#else
 #include <bus/isa/i386/isa.h>
-#endif
 
 static void	cpu_reset_real (void);
 #ifdef SMP
@@ -457,18 +450,6 @@ cpu_reset()
 static void
 cpu_reset_real()
 {
-
-#ifdef PC98
-	/*
-	 * Attempt to do a CPU reset via CPU reset port.
-	 */
-	cpu_disable_intr();
-	if ((inb(0x35) & 0xa0) != 0xa0) {
-		outb(0x37, 0x0f);		/* SHUT0 = 0. */
-		outb(0x37, 0x0b);		/* SHUT1 = 0. */
-	}
-	outb(0xf0, 0x00);		/* Reset. */
-#else
 	/*
 	 * Attempt to do a CPU reset via the keyboard controller,
 	 * do not turn of the GateA20, as any machine that fails
@@ -481,7 +462,6 @@ cpu_reset_real()
 	printf("Keyboard reset did not work, attempting CPU shutdown\n");
 	DELAY(1000000);	/* wait 1 sec for printf to complete */
 #endif
-#endif /* PC98 */
 	/* force a shutdown by unmapping entire address space ! */
 	bzero((caddr_t) PTD, PAGE_SIZE);
 
diff --git a/sys/platform/pc32/isa/sound/local.h b/sys/platform/pc32/isa/sound/local.h
index aa5ebbbe9b..e28115392b 100644
--- a/sys/platform/pc32/isa/sound/local.h
+++ b/sys/platform/pc32/isa/sound/local.h
@@ -6,7 +6,7 @@
  * will become more like that of standard bsd code.
  * lr 970714
  *
- * $DragonFly: src/sys/platform/pc32/isa/sound/Attic/local.h,v 1.3 2005/01/31 23:44:35 joerg Exp $
+ * $DragonFly: src/sys/platform/pc32/isa/sound/Attic/local.h,v 1.4 2005/02/27 10:57:24 swildner Exp $
  */
 
 /* build hex2hex /tmp/foo.x trix_boot.h trix_boot */
@@ -97,13 +97,6 @@
 #define CONFIG_YM3812
 #endif
 
-#ifdef PC98
-#include "use_nss.h"
-#if NNSS != 0
-#define CONFIG_NSS
-#endif
-#endif
-
 #define ALLOW_POLL
 
 /* #undef  CONFIG_PAS */
@@ -126,11 +119,7 @@
 
 #define CONFIG_MPU_EMU
 
-#ifdef PC98
-#define DSP_BUFFSIZE 61440
-#else
 #define DSP_BUFFSIZE 32768*2
-#endif
 /* #define SELECTED_SOUND_OPTIONS	0x0188090a */
 
 #ifndef TRIX_SB_BASE
diff --git a/sys/platform/pc32/isa/sound/sbcard.h b/sys/platform/pc32/isa/sound/sbcard.h
index 6647c268a9..47c52285b8 100644
--- a/sys/platform/pc32/isa/sound/sbcard.h
+++ b/sys/platform/pc32/isa/sound/sbcard.h
@@ -2,7 +2,7 @@
  * file: sbcard.h
  *
  * $FreeBSD: src/sys/i386/isa/sound/sbcard.h,v 1.4 1999/12/27 04:37:19 tanimura Exp $
- * $DragonFly: src/sys/platform/pc32/isa/sound/Attic/sbcard.h,v 1.2 2003/06/17 04:28:38 dillon Exp $
+ * $DragonFly: src/sys/platform/pc32/isa/sound/Attic/sbcard.h,v 1.3 2005/02/27 10:57:24 swildner Exp $
  *
  */
 
@@ -11,20 +11,6 @@ extern int sbc_major, sbc_minor ;
  * sound blaster registers
  */
 
-#ifdef PC98
-#define DSP_RESET      (sbc_base + 0x600)
-#define DSP_READ       (sbc_base + 0xA00)
-#define DSP_WRITE      (sbc_base + 0xC00)
-#define DSP_COMMAND    (sbc_base + 0xC00)
-#define DSP_STATUS     (sbc_base + 0xC00)
-#define DSP_DATA_AVAIL (sbc_base + 0xE00)
-#define DSP_DATA_AVL16 (sbc_base + 0xF00)
-#define MIXER_ADDR     (sbc_base + 0x400)
-#define MIXER_DATA     (sbc_base + 0x500)
-#define OPL3_LEFT      (sbc_base + 0x000)
-#define OPL3_RIGHT     (sbc_base + 0x200)
-#define OPL3_BOTH      (sbc_base + 0x800)
-#else
 #define DSP_RESET	(sbc_base + 0x6)
 #define DSP_READ	(sbc_base + 0xA)
 #define DSP_WRITE	(sbc_base + 0xC)
@@ -37,7 +23,6 @@ extern int sbc_major, sbc_minor ;
 #define OPL3_LEFT	(sbc_base + 0x0)
 #define OPL3_RIGHT	(sbc_base + 0x2)
 #define OPL3_BOTH	(sbc_base + 0x8)
-#endif
 
 /*
  * DSP Commands. There are many, and in many cases they are used explicitly
diff --git a/sys/platform/vkernel/i386/genassym.c b/sys/platform/vkernel/i386/genassym.c
index 5e0de8fd4b..d117750256 100644
--- a/sys/platform/vkernel/i386/genassym.c
+++ b/sys/platform/vkernel/i386/genassym.c
@@ -35,7 +35,7 @@
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
  * $FreeBSD: src/sys/i386/i386/genassym.c,v 1.86.2.3 2002/03/03 05:42:49 nyan Exp $
- * $DragonFly: src/sys/platform/vkernel/i386/genassym.c,v 1.40 2004/08/12 19:59:30 eirikn Exp $
+ * $DragonFly: src/sys/platform/vkernel/i386/genassym.c,v 1.41 2005/02/27 10:57:24 swildner Exp $
  */
 
 #include <sys/param.h>
@@ -229,10 +229,3 @@ ASSYM(KPSEL, GSEL(GPRIV_SEL, SEL_KPL));
 ASSYM(BC32SEL, GSEL(GBIOSCODE32_SEL, SEL_KPL));
 ASSYM(GPROC0_SEL, GPROC0_SEL);
 ASSYM(VM86_FRAMESIZE, sizeof(struct vm86frame));
-
-#ifdef PC98
-#include <machine/bus.h>
-
-ASSYM(BUS_SPACE_HANDLE_BASE, offsetof(struct bus_space_handle, bsh_base));
-ASSYM(BUS_SPACE_HANDLE_IAT, offsetof(struct bus_space_handle, bsh_iat));
-#endif
-- 
2.41.0