Another round of merge.

(1) Bug fix (pass boot drive):

	pc98/boot/biosboot/boot2.S

(2) Delete code for unsupported high-resolution modes and move old
    Epson notebook code to epsonio.h:

  	pc98/boot/biosboot/io.c
	pc98/i386/vm_machdep.c
	pc98/pc98/fd.c
	pc98/pc98/pc98.c
	pc98/pc98/pc98.h
	pc98/pc98/epsonio.h (new)

(3) Change aic driver so that PCMCIA cards (I/O port same as PC/AT)
    and PC-9801-100 cards can be selected with a flag in kernel config
    file:

	pc98/pc98/aic6360.c
	pc98/pc98/aic_98.h (new)

(4) Fix wcd entry (it was broken).  Delete mcd, it doesn't work on
    98.  Change aic entry according to above:

	pc98/conf/GENERIC98

(5) Move pc98_machdep.c to top of files in pc98/pc98:

	pc98/conf/files.pc98

(6) Delete empty lines:

	pc98/i386/locore.s

(7) Fix (it didn't work if I586 was specified):

	pc98/pc98/clock.c

(8) Staticize:

	pc98/pc98/pc98_machdep.c

(9) Enable workaround for Cyrix bug for 5x86 also:

	pc98/i386/machdep.c
	pc98/i386/trap.c

All the above deletes this file too:

	pc98/i386/pmap.c

(phew!)
Submitted by:	The FreeBSD(98) Development Team

1 files changed, 7 insertions, 11 deletions

diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index d33ece9..5bd1821 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -11,7 +11,7 @@
 # device lines is present in the ./LINT configuration file. If you are 
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
-#	$Id: GENERIC98,v 1.5 1996/09/12 11:09:16 asami Exp $
+#	$Id: GENERIC98,v 1.6 1996/10/09 21:45:41 asami Exp $
 
 # GENERIC98 -- Generic PC98 machine with WD/SBIC55 disks
 
@@ -54,21 +54,18 @@ options		COM_MULTIPORT
 #
 #options	"IBM_486SLC"		# IBM486SLC/SLC2 support
 #options	"CYRIX_486DLC"		# Cyrix 486DLC/SLC/DLC2/SLC2 support
-#option		"CYRIX_5X86"		# Cyrix 5x86 support
+#options	"CYRIX_5X86"		# Cyrix 5x86 support
 #options	SUSP_HLT		# CPU enters suspend mode when HALT
 #options	"DISABLE_5X86_LSSER"	# Load-Store reordering enable
-
 #
 #	sbic55.c.new
 #
 #options	SCSI_SYNC		# synchronous transfer mode
 #options	FORCE_BUSMASTER
 #options	"HA55BS_ID=0"
-
 #
 #	IBM-PC HDD support
 #options	COMPAT_ATDISK
-
 #
 #	FreeBSD(98)-current is a *TEST VERSION*.  
 #	It is highly recomended to compile with following options, and to
@@ -97,7 +94,7 @@ disk		wd0	at wdc0 drive 0
 
 options		ATAPI	# Enable ATAPI support for IDE bus
 options		ATAPI_STATIC	#Don't do it as an LKM
-device		wcd	#IDE CD-ROM
+device		wcd0	#IDE CD-ROM
 
 # A single entry for any of these controllers (ncr, ahb, ahc) is sufficient
 # for any number of installed devices.
@@ -105,21 +102,20 @@ controller	ncr0
 controller	ahc0
 
 controller	sbic0	at isa? port "IO_SCSI" bio irq 5 drq 3 vector sbicintr
+# sbic55.c.new
 #controller	sbic0	at isa? port "IO_SCSI" bio irq 5 drq 3 flags 0xff vector sbicintr
-controller	aic0	at isa? port 0x1840 bio irq 5 vector aicintr
+controller	aic0	at isa? port 0x1840 bio irq 5 flags 0x10000 vector aicintr
 
 controller	scbus0
 
 device		sd0
 
+device		od0	#See LINT for possible `od' options.
+
 device		st0
 
 device		cd0	#Only need one of these, the code dynamically grows
 
-device		od0
-
-device		mcd0	at isa? port 0x300 bio irq 10 vector mcdintr
-
 controller	matcd0	at isa? port? bio
 
 # syscons is the default console driver, resembling an SCO console