New parallel port support for PC98. Old PC98s which have

uni-directional parallel port should use olpt driver instead of lpt
driver.

Files ppc.c and ppcreg.h are copied form i386/isa directory with PC98
change.

Submitted by:	Akio Morita <amorita@meadow.scphys.kyoto-u.ac.jp>

3 files changed, 25 insertions, 7 deletions

diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index 7014114..6d4e4d4 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -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.75 1999/05/10 09:00:28 kato Exp $
+#	$Id: GENERIC98,v 1.76 1999/06/15 13:14:50 des Exp $
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
@@ -170,8 +170,17 @@ device		sio1	at isa? port 0x238 irq 5 flags 0x12000000
 #options	COM_ESP
 #device		sio1	at isa? port 0x18b0 irq 5 flags 0x19000000
 
-#device		lpt0	at isa? port IO_LPT
 device		mse0	at isa? port IO_MSE irq 13
+# NEW Parallel port
+device		ppc0	at isa? port? tty irq 14
+controller	ppbus0
+device		lpt0	at ppbus?
+device		plip0	at ppbus?
+device		ppi0	at ppbus?
+#controller	vpo0	at ppbus?
+# OLD Parallel port
+# Please stay olpt driver after ppc driver
+device		olpt0	at isa? port IO_LPT  tty
 
 #
 # The following Ethernet NICs are all PCI devices.
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index 7014114..6d4e4d4 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.75 1999/05/10 09:00:28 kato Exp $
+#	$Id: GENERIC98,v 1.76 1999/06/15 13:14:50 des Exp $
 
 # GENERIC98 -- Generic PC98 machine with WD/SCSI disks
 
@@ -170,8 +170,17 @@ device		sio1	at isa? port 0x238 irq 5 flags 0x12000000
 #options	COM_ESP
 #device		sio1	at isa? port 0x18b0 irq 5 flags 0x19000000
 
-#device		lpt0	at isa? port IO_LPT
 device		mse0	at isa? port IO_MSE irq 13
+# NEW Parallel port
+device		ppc0	at isa? port? tty irq 14
+controller	ppbus0
+device		lpt0	at ppbus?
+device		plip0	at ppbus?
+device		ppi0	at ppbus?
+#controller	vpo0	at ppbus?
+# OLD Parallel port
+# Please stay olpt driver after ppc driver
+device		olpt0	at isa? port IO_LPT  tty
 
 #
 # The following Ethernet NICs are all PCI devices.
diff --git a/sys/pc98/conf/files.pc98 b/sys/pc98/conf/files.pc98
index 943ec0f..a03636a 100644
--- a/sys/pc98/conf/files.pc98
+++ b/sys/pc98/conf/files.pc98
@@ -3,7 +3,7 @@
 #
 # modified for PC-9801
 #
-#	$Id: files.pc98,v 1.96 1999/05/17 12:07:00 kato Exp $
+#	$Id: files.pc98,v 1.97 1999/06/03 13:03:58 kato Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -175,7 +175,7 @@ i386/isa/istallion.c		optional	stli	device-driver
 i386/isa/joy.c			optional        joy     device-driver
 pc98/pc98/pc98kbd.c		optional	pckbd	device-driver
 i386/isa/loran.c		optional	loran	device-driver
-pc98/pc98/lpt.c			optional	lpt	device-driver
+pc98/pc98/olpt.c		optional	olpt	device-driver
 i386/isa/labpc.c		optional	labpc	device-driver
 i386/isa/mcd.c			optional	mcd	device-driver
 pc98/pc98/mse.c			optional	mse	device-driver
@@ -196,7 +196,7 @@ i386/isa/pcvt/pcvt_sup.c	optional	vt	device-driver
 i386/isa/pcvt/pcvt_vtf.c	optional	vt	device-driver
 i386/isa/pnp.c			optional	pnp	device-driver
 i386/isa/prof_machdep.c		optional	profiling-routine
-i386/isa/ppc.c			optional	ppc	device-driver
+pc98/pc98/ppc.c			optional	ppc	device-driver
 i386/isa/pcf.c			optional	pcf	device-driver
 isa/psm.c			optional	psm	device-driver
 i386/isa/random_machdep.c	standard