Merge missing changes from sys/i386/conf/GENERIC.

2 files changed, 156 insertions, 154 deletions

diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC
index e97a6d7..02c3d89 100644
--- a/sys/pc98/conf/GENERIC
+++ b/sys/pc98/conf/GENERIC
@@ -1,14 +1,18 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-# For more information read the handbook part System Administration -> 
-# Configuring the FreeBSD Kernel -> The Configuration File. 
-# The handbook is available in /usr/share/doc/handbook or online as
-# latest version from the FreeBSD World Wide Web server 
-# <URL:http://www.FreeBSD.ORG/>
+# For more information on this file, please read the handbook section on
+# Kernel Configuration Files:
 #
-# An exhaustive list of options and more detailed explanations of the 
-# device lines is present in the ./LINT configuration file. If you are 
+#    http://www.freebsd.org/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.ORG/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ./LINT configuration file. If you are
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
 # $FreeBSD$
@@ -25,67 +29,76 @@ maxusers	32
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
-options		PC98			#PC98
-options		MATH_EMULATE		#Support for x87 emulation
-options		INET			#InterNETworking
-options		FFS			#Berkeley Fast Filesystem
-options		FFS_ROOT		#FFS usable as root device [keep this!]
-options		MFS			#Memory Filesystem
-options		MFS_ROOT		#MFS usable as root device, "MFS" req'ed
-options		NFS			#Network Filesystem
-options		NFS_ROOT		#NFS usable as root device, "NFS" req'ed
-options		MSDOSFS			#MSDOS Filesystem
-options		CD9660			#ISO 9660 Filesystem
-options		CD9660_ROOT		#CD-ROM usable as root. "CD9660" req'ed
-options		PROCFS			#Process filesystem
-options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
-options		EPSON_BOUNCEDMA		#use bounce buufer for 15-16M
-#options		EPSON_MEMWIN		#EPSON memory window support
-options		UCONSOLE		#Allow users to grab the console
-#options		LINE30
-options		USERCONFIG		#boot -c editor
-options		VISUAL_USERCONFIG	#visual boot -c editor
-
-options		COM_MULTIPORT
+options 	PC98			#PC98
+options 	MATH_EMULATE		#Support for x87 emulation
+options 	INET			#InterNETworking
+options 	FFS			#Berkeley Fast Filesystem
+options 	FFS_ROOT		#FFS usable as root device [keep this!]
+options 	MFS			#Memory Filesystem
+options 	MFS_ROOT		#MFS usable as root device, "MFS" req'ed
+options 	NFS			#Network Filesystem
+options 	NFS_ROOT		#NFS usable as root device, "NFS" req'ed
+options 	MSDOSFS			#MSDOS Filesystem
+options 	CD9660			#ISO 9660 Filesystem
+options 	CD9660_ROOT		#CD-ROM usable as root. "CD9660" req'ed
+options 	PROCFS			#Process filesystem
+options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
+options 	SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
+options 	EPSON_BOUNCEDMA		#use bounce buufer for 15-16M
+#options 	EPSON_MEMWIN		#EPSON memory window support
+options 	UCONSOLE		#Allow users to grab the console
+#options 	LINE30
+options 	USERCONFIG		#boot -c editor
+options 	VISUAL_USERCONFIG	#visual boot -c editor
+options 	KTRACE			#ktrace(1) syscall trace support
+options         SYSVSHM			#SYSV-style shared memory
+options         SYSVMSG			#SYSV-style message queues
+options         SYSVSEM			#SYSV-style semaphores
+
+options 	COM_MULTIPORT
 
 #
 #	IBM-PC HDD support
-#options	COMPAT_ATDISK
+#options 	COMPAT_ATDISK
 
 # To make an SMP kernel, the next two are needed
-#options	SMP			# Symmetric MultiProcessor Kernel
-#options	APIC_IO			# Symmetric (APIC) I/O
+#options 	SMP			# Symmetric MultiProcessor Kernel
+#options 	APIC_IO			# Symmetric (APIC) I/O
 # Optionally these may need tweaked, (defaults shown):
-#options	NCPU=2			# number of CPUs
-#options	NBUS=4			# number of busses
-#options	NAPIC=1			# number of IO APICs
-#options	NINTR=24		# number of INTs
+#options 	NCPU=2			# number of CPUs
+#options 	NBUS=4			# number of busses
+#options 	NAPIC=1			# number of IO APICs
+#options 	NINTR=24		# number of INTs
 
-controller	isa0	at nexus?
+controller	isa0
 controller	pnp0			# PnP support for ISA
-controller	pci0	at nexus?
+controller	pci0
 
+# Floppy drives
 controller	fdc0	at isa? port IO_FD1 irq 11 drq 2
 disk		fd0	at fdc0 drive 0
 disk		fd1	at fdc0 drive 1
 disk		fd2	at fdc0 drive 2
 disk		fd3	at fdc0 drive 3
 
+# IDE controller and disks
 controller	wdc0	at isa? port IO_WD1 irq 9
 disk		wd0	at wdc0 drive 0
 #disk		wd1	at wdc0 drive 1
 #disk		wd2	at wdc0 drive 2
 #disk		wd3	at wdc0 drive 3
 
+# ATAPI devices on wdc?
 device		wcd0		#IDE CD-ROM
-#device		wfd0		#IDE Floppy (e.g. LS-120)
+#device 	wfd0		#IDE Floppy (e.g. LS-120)
+#device		wst0		#IDE Tape (e.g. Travan)
 
+# SCSI Controllers
 # A single entry for any of these controllers (ncr, ahb, ahc) is
 # sufficient for any number of installed devices.
-controller	ncr0
-controller	ahc0
-controller	isp0
+controller	ncr0		# NCR/Symbios Logic
+controller	ahc0		# AHA2940 and onboard AIC7xxx devices
+controller	isp0		# Qlogic family
 controller	adv0
 
 #
@@ -107,16 +120,15 @@ controller bs0 at isa? port IO_SCSI irq 5 drq 3 flags 0
 # Logitec LHA-20x
 #controller bs0 at isa? port IO_SCSI irq 5 drq 3 flags 0x50000
 
-controller	scbus0
-
-device		da0
-
-device		sa0
-
-device		pass0
-
-device		cd0	#Only need one of these, the code dynamically grows
+# SCSI peripherals
+# Only one of each of these is needed, they are dynamically allocated.
+controller	scbus0		# SCSI bus (required)
+device		da0		# Direct Access (disks)
+device		sa0		# Sequential Access (tape etc)
+device		cd0		# CD
+device		pass0		# Passthrough device (direct SCSI access)
 
+# Proprietary or custom CD-ROM Interfaces
 controller	matcd0	at isa? port?
 
 # keyboard driver
@@ -130,11 +142,10 @@ pseudo-device	splash
 
 device		sc0	at isa?
 
+# Floating point support - do not disable.
 device		npx0	at nexus? port IO_NPX irq 8
 
-#
-# Laptop support (see LINT for more options)
-#
+# Power management support (see LINT for more options)
 device		apm0    at nexus? disable flags 0x31 # Advanced Power Management
 
 # PCCARD (PCMCIA) support
@@ -142,8 +153,7 @@ device		apm0    at nexus? disable flags 0x31 # Advanced Power Management
 #device		pcic0	at card?
 #device		pcic1	at card?
 
-#
-# Serial Interface
+# Serial (COM) ports
 #
 # COM1
 device		sio0	at isa? port IO_COM1 irq 4
@@ -171,6 +181,7 @@ device		sio1	at isa? port 0x238 irq 5 flags 0x12000000
 #device		sio1	at isa? port 0x18b0 irq 5 flags 0x19000000
 
 device		mse0	at isa? port IO_MSE irq 13
+
 # NEW Parallel port
 device		ppc0	at isa? port? irq 14
 controller	ppbus0
@@ -185,9 +196,8 @@ device		olpt0	at isa? port IO_LPT
 # MII bus support, required for some 10/100 NICs
 controller	miibus0
 
-#
-# The following Ethernet NICs are all PCI devices.
-#
+# PCI Ethernet NICs.
+device		al0		# ADMtek AL981 (``Comet'')
 device		ax0		# ASIX AX88140A
 device		de0		# DEC/Intel DC21x4x (``Tulip'')
 device		fxp0		# Intel EtherExpress PRO/100B (82557, 82558)
@@ -195,6 +205,7 @@ device		mx0		# Macronix 98713/98715/98725 (``PMAC'')
 device		pn0		# Lite-On 82c168/82c169 (``PNIC'')
 device		rl0		# RealTek 8129/8139
 device		sf0		# Adaptec AIC-6915 (``Starfire'')
+device		ste0		# Sundance ST201 (D-Link DFE-550TX)
 device		tl0		# Texas Instruments ThunderLAN
 device		tx0		# SMC 9432TX (83c170 ``EPIC'')
 device		vr0		# VIA Rhine, Rhine II
@@ -246,25 +257,15 @@ options FE_8BIT_SUPPORT		# LAC-98 support
 #device pcm0    at isa? port 0xa460 irq 12
 #device	mss0	at isa? port 0xf40 irq 12 drq 1
 
-pseudo-device	loop
-pseudo-device	ether
-pseudo-device	sl	1
-pseudo-device	ppp	1
-pseudo-device	tun	
-pseudo-device	pty
+# Pseudo devices - the number indicates how many units to allocated.
+pseudo-device	loop		# Network loopback
+pseudo-device	ether		# Ethernet support
+pseudo-device	sl	1	# Kernel SLIP
+pseudo-device	ppp	1	# Kernel PPP
+pseudo-device	tun		# Packet tunnel, for ppp(1)
+pseudo-device	pty		# Pseudo-ttys (telnet etc)
 pseudo-device	gzip		# Exec gzipped a.out's
 
 # The `bpf' pseudo-device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 pseudo-device	bpf		#Berkeley packet filter
-
-# KTRACE enables the system-call tracing facility ktrace(2).
-# This adds 4 KB bloat to your kernel, and slightly increases
-# the costs of each syscall.
-options		KTRACE		#kernel tracing
-
-# This provides support for System V shared memory and message queues.
-#
-options         SYSVSHM
-options         SYSVMSG
-options         SYSVSEM
diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98
index e97a6d7..02c3d89 100644
--- a/sys/pc98/conf/GENERIC98
+++ b/sys/pc98/conf/GENERIC98
@@ -1,14 +1,18 @@
 #
 # GENERIC -- Generic machine with WD/AHx/NCR/BTx family disks
 #
-# For more information read the handbook part System Administration -> 
-# Configuring the FreeBSD Kernel -> The Configuration File. 
-# The handbook is available in /usr/share/doc/handbook or online as
-# latest version from the FreeBSD World Wide Web server 
-# <URL:http://www.FreeBSD.ORG/>
+# For more information on this file, please read the handbook section on
+# Kernel Configuration Files:
 #
-# An exhaustive list of options and more detailed explanations of the 
-# device lines is present in the ./LINT configuration file. If you are 
+#    http://www.freebsd.org/handbook/kernelconfig-config.html
+#
+# The handbook is also available locally in /usr/share/doc/handbook
+# if you've installed the doc distribution, otherwise always see the
+# FreeBSD World Wide Web server (http://www.FreeBSD.ORG/) for the
+# latest information.
+#
+# An exhaustive list of options and more detailed explanations of the
+# device lines is also present in the ./LINT configuration file. If you are
 # in doubt as to the purpose or necessity of a line, check first in LINT.
 #
 # $FreeBSD$
@@ -25,67 +29,76 @@ maxusers	32
 
 #makeoptions	DEBUG=-g		#Build kernel with gdb(1) debug symbols
 
-options		PC98			#PC98
-options		MATH_EMULATE		#Support for x87 emulation
-options		INET			#InterNETworking
-options		FFS			#Berkeley Fast Filesystem
-options		FFS_ROOT		#FFS usable as root device [keep this!]
-options		MFS			#Memory Filesystem
-options		MFS_ROOT		#MFS usable as root device, "MFS" req'ed
-options		NFS			#Network Filesystem
-options		NFS_ROOT		#NFS usable as root device, "NFS" req'ed
-options		MSDOSFS			#MSDOS Filesystem
-options		CD9660			#ISO 9660 Filesystem
-options		CD9660_ROOT		#CD-ROM usable as root. "CD9660" req'ed
-options		PROCFS			#Process filesystem
-options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
-options		SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
-options		EPSON_BOUNCEDMA		#use bounce buufer for 15-16M
-#options		EPSON_MEMWIN		#EPSON memory window support
-options		UCONSOLE		#Allow users to grab the console
-#options		LINE30
-options		USERCONFIG		#boot -c editor
-options		VISUAL_USERCONFIG	#visual boot -c editor
-
-options		COM_MULTIPORT
+options 	PC98			#PC98
+options 	MATH_EMULATE		#Support for x87 emulation
+options 	INET			#InterNETworking
+options 	FFS			#Berkeley Fast Filesystem
+options 	FFS_ROOT		#FFS usable as root device [keep this!]
+options 	MFS			#Memory Filesystem
+options 	MFS_ROOT		#MFS usable as root device, "MFS" req'ed
+options 	NFS			#Network Filesystem
+options 	NFS_ROOT		#NFS usable as root device, "NFS" req'ed
+options 	MSDOSFS			#MSDOS Filesystem
+options 	CD9660			#ISO 9660 Filesystem
+options 	CD9660_ROOT		#CD-ROM usable as root. "CD9660" req'ed
+options 	PROCFS			#Process filesystem
+options 	COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
+options 	SCSI_DELAY=15000	#Be pessimistic about Joe SCSI device
+options 	EPSON_BOUNCEDMA		#use bounce buufer for 15-16M
+#options 	EPSON_MEMWIN		#EPSON memory window support
+options 	UCONSOLE		#Allow users to grab the console
+#options 	LINE30
+options 	USERCONFIG		#boot -c editor
+options 	VISUAL_USERCONFIG	#visual boot -c editor
+options 	KTRACE			#ktrace(1) syscall trace support
+options         SYSVSHM			#SYSV-style shared memory
+options         SYSVMSG			#SYSV-style message queues
+options         SYSVSEM			#SYSV-style semaphores
+
+options 	COM_MULTIPORT
 
 #
 #	IBM-PC HDD support
-#options	COMPAT_ATDISK
+#options 	COMPAT_ATDISK
 
 # To make an SMP kernel, the next two are needed
-#options	SMP			# Symmetric MultiProcessor Kernel
-#options	APIC_IO			# Symmetric (APIC) I/O
+#options 	SMP			# Symmetric MultiProcessor Kernel
+#options 	APIC_IO			# Symmetric (APIC) I/O
 # Optionally these may need tweaked, (defaults shown):
-#options	NCPU=2			# number of CPUs
-#options	NBUS=4			# number of busses
-#options	NAPIC=1			# number of IO APICs
-#options	NINTR=24		# number of INTs
+#options 	NCPU=2			# number of CPUs
+#options 	NBUS=4			# number of busses
+#options 	NAPIC=1			# number of IO APICs
+#options 	NINTR=24		# number of INTs
 
-controller	isa0	at nexus?
+controller	isa0
 controller	pnp0			# PnP support for ISA
-controller	pci0	at nexus?
+controller	pci0
 
+# Floppy drives
 controller	fdc0	at isa? port IO_FD1 irq 11 drq 2
 disk		fd0	at fdc0 drive 0
 disk		fd1	at fdc0 drive 1
 disk		fd2	at fdc0 drive 2
 disk		fd3	at fdc0 drive 3
 
+# IDE controller and disks
 controller	wdc0	at isa? port IO_WD1 irq 9
 disk		wd0	at wdc0 drive 0
 #disk		wd1	at wdc0 drive 1
 #disk		wd2	at wdc0 drive 2
 #disk		wd3	at wdc0 drive 3
 
+# ATAPI devices on wdc?
 device		wcd0		#IDE CD-ROM
-#device		wfd0		#IDE Floppy (e.g. LS-120)
+#device 	wfd0		#IDE Floppy (e.g. LS-120)
+#device		wst0		#IDE Tape (e.g. Travan)
 
+# SCSI Controllers
 # A single entry for any of these controllers (ncr, ahb, ahc) is
 # sufficient for any number of installed devices.
-controller	ncr0
-controller	ahc0
-controller	isp0
+controller	ncr0		# NCR/Symbios Logic
+controller	ahc0		# AHA2940 and onboard AIC7xxx devices
+controller	isp0		# Qlogic family
 controller	adv0
 
 #
@@ -107,16 +120,15 @@ controller bs0 at isa? port IO_SCSI irq 5 drq 3 flags 0
 # Logitec LHA-20x
 #controller bs0 at isa? port IO_SCSI irq 5 drq 3 flags 0x50000
 
-controller	scbus0
-
-device		da0
-
-device		sa0
-
-device		pass0
-
-device		cd0	#Only need one of these, the code dynamically grows
+# SCSI peripherals
+# Only one of each of these is needed, they are dynamically allocated.
+controller	scbus0		# SCSI bus (required)
+device		da0		# Direct Access (disks)
+device		sa0		# Sequential Access (tape etc)
+device		cd0		# CD
+device		pass0		# Passthrough device (direct SCSI access)
 
+# Proprietary or custom CD-ROM Interfaces
 controller	matcd0	at isa? port?
 
 # keyboard driver
@@ -130,11 +142,10 @@ pseudo-device	splash
 
 device		sc0	at isa?
 
+# Floating point support - do not disable.
 device		npx0	at nexus? port IO_NPX irq 8
 
-#
-# Laptop support (see LINT for more options)
-#
+# Power management support (see LINT for more options)
 device		apm0    at nexus? disable flags 0x31 # Advanced Power Management
 
 # PCCARD (PCMCIA) support
@@ -142,8 +153,7 @@ device		apm0    at nexus? disable flags 0x31 # Advanced Power Management
 #device		pcic0	at card?
 #device		pcic1	at card?
 
-#
-# Serial Interface
+# Serial (COM) ports
 #
 # COM1
 device		sio0	at isa? port IO_COM1 irq 4
@@ -171,6 +181,7 @@ device		sio1	at isa? port 0x238 irq 5 flags 0x12000000
 #device		sio1	at isa? port 0x18b0 irq 5 flags 0x19000000
 
 device		mse0	at isa? port IO_MSE irq 13
+
 # NEW Parallel port
 device		ppc0	at isa? port? irq 14
 controller	ppbus0
@@ -185,9 +196,8 @@ device		olpt0	at isa? port IO_LPT
 # MII bus support, required for some 10/100 NICs
 controller	miibus0
 
-#
-# The following Ethernet NICs are all PCI devices.
-#
+# PCI Ethernet NICs.
+device		al0		# ADMtek AL981 (``Comet'')
 device		ax0		# ASIX AX88140A
 device		de0		# DEC/Intel DC21x4x (``Tulip'')
 device		fxp0		# Intel EtherExpress PRO/100B (82557, 82558)
@@ -195,6 +205,7 @@ device		mx0		# Macronix 98713/98715/98725 (``PMAC'')
 device		pn0		# Lite-On 82c168/82c169 (``PNIC'')
 device		rl0		# RealTek 8129/8139
 device		sf0		# Adaptec AIC-6915 (``Starfire'')
+device		ste0		# Sundance ST201 (D-Link DFE-550TX)
 device		tl0		# Texas Instruments ThunderLAN
 device		tx0		# SMC 9432TX (83c170 ``EPIC'')
 device		vr0		# VIA Rhine, Rhine II
@@ -246,25 +257,15 @@ options FE_8BIT_SUPPORT		# LAC-98 support
 #device pcm0    at isa? port 0xa460 irq 12
 #device	mss0	at isa? port 0xf40 irq 12 drq 1
 
-pseudo-device	loop
-pseudo-device	ether
-pseudo-device	sl	1
-pseudo-device	ppp	1
-pseudo-device	tun	
-pseudo-device	pty
+# Pseudo devices - the number indicates how many units to allocated.
+pseudo-device	loop		# Network loopback
+pseudo-device	ether		# Ethernet support
+pseudo-device	sl	1	# Kernel SLIP
+pseudo-device	ppp	1	# Kernel PPP
+pseudo-device	tun		# Packet tunnel, for ppp(1)
+pseudo-device	pty		# Pseudo-ttys (telnet etc)
 pseudo-device	gzip		# Exec gzipped a.out's
 
 # The `bpf' pseudo-device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!
 pseudo-device	bpf		#Berkeley packet filter
-
-# KTRACE enables the system-call tracing facility ktrace(2).
-# This adds 4 KB bloat to your kernel, and slightly increases
-# the costs of each syscall.
-options		KTRACE		#kernel tracing
-
-# This provides support for System V shared memory and message queues.
-#
-options         SYSVSHM
-options         SYSVMSG
-options         SYSVSEM