- Fixed the conversion to bus_space interface.

- Added PC-98 Cbus devices support.
  The original patch is submitted by chi@bd.mbn.or.jp (Chiharu Shibata)
- Removed old ed driver.

2 files changed, 73 insertions, 43 deletions

diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index fdccf81..6910fa4 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -175,7 +175,7 @@ device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 # ISA Ethernet NICs.
 
 # DP8390 NIC
-#device		ed	1
+device		ed
 
 # MB86960A NIC
 options 	FE_8BIT_SUPPORT		# LAC-98 support
diff --git a/sys/pc98/conf/GENERIC.hints b/sys/pc98/conf/GENERIC.hints
index dab85d8..153d416 100644
--- a/sys/pc98/conf/GENERIC.hints
+++ b/sys/pc98/conf/GENERIC.hints
@@ -167,66 +167,96 @@ hint.olpt.0.port="0x040"
 # ed8: C-NET(98)
 # ed9: C-NET(98)E/L
 # ed10: EC/EP-98X
-# ed11: SIU-98-D
+# ed11: SB-9801
+# ed12: NC5098
 #
+hint.ed.0.at="isa"
+hint.ed.0.port="0x00d0"
+hint.ed.0.irq="6"
+# EtherEZ98
 #hint.ed.0.at="isa"
-#hint.ed.0.port="0x00d0"
+#hint.ed.0.port="0x10d0"
 #hint.ed.0.irq="6"
-# SMC EtherEZ98
-##hint.ed.0.at="isa"
-##hint.ed.0.port="0x10d0"
-##hint.ed.0.irq="6"
-##hint.ed.0.maddr="0xc8000"
+#hint.ed.0.maddr="0xc8000"
+hint.ed.5.at="isa"
+hint.ed.5.port="0x00d0"
+hint.ed.5.irq="6"
+hint.ed.5.maddr="0xd0000"
+hint.ed.5.msize="16384"
+hint.ed.5.flags="0x600000"
+# SIU-98-E
 #hint.ed.5.at="isa"
 #hint.ed.5.port="0x00d0"
 #hint.ed.5.irq="6"
 #hint.ed.5.maddr="0xd0000"
-#hint.ed.5.msize="16384"
-#hint.ed.5.flags="0x600000"
-#hint.ed.1.at="isa"
-#hint.ed.1.port="0x00d8"
-#hint.ed.1.irq="6"
-#hint.ed.1.flags="0x200000"
-#hint.ed.3.at="isa"
-#hint.ed.3.port="0x00d0"
-#hint.ed.3.irq="6"
-#hint.ed.3.flags="0x400000"
-#hint.ed.4.at="isa"
-#hint.ed.4.port="0x56d0"
-#hint.ed.4.irq="5"
-#hint.ed.4.flags="0x500000"
-#hint.ed.2.at="isa"
-#hint.ed.2.port="0x00d8"
-#hint.ed.2.irq="6"
-#hint.ed.2.flags="0x300000"
+#hint.ed.5.msize="32768"
+#hint.ed.5.flags="0x610000"
+hint.ed.1.at="isa"
+hint.ed.1.port="0x00d8"
+hint.ed.1.irq="6"
+hint.ed.1.flags="0x200000"
+hint.ed.3.at="isa"
+hint.ed.3.port="0x00d0"
+hint.ed.3.irq="6"
+hint.ed.3.flags="0x400000"
+hint.ed.4.at="isa"
+hint.ed.4.port="0x56d0"
+hint.ed.4.irq="5"
+hint.ed.4.flags="0x500000"
+hint.ed.2.at="isa"
+hint.ed.2.port="0x00d8"
+hint.ed.2.irq="6"
+hint.ed.2.flags="0x300000"
+hint.ed.7.at="isa"
+hint.ed.7.port="0x00d0"
+hint.ed.7.irq="6"
+hint.ed.7.flags="0x900000"
+# PC-9801-77
 #hint.ed.7.at="isa"
 #hint.ed.7.port="0x00d0"
 #hint.ed.7.irq="6"
-#hint.ed.7.flags="0x900000"
-#hint.ed.6.at="isa"
-#hint.ed.6.port="0x0770"
-#hint.ed.6.irq="6"
-#hint.ed.6.flags="0x800000"
+#hint.ed.7.flags="0x910000"
+hint.ed.6.at="isa"
+hint.ed.6.port="0x0770"
+hint.ed.6.irq="6"
+hint.ed.6.flags="0x800000"
+hint.ed.9.at="isa"
+hint.ed.9.port="0x03d0"
+hint.ed.9.irq="6"
+hint.ed.9.flags="0xb00000"
+# C-NET(98)E/L(0x55ED)
 #hint.ed.9.at="isa"
 #hint.ed.9.port="0x03d0"
 #hint.ed.9.irq="6"
-#hint.ed.9.flags="0xb00000"
-#hint.ed.8.at="isa"
-#hint.ed.8.port="0xa3d0"
-#hint.ed.8.irq="6"
-#hint.ed.8.maddr="0xd0000"
-#hint.ed.8.msize="16384"
-#hint.ed.8.flags="0xa00000"
+#hint.ed.9.flags="0xb10000"
+hint.ed.8.at="isa"
+hint.ed.8.port="0xa3d0"
+hint.ed.8.irq="6"
+hint.ed.8.maddr="0xd0000"
+hint.ed.8.msize="16384"
+hint.ed.8.flags="0xa00000"
+# EN1646
 #hint.ed.10.at="isa"
 #hint.ed.10.port="0x00d0"
 #hint.ed.10.irq="3"
-#hint.ed.10.flags="0xd10000"
+#hint.ed.10.flags="0xd00000"
+hint.ed.10.at="isa"
+hint.ed.10.port="0x00d0"
+hint.ed.10.irq="3"
+hint.ed.10.flags="0xd10000"
+hint.ed.11.at="isa"
+hint.ed.11.port="0x00d0"
+hint.ed.11.irq="3"
+hint.ed.11.flags="0xe00000"
+# SN-9801-2
 #hint.ed.11.at="isa"
 #hint.ed.11.port="0x00d0"
-#hint.ed.11.irq="6"
-#hint.ed.11.maddr="0xd0000"
-#hint.ed.11.msize="32768"
-#hint.ed.11.flags="0x610000"
+#hint.ed.11.irq="3"
+#hint.ed.11.flags="0xe00001"
+hint.ed.12.at="isa"
+hint.ed.12.port="0x20d0"
+hint.ed.12.irq="3"
+hint.ed.12.flags="0xf00000"
 
 # fe0: RE1000/1000Plus/AccessPC N98C+/LAC-98
 hint.fe.0.at="isa"