- Moved "hint" informations to GENERIC.hints.

- Cosmetic changes.

2 files changed, 223 insertions, 139 deletions

diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index e84d44e..7781da1 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -92,54 +92,12 @@ device		isp		# Qlogic family
 device		ncr		# NCR/Symbios Logic
 device		sym		# NCR/Symbios Logic (newer chipsets)
 
-#
 # WD33C93 SCSI card (55/92 like board)
-#
-
-options	BS_TARG_SAFEMODE
-
+options 	BS_TARG_SAFEMODE
 device		bs	1
-# PC-9801-92
-#hint.bs.0.at="isa"
-#hint.bs.0.port="0xCC0"
-#hint.bs.0.irq="5"
-#hint.bs.0.drq="3"
-#hint.bs.0.flags="0"
-# SC-98
-#hint.bs.0.at="isa"
-#hint.bs.0.port="0xCC0"
-#hint.bs.0.irq="5"
-#hint.bs.0.drq="3"
-#hint.bs.0.flags="0x10000"
-# HA-55BS2 and later
-#hint.bs.0.at="isa"
-#hint.bs.0.port="0xCC0"
-#hint.bs.0.irq="5"
-#hint.bs.0.drq="3"
-#hint.bs.0.flags="0x20000"
-# ELECOM type
-#hint.bs.0.at="isa"
-#hint.bs.0.port="0xCC0"
-#hint.bs.0.irq="5"
-#hint.bs.0.drq="3"
-#hint.bs.0.flags="0x30000"
-# SMIT
-#hint.bs.0.at="isa"
-#hint.bs.0.port="0xCC0"
-#hint.bs.0.irq="5"
-#hint.bs.0.drq="3"
-#hint.bs.0.iomem="0xdd000"
-#hint.bs.0.iosiz="0x1000"
-#hint.bs.0.flags="0x40000"
-# Logitec LHA-20x
-#hint.bs.0.at="isa"
-#hint.bs.0.port="0xCC0"
-#hint.bs.0.irq="5"
-#hint.bs.0.drq="3"
-#hint.bs.0.flags="0x50000"
 
 # PC-9801-100
-device	aic
+device		aic
 
 # SCSI peripherals
 device		scbus		# SCSI bus (required)
@@ -175,66 +133,9 @@ device		card
 device		pcic
 
 # Serial (COM) ports
-#
 options 	COM_MULTIPORT
-#
-# COM1
+#options 	COM_ESP		# ESP98
 device		sio
-# COM2 (2nd CCU)
-#hint.sio.1.at="isa"
-#hint.sio.1.port="0x238"
-#hint.sio.1.irq="5"
-#hint.sio.1.flags="0x12000010"
-# PC-9861K, PC-9801-101, MDC-926Rs
-#hint.sio.1.at="isa"
-#hint.sio.1.port="0x0B1"
-#hint.sio.1.irq="5"
-#hint.sio.1.flags="0x01000000"
-#hint.sio.2.at="isa"
-#hint.sio.2.port="0x0B9"
-#hint.sio.2.irq="6"
-#hint.sio.2.flags="0x02000000"
-# PC-9801-120 (PnP off)
-#hint.sio.1.at="isa"
-#hint.sio.1.port="0x8b0"
-#hint.sio.1.irq="5"
-#hint.sio.1.flags="0x11000000"
-# MC-16550II, MC-RS98
-#hint.sio.1.at="isa"
-#hint.sio.1.port="0xd2"
-#hint.sio.1.irq="5"
-#hint.sio.1.flags="0x14000101"
-#hint.sio.2.at="isa"
-#hint.sio.2.port="0x8d2"
-#hint.sio.2.flags="0x14000101"
-# RSB-2000, RSB-3000, B98-02
-#hint.sio.1.at="isa"
-#hint.sio.1.port="0xb0"
-#hint.sio.1.flags="0x15000101"
-#hint.sio.2.at="isa"
-#hint.sio.2.port="0xb1"
-#hint.sio.2.flags="0x15000101"
-# RSB-384
-#hint.sio.1.at="isa"
-#hint.sio.1.port="0xb0"
-#hint.sio.1.flags="0x16000000"
-#hint.sio.2.at="isa"
-#hint.sio.2.port="0xb1"
-#hint.sio.2.flags="0x16000000"
-# RSA-98III
-#hint.sio.1.at="isa"
-#hint.sio.1.port="0x50e0"
-#hint.sio.1.irq="5"
-#hint.sio.1.flags="0x18000101"
-#hint.sio.2.at="isa"
-#hint.sio.2.port="0x51e0"
-#hint.sio.2.flags="0x18000101"
-# ESP98
-#options 	COM_ESP
-#hint.sio.1.at="isa"
-#hint.sio.1.port="0x18b0"
-#hint.sio.1.irq="5"
-#hint.sio.1.flags="0x19000000"
 
 device		mse
 
@@ -270,44 +171,11 @@ device		wb		# Winbond W89C840F
 device		xl		# 3Com 3c90x (``Boomerang'', ``Cyclone'')
 
 # ISA Ethernet NICs.
-#
+
 # DP8390 NIC
-#
-# ed0: generic driver/EtherEZ98
-# ed1: LANEED LD-BDN
-# ed2: EGY-98
-# ed3: LGY-98
-# ed4: ICM-IF-2766/EN-2298-T
-# ed5: SIC-98
-# ed6: PC-9801-108
-# ed7: LA-98
-# ed8: C-NET(98)
-# ed9: C-NET(98)E/L
-# ed10: EC/EP-98X
-# ed11: SIU-98-D
-#
-# XXX convert to hints
-#device ed0 at isa? port 0x00d0 irq 6
-##device ed0 at isa? port 0x10d0 irq 6 iomem 0xc8000    # SMC EtherEZ98
-#device ed5 at isa? port 0x00d0 irq 6 iomem 0xd0000 iosiz 16384 flags 0x600000
-#device ed1 at isa? port 0x00d8 irq 6 flags 0x200000
-#device ed3 at isa? port 0x00d0 irq 6 flags 0x400000
-#device ed4 at isa? port 0x56d0 irq 5 flags 0x500000
-#device ed2 at isa? port 0x00d8 irq 6 flags 0x300000
-#device ed7 at isa? port 0x00d0 irq 6 flags 0x900000
-#device ed6 at isa? port 0x0770 irq 6 flags 0x800000
-#device ed9 at isa? port 0x03d0 irq 6 flags 0xb00000
-#device ed8 at isa? port 0xa3d0 irq 6 iomem 0xd0000 iosiz 16384 flags 0xa00000
-#device ed10 at isa? port 0x00d0 irq 3 flags 0xd10000
-#device ed11 at isa? port 0x00d0 irq 6 iomem 0xd0000 iosiz 32768 flags 0x610000
-#
+#device		 ed
+
 # MB86960A NIC
-#
-# fe0: RE1000/1000Plus/AccessPC N98C+/LAC-98
-# fe1: C-NET(98)P2/C-NET(9N)E
-#
-# FE_8BIT_SUPPORT is needed to support LAC-98
-#
 options 	FE_8BIT_SUPPORT		# LAC-98 support
 device		fe
 
@@ -331,6 +199,7 @@ device		awi
 device		xe
 
 
+# The VoxWare sound drivers
 #device	snd
 #device	sb
 #device	sbxvi
@@ -366,7 +235,7 @@ device		faith	1	# IPv6-to-IPv4 relaying (translation)
 # Be aware of the administrative consequences of enabling this!
 device		bpf		# Berkeley packet filter
 
-#device		compat_atdisk	#IBM-PC HDD support
+#device		compat_atdisk	# IBM-PC HDD support
 
 # USB support
 #device		uhci		# UHCI PCI->USB interface
diff --git a/sys/pc98/conf/GENERIC.hints b/sys/pc98/conf/GENERIC.hints
index baaa737..b02a35c 100644
--- a/sys/pc98/conf/GENERIC.hints
+++ b/sys/pc98/conf/GENERIC.hints
@@ -11,6 +11,7 @@ hint.fd.2.at="fdc0"
 hint.fd.2.drive="2"
 hint.fd.3.at="fdc0"
 hint.fd.3.drive="3"
+
 hint.wdc.0.at="isa"
 hint.wdc.0.port="0x640"
 hint.wdc.0.irq="9"
@@ -22,49 +23,263 @@ hint.wd.0.drive="0"
 #hint.wd.2.drive="2"
 #hint.wd.3.at="wdc0"
 #hint.wd.3.drive="3"
+
+# PC-9801-92
 hint.bs.0.at="isa"
 hint.bs.0.port="0xCC0"
 hint.bs.0.irq="5"
 hint.bs.0.drq="3"
 hint.bs.0.flags="0"
+# SC-98
+#hint.bs.0.at="isa"
+#hint.bs.0.port="0xCC0"
+#hint.bs.0.irq="5"
+#hint.bs.0.drq="3"
+#hint.bs.0.flags="0x10000"
+# HA-55BS2 and later
+#hint.bs.0.at="isa"
+#hint.bs.0.port="0xCC0"
+#hint.bs.0.irq="5"
+#hint.bs.0.drq="3"
+#hint.bs.0.flags="0x20000"
+# ELECOM type
+#hint.bs.0.at="isa"
+#hint.bs.0.port="0xCC0"
+#hint.bs.0.irq="5"
+#hint.bs.0.drq="3"
+#hint.bs.0.flags="0x30000"
+# SMIT
+#hint.bs.0.at="isa"
+#hint.bs.0.port="0xCC0"
+#hint.bs.0.irq="5"
+#hint.bs.0.drq="3"
+#hint.bs.0.maddr="0xdd000"
+#hint.bs.0.iosiz="0x1000"
+#hint.bs.0.flags="0x40000"
+# Logitec LHA-20x
+#hint.bs.0.at="isa"
+#hint.bs.0.port="0xCC0"
+#hint.bs.0.irq="5"
+#hint.bs.0.drq="3"
+#hint.bs.0.flags="0x50000"
+
+# PC-9801-100
 hint.aic.0.at="isa"
 hint.aic.0.port="0x1840"
 hint.aic.0.irq="5"
 hint.aic.0.flags="0x10000"
+
 hint.pckbd.0.at="isa"
 hint.pckbd.0.port="0x041"
 hint.pckbd.0.irq="1"
 hint.gdc.0.at="isa"
 hint.sc.0.at="isa"
+
 hint.npx.0.at="nexus"
 hint.npx.0.port="0x0F8"
 hint.npx.0.irq="8"
+
+#hint.apm.0.at="nexus"
+#hint.apm.0.disabled="1"
+#hint.apm.0.flags="0x20"
+
 hint.pcic.0.at="isa"
 hint.pcic.0.irq="6"
 hint.pcic.0.port="0x3e0"
+
+# COM1
 hint.sio.0.at="isa"
 hint.sio.0.port="0x030"
 hint.sio.0.irq="4"
+# COM2 (2nd CCU)
 hint.sio.1.at="isa"
 hint.sio.1.port="0x238"
 hint.sio.1.irq="5"
 hint.sio.1.flags="0x12000010"
+# PC-9861K, PC-9801-101, MDC-926Rs
+#hint.sio.1.at="isa"
+#hint.sio.1.port="0x0B1"
+#hint.sio.1.irq="5"
+#hint.sio.1.flags="0x01000000"
+#hint.sio.2.at="isa"
+#hint.sio.2.port="0x0B9"
+#hint.sio.2.irq="6"
+#hint.sio.2.flags="0x02000000"
+# PC-9801-120 (PnP off)
+#hint.sio.1.at="isa"
+#hint.sio.1.port="0x8b0"
+#hint.sio.1.irq="5"
+#hint.sio.1.flags="0x11000000"
+# MC-16550II, MC-RS98
+#hint.sio.1.at="isa"
+#hint.sio.1.port="0xd2"
+#hint.sio.1.irq="5"
+#hint.sio.1.flags="0x14000101"
+#hint.sio.2.at="isa"
+#hint.sio.2.port="0x8d2"
+#hint.sio.2.flags="0x14000101"
+# RSB-2000, RSB-3000, B98-02
+#hint.sio.1.at="isa"
+#hint.sio.1.port="0xb0"
+#hint.sio.1.flags="0x15000101"
+#hint.sio.2.at="isa"
+#hint.sio.2.port="0xb1"
+#hint.sio.2.flags="0x15000101"
+# RSB-384
+#hint.sio.1.at="isa"
+#hint.sio.1.port="0xb0"
+#hint.sio.1.flags="0x16000000"
+#hint.sio.2.at="isa"
+#hint.sio.2.port="0xb1"
+#hint.sio.2.flags="0x16000000"
+# RSA-98III
+#hint.sio.1.at="isa"
+#hint.sio.1.port="0x50e0"
+#hint.sio.1.irq="5"
+#hint.sio.1.flags="0x18000101"
+#hint.sio.2.at="isa"
+#hint.sio.2.port="0x51e0"
+#hint.sio.2.flags="0x18000101"
+# ESP98
+#hint.sio.1.at="isa"
+#hint.sio.1.port="0x18b0"
+#hint.sio.1.irq="5"
+#hint.sio.1.flags="0x19000000"
+
 hint.mse.0.at="isa"
 hint.mse.0.port="0x7FD9"
 hint.mse.0.irq="13"
+
 hint.ppc.0.at="isa"
 hint.ppc.0.irq="14"
 hint.olpt.0.at="isa"
 hint.olpt.0.port="0x040"
+
+#
+# ed0: generic driver/EtherEZ98
+# ed1: LANEED LD-BDN
+# ed2: EGY-98
+# ed3: LGY-98
+# ed4: ICM-IF-2766/EN-2298-T
+# ed5: SIC-98
+# ed6: PC-9801-108
+# ed7: LA-98
+# ed8: C-NET(98)
+# ed9: C-NET(98)E/L
+# ed10: EC/EP-98X
+# ed11: SIU-98-D
+#
+#hint.ed.0.at="isa"
+#hint.ed.0.port="0x00d0"
+#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.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.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.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.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="6"
+#hint.ed.11.maddr="0xd0000"
+#hint.ed.11.msize="32768"
+#hint.ed.11.flags="0x610000"
+
+# fe0: RE1000/1000Plus/AccessPC N98C+/LAC-98
 hint.fe.0.at="isa"
 hint.fe.0.port="0x00d0"
 hint.fe.0.irq="3"
+# fe1: C-NET(98)P2/C-NET(9N)E
 hint.fe.1.at="isa"
 hint.fe.1.port="0x73d0"
 hint.fe.1.irq="5"
+
 hint.ep.0.at="isa"
 hint.ep.0.port="0x40d0"
 hint.ep.0.irq="3"
+
 hint.lnc.0.at="isa"
 hint.lnc.0.port="0x03d0"
 hint.lnc.0.irq="6"
+
+# The VoxWare sound drivers
+#hint.sb.0.at="isa"
+#hint.sb.0.port="0x20d2"
+#hint.sb.0.irq="10"
+#hint.sb.0.drq="3"
+#hint.sbxvi.0.at="isa"
+#hint.sbxvi.0.drq="3"
+#hint.sbmidi.0.at="isa"
+#hint.sbmidi.0.port="0x80d2"
+#hint.opl.0.at="isa"
+#hint.opl.0.port="0x28d2"
+#hint.nss.0.at="isa"
+#hint.nss.0.port="0xa460"
+#hint.nss.0.irq="12"
+#hint.mss.0.at="isa"
+#hint.mss.0.port="0xf40"
+#hint.mss.0.irq="12"
+#hint.mss.0.drq="1"
+#hint.mpu.0.at="isa"
+#hint.mpu.0.port="0xe0d0"
+#hint.mpu.0.irq="6"
+
+#hint.joy.0.at="isa"
+#hint.joy.0.port="0x04d2"
+
+# The newpcm driver (use INSTEAD of snd and all VOXWARE drivers!)
+# Windows Sound System
+#hint.pcm.0.at="isa"
+#hint.pcm.0.port="0xf40"
+#hint.pcm.0.irq="12"
+#hint.pcm.0.drq="1"
+#hint.pcm.0.flags="0x10000"
+# Sound Blaster 16
+#hint.sbc.0.at="isa"
+#hint.sbc.0.port="0x20d2"
+#hint.sbc.0.irq="10"
+#hint.sbc.0.drq="3"
+