Subject: kern/22595: clean up of i386 architecture kernel configuration files
To: None <gnats-bugs@gnats.netbsd.org>
From: None <sobrado@acm.org>
List: netbsd-bugs
Date: 08/25/2003 13:15:25
>Number: 22595
>Category: kern
>Synopsis: clean up of i386 architecture kernel configuration files
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: kern-bug-people
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Mon Aug 25 11:17:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator: Igor Sobrado
>Release: -current
>Organization:
University of Oviedo
>Environment:
not applicable
<The following information is extracted from your kernel. Please>
<append output of "ldd", "ident" where relevant (multiple lines).>
System: -current
Architecture: i386
Machine: i386
>Description:
This PR provides fixes for files in arch/i386:
- Fixes some typos: WaveLan IEEE should be spelled WaveLAN/IEEE for
synchronization with both the NetBSD documentation and Lucent's
trademark, 3COM should be spelled 3Com; and, finally, 3Com NICs
are spelled 3cNNN(*)
- Fixes some space/tab issues: most entries in kernel configuration
files have an space after seven character words (e.g., options<space>)
to allow disabling entries using a `#' without breaking the
indentation style on the next columns, other entries in configuration
files replace tabs with spaces. There are some superfluous spaces
in words that do not require them too (e.g., file-system<space>).
(*) the right spelling for those NICs includes an uppercase C (e.g.,
3CNNN) but 3cNNN has been accepted as standard in the BSD world.
The diffs provided in this PR are for the next files:
$NetBSD: CARDBUS,v 1.70 2002/10/19 20:32:48 soren Exp $
$NetBSD: DELPHI,v 1.28 2003/05/15 13:13:23 wiz Exp $
$NetBSD: DISKLESS,v 1.94 2003/05/15 13:13:23 wiz Exp $
$NetBSD: DR-EVIL.4MB,v 1.1 2000/09/07 18:55:30 thorpej Exp $
$NetBSD: DR-EVIL,v 1.57 2003/05/15 13:13:23 wiz Exp $
$NetBSD: GENERIC.MP,v 1.4 2003/03/05 10:28:00 grant Exp $
$NetBSD: GENERIC.MPDEBUG,v 1.2 2002/10/01 12:56:40 fvdl Exp $
$NetBSD: GENERIC,v 1.568 2003/08/22 05:14:00 itojun Exp $
$NetBSD: GENERIC_DIAGNOSTIC,v 1.2 2001/04/21 20:58:13 fvdl Exp $
$NetBSD: GENERIC_ISDN,v 1.12 2003/04/11 14:55:40 drochner Exp $
$NetBSD: GENERIC_LAPTOP,v 1.75 2003/07/06 04:03:21 kochi Exp $
$NetBSD: GENERIC_PS2TINY,v 1.23 2003/04/10 22:06:58 christos Exp $
$NetBSD: GENERIC_TINY,v 1.57 2003/08/06 12:32:08 bouyer Exp $
$NetBSD: INSTALL.MP,v 1.2 2002/10/01 12:56:43 fvdl Exp $
$NetBSD: INSTALL,v 1.221 2003/08/07 12:06:16 soren Exp $
$NetBSD: INSTALL_LAPTOP,v 1.44 2003/06/05 14:33:51 dsl Exp $
$NetBSD: INSTALL_PS2,v 1.10 2003/06/05 14:33:51 dsl Exp $
$NetBSD: INSTALL_SMALL,v 1.98 2003/06/05 14:33:51 dsl Exp $
$NetBSD: INSTALL_TINY,v 1.71 2003/06/05 14:33:51 dsl Exp $
$NetBSD: IOPENER,v 1.37 2003/04/10 22:06:58 christos Exp $
$NetBSD: LAMB,v 1.33 2003/04/10 22:06:58 christos Exp $
$NetBSD: NET4501,v 1.20 2003/04/10 22:06:59 christos Exp $
$NetBSD: SWINGER.MP,v 1.3 2003/01/07 18:55:36 fvdl Exp $
$NetBSD: SWINGER,v 1.43 2003/05/15 13:13:25 wiz Exp $
$NetBSD: files.i386,v 1.242 2003/07/27 01:19:26 thorpej Exp $
...and GENERIC_VERIEXEC (this file does not include an $Id$ tag.)
>How-To-Repeat:
- For typos, both reading the documentation provided with NetBSD
and the description from the manufacturer.
- space/tab problems can be easily observed changing the space
character to another one. For example:
$ sed "s/ /~/g" <file> |more
<code/input/activities to reproduce the problem (multiple lines)>
>Fix:
--- CARDBUS Sun Aug 24 11:10:03 2003
+++ CARDBUS.proposed Sun Aug 24 22:54:31 2003
@@ -1,9 +1,10 @@
-# $NetBSD: CARDBUS,v 1.70 2002/10/19 20:32:48 soren Exp $
+# $NetBSD: CARDBUS,v 1.70 2002/10/19 20:32:48 soren Exp $
#
# CARDBUS: GENERIC + CardBus support
+#
+
+include "arch/i386/conf/GENERIC"
-include "arch/i386/conf/GENERIC"
-
# Following makes ARMADA M700's happy
#options RBUS_MIN_START=0x20000000
#options RBUS_IO_BASE=0x600
@@ -18,37 +19,37 @@
#options PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
options PCIBIOS_INTR_GUESS # see pcibios(4)
#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup
-
- # Cardbus bridges
+
+# Cardbus bridges
ppb* at cardbus? dev ? function ? # Cardbus-PCI bridges (www.magma.com)
-
- # CardBus bridge support
+
+# CardBus bridge support
cbb* at pci? dev ? function ?
cardslot* at cbb?
-
+
# CardBus bus support
cardbus* at cardslot?
-pcmcia* at cardslot?
-
+pcmcia* at cardslot?
+
# CardBus serial interfaces
com* at cardbus? dev ? function ? # Modems and serial cards
-
+
# CardBus SCSI cards
adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
ahc* at cardbus? dev ? function ? # Adaptec ADP-1480
-
+
# CardBus network cards
-ex* at cardbus? dev ? function ? # 3Com 3C575TX
+ex* at cardbus? dev ? function ? # 3Com 3c575TX
fxp* at cardbus? dev ? function ? # Intel i8255x
rtk* at cardbus? dev ? function ? # Realtek 8129/8139
tlp* at cardbus? dev ? function ? # DECchip 21143
-
+
# CardBus USB controllers
ehci* at cardbus? dev ? function ? # Enhanced Host Controller
ohci* at cardbus? dev ? function ? # Open Host Controller
# PCMCIA audio devices
esl* at pcmcia? function ? # ESS 1688 AudioDrive
-
+
# OPL[23] FM synthesizers
opl* at esl?
--- DELPHI Sun Aug 24 11:10:39 2003
+++ DELPHI.proposed Mon Aug 25 11:44:25 2003
@@ -7,7 +7,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "DELPHI-$Revision: 1.28 $"
+ident "DELPHI-$Revision: 1.28 $"
maxusers 64 # estimated number of users
@@ -63,7 +63,7 @@
options LKM # loadable kernel modules
#options USERCONF # userconf(4) support
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Diagnostic/debugging support options
options DIAGNOSTIC # expensive kernel consistency checks
@@ -72,7 +72,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-options DDB_HISTORY_SIZE=100 # enable history editing in DDB
+options DDB_HISTORY_SIZE=100 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
makeoptions DEBUG="-g" # compile full symbol table
@@ -98,22 +98,22 @@
#options COMPAT_AOUT # binary compat for NetBSD a.out binaries
# File systems
-file-system FFS # UFS
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-#file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system OVERLAY # overlay file system
-#file-system PORTAL # portal filesystem (still experimental)
-file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+#file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system OVERLAY # overlay file system
+#file-system PORTAL # portal filesystem (still experimental)
+file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
#file-system CODA # Coda File System; also needs vcoda (below)
# File system options
@@ -127,7 +127,7 @@
# Networking options
options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
options IPSEC # IP security
options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_DEBUG # debug for IP security
@@ -233,8 +233,8 @@
isa* at pcib?
# PCMCIA bus support
-#pcmcia* at pcic? controller ? socket ?
-#pcmcia* at tcic? controller ? socket ?
+#pcmcia* at pcic? controller ? socket ?
+#pcmcia* at tcic? controller ? socket ?
# ISA PCMCIA controllers
#pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
@@ -245,7 +245,7 @@
#pcic0 at pci? dev? function ?
# ISA Plug-and-Play bus support
-isapnp0 at isa?
+isapnp0 at isa?
# ISA Plug-and-Play PCMCIA controllers
#pcic* at isapnp?
@@ -276,7 +276,7 @@
#options NORWEGIAN_KBD
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
#vga0 at isa?
@@ -284,7 +284,7 @@
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga? console ?
wsdisplay* at pcdisplay? console ?
-wskbd* at pckbd? console ?
+wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
pcppi0 at isa?
@@ -303,7 +303,7 @@
# PCMCIA serial interfaces
#com* at pcmcia? function ? # Modems and serial cards
-#pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
+#pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
#com* at pcmcom? slave ? # ...and the slave devices
# ISA serial interfaces
@@ -465,7 +465,7 @@
# PCI network interfaces
#en* at pci? dev ? function ? # ENI/Adaptec ATM
#ep* at pci? dev ? function ? # 3Com 3c59x
-#ex* at pci? dev ? function ? # 3Com 90x[BC]
+#ex* at pci? dev ? function ? # 3Com 3c90x[BC]
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
#esh* at pci? dev ? function ? # Essential HIPPI card
#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
@@ -488,7 +488,7 @@
# ISA Plug-and-Play network interfaces
#ep* at isapnp? # 3Com 3c509 Ethernet
#ne* at isapnp? # NE2000-compatible Ethernet
-#tr* at isapnp? # IBM/3COM TROPIC Token-Ring
+#tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
#awi* at pcmcia? function ? # BayStack 650 (802.11FH)
@@ -498,7 +498,7 @@
#ne* at pcmcia? function ? # NE2000-compatible Ethernet
#ray* at pcmcia? function ? # Raytheon Raylink (802.11)
#sm* at pcmcia? function ? # Megahertz Ethernet
-#wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+#wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
#xe* at pcmcia? function ? # Xircom PCMCIA cards
#mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
@@ -509,44 +509,44 @@
#ate0 at isa? port 0x2a0 irq ? # AT1700
#cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
#ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-#eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
-#el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-#ep0 at isa? port ? irq ? # 3C509 ethernet cards
-#ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+#eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+#el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+#ep0 at isa? port ? irq ? # 3c509 Ethernet cards
+#ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
#ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
#fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
#ix0 at isa? port 0x300 irq 10 # EtherExpress/16
#iy0 at isa? port 0x360 irq ? # EtherExpress PRO 10 ISA
#lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
-#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
+#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
#le* at depca?
#nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
-#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial
+#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial
#le* at nele?
#bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
#le* at bicc?
-#ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
+#ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
#ne1 at isa? port 0x300 irq 10
#sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
#tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
#tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-#tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
+#tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
#we1 at isa? port 0x300 iomem 0xcc000 irq 10
# CardBus network cards
-#ex* at cardbus? dev ? function ? # 3Com 3C575TX
+#ex* at cardbus? dev ? function ? # 3Com 3c575TX
#fxp* at cardbus? dev ? function ? # Intel i8255x
#tlp* at cardbus? dev ? function ? # DECchip 21143
# MII/PHY support
#exphy* at mii? phy ? # 3Com internal PHYs
-#icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
+#icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
inphy* at mii? phy ? # Intel 82555 PHYs
#iophy* at mii? phy ? # Intel 82553 PHYs
-#lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+#lxtphy* at mii? phy ? # Level One LXT-970 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
-#nsphyter* at mii? phy ? # NS83843 PHYs
+#nsphyter* at mii? phy ? # NS83843 PHYs
#qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
#sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
#tlphy* at mii? phy ? # ThunderLAN PHYs
@@ -640,7 +640,7 @@
# ISA Plug-and-Play audio devices
#ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio
-#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
+#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
#sb* at isapnp? # SoundBlaster-compatible audio
#wss* at isapnp? # Windows Sound System
#ym* at isapnp? # Yamaha OPL3-SA3 audio
@@ -710,7 +710,7 @@
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
@@ -732,8 +732,8 @@
#pseudo-device tun 2 # network tunneling over tty
pseudo-device gre 2 # generic L3 over IP tunnel
#pseudo-device mobip 2 # Mobile IP (RFC 2004)
-pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933)
-pseudo-device faith 1 # IPv[46] tcp relay translation i/f
+pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC 1933)
+pseudo-device faith 1 # IPv[46] TCP relay translation i/f
pseudo-device vlan # 802.1Q Virtual LANs
# miscellaneous pseudo-devices
--- DISKLESS Sun Aug 24 11:11:35 2003
+++ DISKLESS.proposed Mon Aug 25 11:52:09 2003
@@ -1,8 +1,8 @@
# $NetBSD: DISKLESS,v 1.94 2003/05/15 13:13:23 wiz Exp $
#
-# DISKLESS -- Generic machine setup for diskless boot.
-# This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
-# and will use NFS for root and swap. (No local disk space needed.)
+# DISKLESS -- Generic machine setup for diskless boot.
+# This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
+# and will use NFS for root and swap. (No local disk space needed.)
#
include "arch/i386/conf/std.i386"
@@ -35,7 +35,7 @@
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -49,7 +49,7 @@
#options SHMMAXPGS=2048 # 2048 pages is the default
options USERCONF # userconf(4) support
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
options COMPAT_NOMID # NetBSD 0.8, 386BSD, and BSDI
options COMPAT_09 # NetBSD 0.9
@@ -70,19 +70,19 @@
options LKM # loadable kernel modules
#file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-#file-system CD9660 # ISO 9660 + Rock Ridge file system
-#file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-file-system PORTAL # portal filesystem (still experimental)
-file-system PROCFS # /proc
-file-system UMAPFS # NULLFS + uid and gid remapping
-file-system UNION # union file system
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+#file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+file-system PORTAL # portal filesystem (still experimental)
+file-system PROCFS # /proc
+file-system UMAPFS # NULLFS + uid and gid remapping
+file-system UNION # union file system
#options QUOTA # UFS quotas
#options NFSSERVER # Network File System server
@@ -123,7 +123,7 @@
isa0 at pcib? # ISA on PCI-ISA bridge
isa0 at mainbus0 # all other ISA
-#isapnp0 at isa? # ISA Plug-and-Play
+#isapnp0 at isa? # ISA Plug-and-Play
#apm0 at mainbus0 # Advanced power management
@@ -198,14 +198,14 @@
# uncomment it unless you are actually using it.
#wt0 at isa? port 0x308 irq 5 drq 1 # Archive and Wangtek QIC tape drives
-we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC and 3C503
-we1 at isa? port 0x250 iomem 0xd8000 irq 9 # ethernet cards
+we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC and 3c503
+we1 at isa? port 0x250 iomem 0xd8000 irq 9 # Ethernet cards
we2 at isa? port 0x300 iomem 0xcc000 irq 10
-#eg0 at isa? ... # 3C505 ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-ep0 at isa? port ? irq ? # 3C509 ethernet cards
+#eg0 at isa? ... # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep0 at isa? port ? irq ? # 3c509 Ethernet cards
#ep* at isapnp?
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
@@ -215,12 +215,12 @@
#bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
#le* at bicc?
lc0 at isa? port ? iomem ? irq ? # DEC EtherWORKS III (LEMAC)
-ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
+ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
-ep* at eisa? slot ? # 3C579 ethernet cards
+ep* at eisa? slot ? # 3c579 Ethernet cards
fea* at eisa? slot ? # DEC DEFEA FDDI cards
-le* at pci? dev ? function ? # PCnet-PCI based ethernet cards
-ep* at pci? dev ? function ? # 3C59x/3C90x ethernet cards
+le* at pci? dev ? function ? # PCnet-PCI based Ethernet cards
+ep* at pci? dev ? function ? # 3c59x/3c90x Ethernet cards
fpa* at pci? dev ? function ? # DEC DEFPA FDDI cards
fxp* at pci? dev ? function ? # Intel EEPRO 10/100B
ne* at pci? dev ? function ? # NE2000-compatible eth cards
@@ -231,11 +231,11 @@
#pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System
#sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver
-#sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster
+#sb0 at isa? port 0x220 irq 7 drq 1 # SoundBlaster
#sb* at isapnp?
-#wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System
-#pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum
-#gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis Ultra Sound
+#wss0 at isa? port 0x530 irq 10 drq 0 # Windows Sound System
+#pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum
+#gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis Ultra Sound
#spkr0 at pcppi?
#audio* at audiobus?
@@ -247,7 +247,7 @@
# Planetconnect Satellite receiver driver.
#satlink0 at isa? port 0x300 drq 1
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/GENERIC.local"
pseudo-device loop 1 # network loopback
pseudo-device bpfilter 4 # packet filter
--- DR-EVIL.4MB Sun Aug 24 11:12:53 2003
+++ DR-EVIL.4MB.proposed Sun Aug 24 22:55:22 2003
@@ -3,5 +3,5 @@
# A DR-EVIL kernel using large pages for the kernel image.
#
-include "arch/i386/conf/DR-EVIL"
+include "arch/i386/conf/DR-EVIL"
include "arch/i386/conf/largepages.inc"
--- DR-EVIL Sun Aug 24 11:12:16 2003
+++ DR-EVIL.proposed Mon Aug 25 11:58:41 2003
@@ -70,7 +70,7 @@
options LKM # loadable kernel modules
#options USERCONF # userconf(4) support
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Diagnostic/debugging support options
options DIAGNOSTIC # expensive kernel consistency checks
@@ -78,7 +78,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-options DDB_HISTORY_SIZE=100 # enable history editing in DDB
+options DDB_HISTORY_SIZE=100 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
makeoptions DEBUG="-g" # compile full symbol table
@@ -104,21 +104,21 @@
# Executable format options
# File systems
-file-system FFS # UFS
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-#file-system NTFS # Windows/NT file system
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-file-system PORTAL # portal filesystem (still experimental)
-file-system PROCFS # /proc
-file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+#file-system NTFS # Windows/NT file system
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+file-system PORTAL # portal filesystem (still experimental)
+file-system PROCFS # /proc
+file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
#file-system CODA # Coda File System; also needs vcoda (below)
# File system options
@@ -266,8 +266,8 @@
isa* at pcib?
# PCMCIA bus support
-#pcmcia* at pcic? controller ? socket ?
-#pcmcia* at tcic? controller ? socket ?
+#pcmcia* at pcic? controller ? socket ?
+#pcmcia* at tcic? controller ? socket ?
# ISA PCMCIA controllers
#pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
@@ -291,7 +291,7 @@
# CardBus bus support
cardbus* at cardslot?
-pcmcia* at cardslot?
+pcmcia* at cardslot?
# Coprocessor Support
@@ -311,7 +311,7 @@
#options NORWEGIAN_KBD
# wscons
-pckbc* at isa? # pc keyboard controller
+pckbc* at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
#vga0 at isa?
@@ -510,7 +510,7 @@
# PCI network interfaces
#en* at pci? dev ? function ? # ENI/Adaptec ATM
#ep* at pci? dev ? function ? # 3Com 3c59x
-#ex* at pci? dev ? function ? # 3Com 90x[BC]
+#ex* at pci? dev ? function ? # 3Com 3c90x[BC]
#epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
#esh* at pci? dev ? function ? # Essential HIPPI card
#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
@@ -534,7 +534,7 @@
# ISA Plug-and-Play network interfaces
#ep* at isapnp? # 3Com 3c509 Ethernet
#ne* at isapnp? # NE2000-compatible Ethernet
-#tr* at isapnp? # IBM/3COM TROPIC Token-Ring
+#tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
#awi* at pcmcia? function ? # BayStack 650/660 (802.11FH/DS)
@@ -544,7 +544,7 @@
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon RayLink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-#wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+#wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xi* at pcmcia? function ? # Xircom CreditCard Ethernet
mhzc* at pcmcia? function ? # Megaherz combo cards
@@ -555,10 +555,10 @@
#ate0 at isa? port 0x2a0 irq ? # AT1700
#cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
#ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-#eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
-#el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-#ep0 at isa? port ? irq ? # 3C509 ethernet cards
-#ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+#eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+#el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+#ep0 at isa? port ? irq ? # 3c509 Ethernet cards
+#ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
#ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
#fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
#ix0 at isa? port 0x300 irq 10 # EtherExpress/16
@@ -568,20 +568,20 @@
#le* at depca?
#nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
#le* at nele?
-#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial
+#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial
#bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
#le* at bicc?
-#ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
+#ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
#ne1 at isa? port 0x300 irq 10
#sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
#tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
#tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-#tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
+#tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
#we1 at isa? port 0x300 iomem 0xcc000 irq 10
# CardBus network cards
-ex* at cardbus? dev ? function ? # 3Com 3C575TX
+ex* at cardbus? dev ? function ? # 3Com 3c575TX
tlp* at cardbus? dev ? function ? # DECchip 21x4x and clones
fxp* at cardbus? dev ? function ? # Intel i8255x
rtk* at cardbus? dev ? function ? # Realtek 8129/8139
@@ -765,7 +765,7 @@
# Pull in optional local configuration
-#include "arch/i386/conf/GENERIC.local"
+#include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
--- GENERIC.MP Sun Aug 24 11:14:11 2003
+++ GENERIC.MP.proposed Sun Aug 24 22:56:00 2003
@@ -5,17 +5,17 @@
include "arch/i386/conf/GENERIC"
-options MULTIPROCESSOR
+options MULTIPROCESSOR
options COM_MPLOCK # com MP locking; REQUIRED on MP i386
options APM_NO_IDLE
-#options DIAGNOSTIC # STRONGLY RECOMMENDED
+#options DIAGNOSTIC # STRONGLY RECOMMENDED
#options LOCKDEBUG
#options MPDEBUG
#options MPVERBOSE
-#options DEBUG
+#options DEBUG
options MPBIOS # configure CPUs and APICs using MPBIOS
#options MPACPI # configure CPUs and APICs using ACPI
# (acpi at mainbus must also be enabled)
-ioapic* at mainbus? apid ?
+ioapic* at mainbus? apid ?
--- GENERIC.MPDEBUG Sun Aug 24 11:14:43 2003
+++ GENERIC.MPDEBUG.proposed Sun Aug 24 22:56:15 2003
@@ -2,15 +2,16 @@
#
# GENERIC.MPDEBUG -- Generic multiprocessor, plus enable all the DEBUG
# switches we can.
+#
include "arch/i386/conf/GENERIC.MP"
makeoptions DEBUG="-g"
-options DIAGNOSTIC # STRONGLY RECOMMENDED
+options DIAGNOSTIC # STRONGLY RECOMMENDED
options LOCKDEBUG
options MPDEBUG
options MPVERBOSE
-options DEBUG
+options DEBUG
#options KVM86
--- GENERIC Sun Aug 24 11:13:35 2003
+++ GENERIC.proposed Mon Aug 25 12:09:50 2003
@@ -1,28 +1,29 @@
-# $NetBSD: GENERIC,v 1.568 2003/08/22 05:14:00 itojun Exp $
+# $NetBSD: GENERIC,v 1.568 2003/08/22 05:14:00 itojun Exp $
#
-# GENERIC machine description file
-#
-# This machine description file is used to generate the default NetBSD
-# kernel. The generic kernel does not include all options, subsystems
-# and device drivers, but should be useful for most applications.
+# GENERIC machine description file
#
-# The machine description file can be customised for your specific
-# machine to reduce the kernel size and improve its performance.
+# This machine description file is used to generate the default NetBSD
+# kernel. The generic kernel does not include all options, subsystems
+# and device drivers, but should be useful for most applications.
#
-# For further information on compiling NetBSD kernels, see the config(8)
-# man page.
+# The machine description file can be customised for your specific
+# machine to reduce the kernel size and improve its performance.
+#
+# For further information on compiling NetBSD kernels, see the config(8)
+# man page.
+#
+# For further information on hardware support for this architecture, see
+# the intro(4) man page. For further information about kernel options
+# for this architecture, see the options(4) man page. For an explanation
+# of each device driver in this file see the section 4 man page for the
+# device.
#
-# For further information on hardware support for this architecture, see
-# the intro(4) man page. For further information about kernel options
-# for this architecture, see the options(4) man page. For an explanation
-# of each device driver in this file see the section 4 man page for the
-# device.
-include "arch/i386/conf/std.i386"
+include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.568 $"
+#ident "GENERIC-$Revision: 1.568 $"
maxusers 32 # estimated number of users
@@ -79,7 +80,7 @@
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
#options SHMMAXPGS=2048 # 2048 pages is the default
-options P1003_1B_SEMAPHORE # p1003.1b semaphore support
+options P1003_1B_SEMAPHORE # p1003.1b semaphore support
options LKM # loadable kernel modules
@@ -103,7 +104,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -132,22 +133,22 @@
#options COMPAT_PECOFF # kernel support to run Win32 apps
# File systems
-file-system FFS # UFS
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-file-system OVERLAY # overlay file system
-file-system PORTAL # portal filesystem (still experimental)
-file-system PROCFS # /proc
-file-system UMAPFS # NULLFS + uid and gid remapping
-file-system UNION # union file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+file-system OVERLAY # overlay file system
+file-system PORTAL # portal filesystem (still experimental)
+file-system PROCFS # /proc
+file-system UMAPFS # NULLFS + uid and gid remapping
+file-system UNION # union file system
file-system CODA # Coda File System; also needs vcoda (below)
file-system SMBFS # experimental - CIFS; also needs nsmb (below)
@@ -162,7 +163,7 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_DEBUG # debug for IP security
@@ -178,7 +179,7 @@
options PPP_FILTER # Active filter support for PPP (requires bpf)
options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
-#options IPFILTER_DEFAULT_BLOCK # block all packets by default
+#options IPFILTER_DEFAULT_BLOCK # block all packets by default
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
# These options enable verbose messages for several subsystems.
@@ -240,11 +241,11 @@
mainbus0 at root
-cpu* at mainbus?
+cpu* at mainbus?
#ioapic* at mainbus?
# Doesn't do anything yet.
-#p64h2apic* at pci? dev? function? # P64H2 IOxAPIC
+#p64h2apic* at pci? dev? function? # P64H2 IOxAPIC
#apm0 at mainbus0 # Advanced power management
@@ -274,27 +275,27 @@
#options ACPI_ACTIVATE_DEV # If set, activate inactive devices
# ACPI devices
-#acpiacad* at acpi? # ACPI AC Adapter
-#acpibat* at acpi? # ACPI Battery
-#acpibut* at acpi? # ACPI Button
+#acpiacad* at acpi? # ACPI AC Adapter
+#acpibat* at acpi? # ACPI Battery
+#acpibut* at acpi? # ACPI Button
#acpiec* at acpi? # ACPI Embedded Controller
-#acpilid* at acpi? # ACPI Lid Switch
+#acpilid* at acpi? # ACPI Lid Switch
#acpitz* at acpi? # ACPI Thermal Zone
# Mainboard devices
-#com* at acpi? # Serial communications interface
-#fdc* at acpi? # Floppy disk controller
-#lpt* at acpi? # Parallel port
-#npx* at acpi? # Math coprocessor
-#pckbc* at acpi? # PC keyboard controller
-#wss* at acpi? # NeoMagic 256AV in wss mode
+#com* at acpi? # Serial communications interface
+#fdc* at acpi? # Floppy disk controller
+#lpt* at acpi? # Parallel port
+#npx at acpi? # Math coprocessor
+#pckbc* at acpi? # PC keyboard controller
+#wss* at acpi? # NeoMagic 256AV in wss mode
# Sony Vaio jog dial
-#spic* at acpi? # Sony Programmable I/O Controller
-#wsmouse* at spic?
+#spic* at acpi? # Sony Programmable I/O Controller
+#wsmouse* at spic?
# Toshiba Libretto devices
-#vald* at acpi?
+#vald* at acpi?
# Plug-and-Play BIOS and attached devices
@@ -322,7 +323,7 @@
#fdc* at pnpbios? index ? # floppy controller
# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
-#pciide* at pnpbios? index ?
+#pciide* at pnpbios? index ?
# PCI bus support
pci* at mainbus? bus ?
@@ -364,8 +365,8 @@
isa0 at pcib?
# PCMCIA bus support
-pcmcia* at pcic? controller ? socket ?
-pcmcia* at tcic? controller ? socket ?
+pcmcia* at pcic? controller ? socket ?
+pcmcia* at tcic? controller ? socket ?
# MCA bus support
mca0 at mainbus?
@@ -380,7 +381,7 @@
pcic0 at pci? dev? function ?
# ISA Plug-and-Play bus support
-isapnp0 at isa?
+isapnp0 at isa?
# ISA Plug-and-Play PCMCIA controllers
pcic* at isapnp?
@@ -414,7 +415,7 @@
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
@@ -424,7 +425,7 @@
#machfb* at pci? dev ? function ? # ATI Mach64 framebuffer driver
wsdisplay* at vga? console ?
wsdisplay* at pcdisplay? console ?
-#wsdisplay* at machfb? console ?
+#wsdisplay* at machfb? console ?
wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
@@ -669,12 +670,12 @@
# PCI network interfaces
an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11)
-bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
+bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet
en* at pci? dev ? function ? # ENI/Adaptec ATM
ep* at pci? dev ? function ? # 3Com 3c59x
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
esh* at pci? dev ? function ? # Essential HIPPI card
-ex* at pci? dev ? function ? # 3Com 90x[BC]
+ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet
@@ -708,7 +709,7 @@
fmv* at isapnp? # Fujitsu FMV-183
le* at isapnp? # AMD PCnet-ISA Ethernet
ne* at isapnp? # NE2000-compatible Ethernet
-tr* at isapnp? # IBM/3COM TROPIC Token-Ring
+tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
@@ -721,7 +722,7 @@
sm* at pcmcia? function ? # Megahertz Ethernet
# tr at pcmcia has problems with Cardbus bridges
#tr* at pcmcia? function ? # TROPIC based Token-Ring
-wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xi* at pcmcia? function ? # Xircom CreditCard Ethernet
mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
@@ -732,33 +733,33 @@
ate0 at isa? port 0x2a0 irq ? # AT1700
cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-ep* at isa? port ? irq ? # 3C509 ethernet cards
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep* at isa? port ? irq ? # 3c509 Ethernet cards
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-181/182
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
iy0 at isa? port 0x360 irq ? # EtherExpress PRO 10 ISA
lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
-#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
+#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
#le* at depca?
nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
le* at nele?
-#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial
+#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial
bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
le* at bicc?
-ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
+ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
+tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
# CardBus network cards
-#ex* at cardbus? dev ? function ? # 3Com 3C575TX
+#ex* at cardbus? dev ? function ? # 3Com 3c575TX
#fxp* at cardbus? dev ? function ? # Intel i8255x
#rtk* at cardbus? dev ? function ? # Realtek 8129/8139
#tlp* at cardbus? dev ? function ? # DECchip 21143
@@ -774,22 +775,22 @@
# MII/PHY support
acphy* at mii? phy ? # Altima AC101 and AMD Am79c874 PHYs
-amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
-bmtphy* at mii? phy ? # Broadcom BCM5201 and BCM5202 PHYs
-brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
+amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs
+bmtphy* at mii? phy ? # Broadcom BCM5201 and BCM5202 PHYs
+brgphy* at mii? phy ? # Broadcom BCM5400-family PHYs
dmphy* at mii? phy ? # Davicom DM9101 PHYs
exphy* at mii? phy ? # 3Com internal PHYs
gentbi* at mii? phy ? # Generic Ten-Bit 1000BASE-[CLS]X PHYs
glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
gphyter* at mii? phy ? # NS83861 Gig-E PHY
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
-lxtphy* at mii? phy ? # Level One LXT-970 PHYs
-makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
+lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
-nsphyter* at mii? phy ? # NS83843 PHYs
-pnaphy* at mii? phy ? # generic HomePNA PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
+pnaphy* at mii? phy ? # generic HomePNA PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
@@ -824,7 +825,7 @@
uhub* at uhub? port ? configuration ? interface ?
# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
+uhidev* at uhub? port ? configuration ? interface ?
# USB Mice
ums* at uhidev? reportid ?
@@ -841,26 +842,26 @@
ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
-umodem* at uhub? port ? configuration ?
+umodem* at uhub? port ? configuration ?
ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
-#wd* at umass?
+#wd* at umass?
# USB audio
-uaudio* at uhub? port ? configuration ?
+uaudio* at uhub? port ? configuration ?
# USB MIDI
-umidi* at uhub? port ? configuration ?
+umidi* at uhub? port ? configuration ?
# USB IrDA
# USB-IrDA bridge spec
-uirda* at uhub? port ? configuration ? interface ?
+uirda* at uhub? port ? configuration ? interface ?
irframe* at uirda?
# SigmaTel STIr4200 USB/IrDA Bridge
-ustir* at uhub? port ?
+ustir* at uhub? port ?
irframe* at ustir?
# USB Ethernet adapters
@@ -884,17 +885,17 @@
umct* at uhub? port ? # MCT USB-RS232 serial adapter
ucom* at umct? portno ?
-uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
+uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
ucom* at uplcom? portno ?
-uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
+uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
ucom* at uvscom? portno ?
# Diamond Multimedia Rio 500
urio* at uhub? port ?
# USB Handspring Visor
-uvisor* at uhub? port ?
+uvisor* at uhub? port ?
ucom* at uvisor?
# USB scanners
@@ -904,7 +905,7 @@
usscanner* at uhub? port ?
# Y@P firmware loader
-uyap* at uhub? port ?
+uyap* at uhub? port ?
# D-Link DSB-R100 USB radio
udsbr* at uhub? port ?
@@ -917,7 +918,7 @@
# IrDA and Consumer Ir devices
# Toshiba Oboe
-oboe* at pci? dev ? function ?
+oboe* at pci? dev ? function ?
irframe* at oboe?
# PCI IEEE1394 controllers
@@ -943,7 +944,7 @@
clct* at pci? dev ? function ? # Cirrus Logic CS4281
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
eap* at pci? dev ? function ? # Ensoniq AudioPCI
-emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512
+emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512
esa* at pci? dev ? function ? # ESS Allegro-1 / Maestro-3 PCI Audio
esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
@@ -954,7 +955,7 @@
# ISA Plug-and-Play audio devices
ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio
-guspnp* at isapnp? # Gravis Ultra Sound PnP audio
+guspnp* at isapnp? # Gravis Ultra Sound PnP audio
sb* at isapnp? # SoundBlaster-compatible audio
wss* at isapnp? # Windows Sound System
ym* at isapnp? # Yamaha OPL3-SA3 audio
@@ -1010,15 +1011,15 @@
# FM-Radio devices
# ISA radio devices
-#az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card
+#az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card
#az1 at isa? port 0x358
-#rt0 at isa? port 0x20c # AIMS Lab Radiotrack & compatible
+#rt0 at isa? port 0x20c # AIMS Lab Radiotrack & compatible
#rt1 at isa? port 0x284
#rt2 at isa? port 0x30c
#rt3 at isa? port 0x384
-#rtii0 at isa? port 0x20c # AIMS Lab Radiotrack II FM Radio Card
+#rtii0 at isa? port 0x20c # AIMS Lab Radiotrack II FM Radio Card
#rtii1 at isa? port 0x30c
-#sf2r0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR2 FM Radio Card
+#sf2r0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR2 FM Radio Card
# PCI radio devices
#gtp* at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
@@ -1034,8 +1035,8 @@
# TV cards
# Brooktree 848/849/878/879 based TV cards
-bktr* at pci? dev ? function ?
-radio* at bktr?
+bktr* at pci? dev ? function ?
+radio* at bktr?
# Mice
@@ -1074,7 +1075,7 @@
weasel* at pci?
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
@@ -1107,8 +1108,8 @@
pseudo-device irframetty # IrDA frame line discipline
pseudo-device tun 2 # network tunneling over tty
pseudo-device gre 2 # generic L3 over IP tunnel
-pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device faith 1 # IPv[46] tcp relay translation i/f
+pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC 1933)
+#pseudo-device faith 1 # IPv[46] TCP relay translation i/f
#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
--- GENERIC_DIAGNOSTIC Sun Aug 24 11:15:42 2003
+++ GENERIC_DIAGNOSTIC.proposed Mon Aug 25 11:05:26 2003
@@ -1,8 +1,8 @@
-# $NetBSD: GENERIC_DIAGNOSTIC,v 1.2 2001/04/21 20:58:13 fvdl Exp $
+# $NetBSD: GENERIC_DIAGNOSTIC,v 1.2 2001/04/21 20:58:13 fvdl Exp $
#
-# GENERIC with DIAGNOSTIC enabled.
-# DIAGNOSTIC was moved out of the default GENERIC file because
-# it is pretty expensive (up to some 15% speed loss).
+# GENERIC with DIAGNOSTIC enabled.
+# DIAGNOSTIC was moved out of the default GENERIC file because
+# it is pretty expensive (up to some 15% speed loss).
#
include "arch/i386/conf/GENERIC"
--- GENERIC_ISDN Sun Aug 24 11:16:14 2003
+++ GENERIC_ISDN.proposed Sun Aug 24 22:56:49 2003
@@ -1,8 +1,9 @@
-# $NetBSD: GENERIC_ISDN,v 1.12 2003/04/11 14:55:40 drochner Exp $
+# $NetBSD: GENERIC_ISDN,v 1.12 2003/04/11 14:55:40 drochner Exp $
+#
+# GENERIC kernel with all supported ISDN devices and drivers
#
-# GENERIC kernel with all supported ISDN devices and drivers
-include "arch/i386/conf/GENERIC"
+include "arch/i386/conf/GENERIC"
#---------------------------------------------------------------------
# Various ISDN board drivers:
@@ -11,26 +12,26 @@
#
# Teles S0/8 or Niccy 1008
options ISICISA_TEL_S0_8
-# isic0 at isa? iomem 0xd0000 irq 2
+#isic0 at isa? iomem 0xd0000 irq 2
# Teles S0/16 or Creatix ISDN-S0 or Niccy 1016
options ISICISA_TEL_S0_16
-# isic0 at isa? port 0xd80 iomem 0xd0000 irq 9
+#isic0 at isa? port 0xd80 iomem 0xd0000 irq 9
# Teles S0/16.3
options ISICISA_TEL_S0_16_3
-# isic0 at isa? port 0xd80 irq 12
+#isic0 at isa? port 0xd80 irq 12
# AVM A1 or AVM Fritz!Card
options ISICISA_AVM_A1
-isic0 at isa? port 0x340 irq 10
+isic0 at isa? port 0x340 irq 10
# USRobotics Sportster ISDN TA intern
options ISICISA_USR_STI
-# isic0 at isa? port 0x268 irq 10
+#isic0 at isa? port 0x268 irq 10
# ITK ix1 micro
options ISICISA_ITKIX1
-# isic0 at isa? port 0x398 irq 10
+#isic0 at isa? port 0x398 irq 10
#
# XXX not ready yet:
# Active EICON/Diehl Cards: S, SX, SXn, SCOM or QUADRO
-# daic0 at isa? iomem 0xd8000 irq 10
+#daic0 at isa? iomem 0xd8000 irq 10
#
#---------------------------------------------------------------------
# Supported ISA Plug & Play cards:
@@ -43,22 +44,22 @@
options ISICPNP_SEDLBAUER # Sedlbauer WinSpeed
options ISICPNP_DYNALINK # Dynalink IS64PH
options ISICPNP_SIEMENS_ISURF2 # Siemens I-Surf
-options ISICPNP_ITKIX # ITK IX PnP cards
-isic* at isapnp?
+options ISICPNP_ITKIX # ITK IX PnP cards
+isic* at isapnp?
#
#---------------------------------------------------------------------
# Supported PCI cards:
#
-isic* at pci?
+isic* at pci?
# Winbond W6692
-iwic* at pci?
+iwic* at pci?
# AVM Fritz!PCI card
-ifpci* at pci?
+ifpci* at pci?
# AVM Fritz!PCI V2 card
-ifritz* at pci?
+ifritz* at pci?
#
#---------------------------------------------------------------------
@@ -68,7 +69,7 @@
options ISICPCMCIA_ELSA_ISDNMC # ELSA MicroLink ISDN/MC
options ISICPCMCIA_ELSA_MCALL # ELSA MicroLink MC/all
options ISICPCMCIA_SBSPEEDSTAR2 # Sedlbauer speed star II
-isic* at pcmcia? function ?
+isic* at pcmcia? function ?
#
#---------------------------------------------------------------------
--- GENERIC_LAPTOP Sun Aug 24 11:16:57 2003
+++ GENERIC_LAPTOP.proposed Mon Aug 25 12:21:30 2003
@@ -8,7 +8,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.75 $"
+#ident "GENERIC-$Revision: 1.75 $"
maxusers 32 # estimated number of users
@@ -68,7 +68,7 @@
options LKM # loadable kernel modules
options USERCONF # userconf(4) support
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
@@ -76,7 +76,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -104,22 +104,22 @@
#options COMPAT_PECOFF # kernel support to run Win32 apps
# File systems
-file-system FFS # UFS
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-file-system NULLFS # loopback file system
-file-system OVERLAY # overlay file system
-file-system PORTAL # portal filesystem (still experimental)
-file-system PROCFS # /proc
-file-system UMAPFS # NULLFS + uid and gid remapping
-file-system UNION # union file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+file-system NULLFS # loopback file system
+file-system OVERLAY # overlay file system
+file-system PORTAL # portal filesystem (still experimental)
+file-system PROCFS # /proc
+file-system UMAPFS # NULLFS + uid and gid remapping
+file-system UNION # union file system
file-system CODA # Coda File System; also needs vcoda (below)
# File system options
@@ -133,7 +133,7 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_DEBUG # debug for IP security
@@ -149,7 +149,7 @@
options PPP_FILTER # Active filter support for PPP (requires bpf)
options PFIL_HOOKS # pfil(9) packet filter hooks
options IPFILTER_LOG # ipmon(8) log support
-#options IPFILTER_DEFAULT_BLOCK # block all packets by default
+#options IPFILTER_DEFAULT_BLOCK # block all packets by default
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
# These options enable verbose messages for several subsystems.
@@ -199,7 +199,7 @@
mainbus0 at root
-cpu0 at mainbus0
+cpu0 at mainbus0
#ioapic* at mainbus?
apm0 at mainbus0 # Advanced power management
@@ -233,7 +233,7 @@
#fdc* at acpi? # Floppy disk controller
#lpt* at acpi? # Parallel port
#npx* at acpi? # Math coprocessor
-#pckbc* at acpi? # PC keyboard controller
+#pckbc* at acpi? # PC keyboard controller
#wss* at acpi? # NeoMagic 256AV in wss mode
# Sony Vaio jog dial
@@ -297,8 +297,8 @@
isa0 at pcib?
# PCMCIA bus support
-pcmcia* at pcic? controller ? socket ?
-pcmcia* at tcic? controller ? socket ?
+pcmcia* at pcic? controller ? socket ?
+pcmcia* at tcic? controller ? socket ?
# ISA PCMCIA controllers
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
@@ -344,7 +344,7 @@
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
vga0 at isa?
@@ -496,10 +496,10 @@
# Network Interfaces
# PCI network interfaces
-ex* at pci? dev ? function ? # 3Com 90x[BC]
+ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
-ne* at pci? dev ? function ? # NE2000-compatible Ethernet
-rtk* at pci? dev ? function ? # Realtek 8129/8139
+ne* at pci? dev ? function ? # NE2000-compatible Ethernet
+rtk* at pci? dev ? function ? # Realtek 8129/8139
tlp* at pci? dev ? function ? # DECchip 21x4x and clones
# PCMCIA network interfaces
@@ -511,7 +511,7 @@
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xi* at pcmcia? function ? # Xircom CreditCard Ethernet
mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
@@ -519,7 +519,7 @@
sm* at mhzc?
# CardBus network cards
-ex* at cardbus? dev ? function ? # 3Com 3C575TX
+ex* at cardbus? dev ? function ? # 3Com 3c575TX
fxp* at cardbus? dev ? function ? # Intel i8255x
rtk* at cardbus? dev ? function ? # Realtek 8129/8139
tlp* at cardbus? dev ? function ? # DECchip 21143
@@ -532,7 +532,7 @@
iophy* at mii? phy ? # Intel 82553 PHYs
lxtphy* at mii? phy ? # Level One LXT-970 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
-nsphyter* at mii? phy ? # NS83843 PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
@@ -575,25 +575,25 @@
ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
-umodem* at uhub? port ? configuration ?
+umodem* at uhub? port ? configuration ?
ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
# USB audio
-uaudio* at uhub? port ? configuration ?
+uaudio* at uhub? port ? configuration ?
# USB MIDI
-umidi* at uhub? port ? configuration ?
+umidi* at uhub? port ? configuration ?
# USB IrDA
# USB-IrDA bridge spec
-uirda* at uhub? port ? configuration ? interface ?
+uirda* at uhub? port ? configuration ? interface ?
irframe* at uirda?
# SigmaTel STIr4200 USB/IrDA Bridge
-ustir* at uhub? port ?
+ustir* at uhub? port ?
irframe* at ustir?
# USB Ethernet adapters
@@ -611,7 +611,7 @@
uftdi* at uhub? port ?
ucom* at uftdi? portno ?
-uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
+uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
ucom* at uplcom? portno ?
umct* at uhub? port ? # MCT USB-RS232 serial adapter
@@ -621,11 +621,11 @@
urio* at uhub? port ?
# USB Handspring Visor
-uvisor* at uhub? port ?
+uvisor* at uhub? port ?
ucom* at uvisor?
# Y@P firmware loader
-uyap* at uhub? port ?
+uyap* at uhub? port ?
# USB Generic driver
ugen* at uhub? port ?
@@ -648,7 +648,7 @@
clct* at pci? dev ? function ? # Cirrus Logic CS4281
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
eap* at pci? dev ? function ? # Ensoniq AudioPCI
-emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512
+emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512
esa* at pci? dev ? function ? # ESS Allegro-1 / Maestro-3 PCI Audio
esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
@@ -659,7 +659,7 @@
# ISA Plug-and-Play audio devices
ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio
-guspnp* at isapnp? # Gravis Ultra Sound PnP audio
+guspnp* at isapnp? # Gravis Ultra Sound PnP audio
sb* at isapnp? # SoundBlaster-compatible audio
wss* at isapnp? # Windows Sound System
ym* at isapnp? # Yamaha OPL3-SA3 audio
@@ -742,7 +742,7 @@
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
@@ -775,8 +775,8 @@
pseudo-device irframetty # IrDA frame line discipline
pseudo-device tun 2 # network tunneling over tty
pseudo-device gre 2 # generic L3 over IP tunnel
-pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device faith 1 # IPv[46] tcp relay translation i/f
+pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC 1933)
+#pseudo-device faith 1 # IPv[46] TCP relay translation i/f
#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
--- GENERIC_PS2TINY Sun Aug 24 11:17:19 2003
+++ GENERIC_PS2TINY.proposed Mon Aug 25 12:25:21 2003
@@ -8,6 +8,7 @@
# BEWARE:
# MCA support in NetBSD is still experimental at this
# stage and should be used with caution.
+#
include "arch/i386/conf/std.i386"
@@ -67,7 +68,7 @@
options LKM # loadable kernel modules
options USERCONF # userconf(4) support
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
@@ -75,29 +76,29 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
makeoptions COPTS="-Os" # generates smaller code than -O2, -O1
# File systems
-file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-#file-system MFS # memory file system
-file-system NFS # Network File System client
-#file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system OVERLAY # overlay file system
-#file-system PORTAL # portal filesystem (still experimental)
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system FFS # UFS
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+#file-system MFS # memory file system
+file-system NFS # Network File System client
+#file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system OVERLAY # overlay file system
+#file-system PORTAL # portal filesystem (still experimental)
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
#file-system CODA # Coda File System; also needs vcoda (below)
# File system options
@@ -110,7 +111,7 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_DEBUG # debug for IP security
@@ -126,7 +127,7 @@
#options PPP_FILTER # Active filter support for PPP (requires bpf)
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options IPFILTER_LOG # ipmon(8) log support
-#options IPFILTER_DEFAULT_BLOCK # block all packets by default
+#options IPFILTER_DEFAULT_BLOCK # block all packets by default
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
# These options enable verbose messages for several subsystems.
@@ -149,9 +150,9 @@
options WS_KERNEL_FG=WSCOL_GREEN
# Kernel root file system and dump configuration.
-config netbsd root on ? type ?
-#config netbsd root on ? type nfs
-#config netbsd root on ed0a type ffs
+config netbsd root on ? type ?
+#config netbsd root on ? type nfs
+#config netbsd root on ed0a type ffs
#
# Device Configuration
@@ -167,7 +168,7 @@
#pc0 at isa? port 0x60 irq 1
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
options PCKBCDEBUG
#pcconskbd* at pckbc?
#pms* at pckbc? # PS/2 mouse for wsmouse
--- GENERIC_TINY Sun Aug 24 11:17:49 2003
+++ GENERIC_TINY.proposed Mon Aug 25 12:28:10 2003
@@ -62,7 +62,7 @@
#options LKM # loadable kernel modules
#options USERCONF # userconf(4) support
-options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
@@ -70,7 +70,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
#options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-#options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+#options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -94,20 +94,20 @@
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
# File systems
-file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-#file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system PORTAL # portal filesystem (still experimental)
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system FFS # UFS
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+#file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system PORTAL # portal filesystem (still experimental)
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
# File system options
#options QUOTA # UFS quotas
@@ -132,7 +132,7 @@
#options PPP_FILTER # Active filter support for PPP (requires bpf)
#options PFIL_HOOKS # pfil(9) packet filter hooks
#options IPFILTER_LOG # ipmon(8) log support
-#options IPFILTER_DEFAULT_BLOCK # block all packets by default
+#options IPFILTER_DEFAULT_BLOCK # block all packets by default
#options TCP_DEBUG # Record last TCP_NDEBUG packets with SO_DEBUG
# These options enable verbose messages for several subsystems.
@@ -176,9 +176,9 @@
# Device configuration
#
-mainbus0 at root
+mainbus0 at root
-cpu0 at mainbus0
+cpu0 at mainbus0
#apm0 at mainbus0 # Advanced power management
@@ -208,14 +208,14 @@
#isa0 at pcib?
# PCMCIA bus support
-pcmcia* at pcic? controller ? socket ?
+pcmcia* at pcic? controller ? socket ?
# ISA PCMCIA controllers
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
# ISA Plug-and-Play bus support
-#isapnp0 at isa?
+#isapnp0 at isa?
# ISA Plug-and-Play PCMCIA controllers
#pcic* at isapnp?
@@ -231,15 +231,15 @@
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
# wscons
-pckbc0 at isa? # pc keyboard controller
-pckbd* at pckbc? # PC keyboard
+pckbc0 at isa? # PC keyboard controller
+pckbd* at pckbc? # PC keyboard
#pms* at pckbc? # PS/2 mouse for wsmouse
vga0 at isa?
#vga* at pci? dev ? function ?
-pcdisplay0 at isa? # CGA, MDA, EGA, HGA
+pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga? console ?
-wsdisplay* at pcdisplay? console ?
-wskbd* at pckbd? console ?
+wsdisplay* at pcdisplay? console ?
+wskbd* at pckbd? console ?
#wsmouse* at pms? mux 0
@@ -406,22 +406,22 @@
# ISA network interfaces
ate0 at isa? port 0x2a0 irq ? # AT1700
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-ep0 at isa? port ? irq ? # 3C509 ethernet cards
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep0 at isa? port ? irq ? # 3c509 Ethernet cards
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
iy0 at isa? port 0x360 irq ? # EtherExpress PRO 10 ISA
lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
-#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
+#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
#le* at depca?
nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
le* at nele?
bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
le* at bicc?
-ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
+ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
@@ -473,7 +473,7 @@
#url* at uhub? port ? # Realtek RTL8150L based adapters
# Y@P firmware loader
-#uyap* at uhub? port ?
+#uyap* at uhub? port ?
# USB Generic driver
#ugen* at uhub? port ?
@@ -484,7 +484,7 @@
#eap* at pci? dev ? function ? # Ensoniq AudioPCI
# ISA Plug-and-Play audio devices
-#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
+#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
#sb* at isapnp? # SoundBlaster-compatible audio
#ym* at isapnp? # Yamaha OPL3-SA3 audio
@@ -520,7 +520,7 @@
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
--- INSTALL.MP Sun Aug 24 11:19:29 2003
+++ INSTALL.MP.proposed Mon Aug 25 11:08:01 2003
@@ -6,12 +6,12 @@
include "arch/i386/conf/INSTALL"
-options MULTIPROCESSOR
+options MULTIPROCESSOR
options COM_MPLOCK # com MP locking; REQUIRED on MP i386
options LOCKDEBUG
options MPDEBUG
options MPVERBOSE
-options DEBUG
+options DEBUG
-ioapic* at mainbus? apid ?
+ioapic* at mainbus? apid ?
--- INSTALL Sun Aug 24 11:18:57 2003
+++ INSTALL.proposed Mon Aug 25 12:38:56 2003
@@ -19,7 +19,7 @@
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=5000 # size of memory disk, in blocks
+options MEMORY_DISK_ROOT_SIZE=5000 # size of memory disk, in blocks
maxusers 32 # estimated number of users
@@ -52,7 +52,7 @@
#options REALEXTMEM=... # size of extended memory
# Avoid irq 5 and 7, the most likely cause of problems on modern laptops.
-options PCIC_ISA_INTR_ALLOC_MASK=0xff5f
+options PCIC_ISA_INTR_ALLOC_MASK=0xff5f
# Standard system options
@@ -71,8 +71,8 @@
#options LKM # loadable kernel modules
options USERCONF # userconf(4) support
-options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-options MALLOC_NOINLINE # Not inlining MALLOC saves memory
+options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+options MALLOC_NOINLINE # Not inlining MALLOC saves memory
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
@@ -80,7 +80,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -104,27 +104,27 @@
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
# File systems
-file-system FFS # UFS
-file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system NTFS # Windows/NT Filesystem
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system PORTAL # portal filesystem (still experimental)
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT Filesystem
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system PORTAL # portal filesystem (still experimental)
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
# Filesystem options
#options QUOTA # UFS quotas
#options NFSSERVER # Network File System server
#options NFS_V2_ONLY # Exclude NFS3 and NQNFS code to save space
-options VNODE_OP_NOINLINE # Not inlining vnode op calls saves mem
+options VNODE_OP_NOINLINE # Not inlining vnode op calls saves mem
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
@@ -165,10 +165,10 @@
options WS_KERNEL_FG=WSCOL_WHITE
#options WS_KERNEL_BG=WSCOL_BLACK
# compatibility to other console drivers
-#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
-#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-#options WSDISPLAY_COMPAT_USL # VT handling
-#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
+#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
+#options WSDISPLAY_COMPAT_USL # VT handling
+#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbc/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
# allocate a number of virtual screens at autoconfiguration time
@@ -189,7 +189,7 @@
mainbus0 at root
-cpu* at mainbus?
+cpu* at mainbus?
#apm0 at mainbus0 # Advanced power management
@@ -219,20 +219,20 @@
isa0 at pcib?
# PCMCIA bus support
-pcmcia* at pcic? controller ? socket ?
-pcmcia* at tcic? controller ? socket ?
+pcmcia* at pcic? controller ? socket ?
+pcmcia* at tcic? controller ? socket ?
# ISA PCMCIA controllers
-pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
-pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
+pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
+pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
-tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
+tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
# PCI PCMCIA controllers
pcic0 at pci? dev? function ?
# ISA Plug-and-Play bus support
-isapnp0 at isa?
+isapnp0 at isa?
# ISA Plug-and-Play PCMCIA controllers
pcic* at isapnp?
@@ -255,7 +255,7 @@
#options NORWEGIAN_KBD
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
#pms* at pckbc? # PS/2 mouse for wsmouse
vga0 at isa?
@@ -281,7 +281,7 @@
# PCMCIA serial interfaces
com* at pcmcia? function ? # Modems and serial cards
-pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
+pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
com* at pcmcom? slave ? # ...and the slave devices
# ISA serial interfaces
@@ -469,10 +469,10 @@
# PCI network interfaces
an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11)
-bge* at pci? dev ? function ? # Broadcom 570x Gigabit Ethernet
+bge* at pci? dev ? function ? # Broadcom 570x Gigabit Ethernet
#en* at pci? dev ? function ? # ENI/Adaptec ATM
ep* at pci? dev ? function ? # 3Com 3c59x
-ex* at pci? dev ? function ? # 3Com 90x[BC]
+ex* at pci? dev ? function ? # 3Com 3c90x[BC]
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
#esh* at pci? dev ? function ? # Essential HIPPI card
fpa* at pci? dev ? function ? # DEC DEFPA FDDI
@@ -502,12 +502,12 @@
tlp* at eisa? slot ? # DEC DE-425 Ethernet
# ISA Plug-and-Play network interfaces
-an* at isapnp? # # Aironet 802.11
+an* at isapnp? # Aironet 802.11
ep* at isapnp? # 3Com 3c509 Ethernet
fmv* at isapnp? # Fujitsu FMV-183
le* at isapnp? # AMD PCnet-ISA Ethernet
ne* at isapnp? # NE2000-compatible Ethernet
-tr* at isapnp? # IBM/3COM TROPIC Token-Ring
+tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
@@ -516,9 +516,9 @@
ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
mbe* at pcmcia? function ? # MB8696x based Ethernet
ne* at pcmcia? function ? # NE2000-compatible Ethernet
-ray* at pcmcia? function ? # Raytheon Raylink (802.11)
+ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xi* at pcmcia? function ? # Xircom CreditCard Ethernet
mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
@@ -529,27 +529,27 @@
ate0 at isa? port 0x2a0 irq ? # AT1700
cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-ep* at isa? port ? irq ? # 3C509 ethernet cards
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep* at isa? port ? irq ? # 3c509 Ethernet cards
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-181/182
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
iy0 at isa? port 0x360 irq ? # EtherExpress PRO 10 ISA
lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
-depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
+depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
le* at depca?
nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
le* at nele?
bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
le* at bicc?
-ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
+ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
+tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
we1 at isa? port 0x300 iomem 0xcc000 irq 10
@@ -562,19 +562,19 @@
exphy* at mii? phy ? # 3Com internal PHYs
glxtphy* at mii? phy ? # Level One LXT-1000 PHYs
gphyter* at mii? phy ? # NS83861 Gig-E PHY
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
-lxtphy* at mii? phy ? # Level One LXT-970 PHYs
-makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
+lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
-nsphyter* at mii? phy ? # NS83843 PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
pnaphy* at mii? phy ? # generic HomePNA PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs
-urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
+urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
ukphy* at mii? phy ? # generic unknown PHYs
# USB Controller and Devices
@@ -592,7 +592,7 @@
uhub* at uhub? port ? configuration ? interface ?
# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
+uhidev* at uhub? port ? configuration ? interface ?
# USB Mice
#ums* at uhidev? reportid ?
@@ -612,15 +612,15 @@
umass* at uhub? port ? configuration ? interface ?
# Y@P firmware loader
-#uyap* at uhub? port ?
+#uyap* at uhub? port ?
# USB Generic driver
#ugen* at uhub? port ? configuration ? interface ?
# USB Ethernet adapters
-aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
-cue* at uhub? port ? # CATC USB-EL1201A based adapters
-kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
+aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
+cue* at uhub? port ? # CATC USB-EL1201A based adapters
+kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
uax* at uhub? port ? # ASIX AX88172 based adapters
url* at uhub? port ? # Realtek RTL8150L based adapters
@@ -632,7 +632,7 @@
#sv* at pci? dev ? function ? # S3 SonicVibes
# ISA Plug-and-Play audio devices
-#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
+#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
#sb* at isapnp? # SoundBlaster-compatible audio
# ISA audio devices
@@ -689,7 +689,7 @@
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
@@ -724,4 +724,3 @@
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
#pseudo-device wsfont
-
--- INSTALL_LAPTOP Sun Aug 24 11:19:59 2003
+++ INSTALL_LAPTOP.proposed Mon Aug 25 12:42:50 2003
@@ -17,7 +17,7 @@
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=5000 # size of memory disk, in blocks
+options MEMORY_DISK_ROOT_SIZE=5000 # size of memory disk, in blocks
makeoptions COPTS="-Os" # generates smaller code than -O2, -O1
@@ -71,8 +71,8 @@
#options LKM # loadable kernel modules
options USERCONF # userconf(4) support
-options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-options MALLOC_NOINLINE # Not inlining MALLOC saves memory
+options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+options MALLOC_NOINLINE # Not inlining MALLOC saves memory
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
@@ -80,7 +80,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -104,28 +104,28 @@
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
# File systems
-file-system FFS # UFS
-file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system NTFS # Windows/NT Filesystem
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system PORTAL # portal filesystem (still experimental)
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT Filesystem
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system PORTAL # portal filesystem (still experimental)
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
# File system options
#options QUOTA # UFS quotas
#options NFSSERVER # Network File System server
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
-options VNODE_OP_NOINLINE # Not inlining vnode op calls saves mem
+options VNODE_OP_NOINLINE # Not inlining vnode op calls saves mem
# Networking options
#options GATEWAY # packet forwarding
@@ -163,10 +163,10 @@
options WS_KERNEL_FG=WSCOL_WHITE
#options WS_KERNEL_BG=WSCOL_BLACK
# compatibility to other console drivers
-#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
-#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
-#options WSDISPLAY_COMPAT_USL # VT handling
-#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
+#options WSDISPLAY_COMPAT_PCVT # emulate some ioctls
+#options WSDISPLAY_COMPAT_SYSCONS # emulate some ioctls
+#options WSDISPLAY_COMPAT_USL # VT handling
+#options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
# see dev/pckbc/wskbdmap_mfii.c for implemented layouts
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
# allocate a number of virtual screens at autoconfiguration time
@@ -185,7 +185,7 @@
#
mainbus0 at root
-cpu* at mainbus?
+cpu* at mainbus?
#apm0 at mainbus0 # Advanced power management
@@ -217,14 +217,14 @@
isa0 at pcib?
# PCMCIA bus support
-pcmcia* at pcic? controller ? socket ?
-pcmcia* at tcic? controller ? socket ?
+pcmcia* at pcic? controller ? socket ?
+pcmcia* at tcic? controller ? socket ?
# ISA PCMCIA controllers
-pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
-pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
+pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
+pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
pcic2 at isa? port 0x3e4 iomem 0xe0000 iosiz 0x4000
-tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
+tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
# PCI PCMCIA controllers
pcic0 at pci? dev? function ?
@@ -236,11 +236,11 @@
pcic* at isapnp?
# CardBus bridge support
-cbb* at pci? dev ? function ?
-cardslot* at cbb?
+cbb* at pci? dev ? function ?
+cardslot* at cbb?
# CardBus bus support
-cardbus* at cardslot?
+cardbus* at cardslot?
pcmcia* at cardslot?
@@ -262,7 +262,7 @@
#options NORWEGIAN_KBD
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
#pms* at pckbc? # PS/2 mouse for wsmouse
vga0 at isa?
@@ -292,7 +292,7 @@
com* at pcmcom? slave ? # ...and the slave devices
# CardBus serial interfaces
-com* at cardbus? dev ? function ? # Modems and serial cards
+com* at cardbus? dev ? function ? # Modems and serial cards
# ISA serial interfaces
#options COM_HAYESP # adds Hayes ESP serial board support
@@ -325,7 +325,7 @@
aic* at pcmcia? function ? # Adaptec APA-1460 SCSI
# CardBus SCSI cards
-ahc* at cardbus? dev ? function ? # Adaptec ADP-1480
+ahc* at cardbus? dev ? function ? # Adaptec ADP-1480
adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
# SCSI bus support
@@ -396,10 +396,10 @@
# Network Interfaces
# PCI network interfaces
-ex* at pci? dev ? function ? # 3Com 90x[BC]
+ex* at pci? dev ? function ? # 3Com 3c90x[BC]
fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B
-ne* at pci? dev ? function ? # NE2000-compatible Ethernet
-rtk* at pci? dev ? function ? # Realtek 8129/8139
+ne* at pci? dev ? function ? # NE2000-compatible Ethernet
+rtk* at pci? dev ? function ? # Realtek 8129/8139
tlp* at pci? dev ? function ? # DECchip 21x4x and clones
# PCMCIA network interfaces
@@ -411,7 +411,7 @@
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
xi* at pcmcia? function ? # Xircom CreditCard Ethernet
mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
@@ -419,24 +419,24 @@
sm* at mhzc?
# CardBus network cards
-ex* at cardbus? dev ? function ? # 3Com 3C575TX
-fxp* at cardbus? dev ? function ? # Intel i8255x
-rtk* at cardbus? dev ? function ? # Realtek 8129/8139
-tlp* at cardbus? dev ? function ? # DECchip 21143
+ex* at cardbus? dev ? function ? # 3Com 3c575TX
+fxp* at cardbus? dev ? function ? # Intel i8255x
+rtk* at cardbus? dev ? function ? # Realtek 8129/8139
+tlp* at cardbus? dev ? function ? # DECchip 21143
# MII/PHY support
exphy* at mii? phy ? # 3Com internal PHYs
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
-lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+lxtphy* at mii? phy ? # Level One LXT-970 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
-nsphyter* at mii? phy ? # NS83843 PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs
-urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
+urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
ukphy* at mii? phy ? # generic unknown PHYs
# USB Controller and Devices
@@ -474,9 +474,9 @@
umass* at uhub? port ? configuration ? interface ?
# USB Ethernet adapters
-aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
-cue* at uhub? port ? # CATC USB-EL1201A based adapters
-kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
+aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
+cue* at uhub? port ? # CATC USB-EL1201A based adapters
+kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
uax* at uhub? port ? # ASIX AX88172 based adapters
url* at uhub? port ? # Realtek RTL8150L based adapters
@@ -484,7 +484,7 @@
ugen* at uhub? port ? configuration ? interface ?
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
@@ -518,4 +518,3 @@
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
#pseudo-device wsfont
-
--- INSTALL_PS2 Sun Aug 24 11:20:37 2003
+++ INSTALL_PS2.proposed Mon Aug 25 11:03:18 2003
@@ -12,7 +12,7 @@
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=3500 # size of memory disk, in blocks
+options MEMORY_DISK_ROOT_SIZE=3500 # size of memory disk, in blocks
# File systems
-file-system MFS # memory file system
+file-system MFS # memory file system
--- INSTALL_SMALL Sun Aug 24 11:21:04 2003
+++ INSTALL_SMALL.proposed Mon Aug 25 12:48:04 2003
@@ -20,7 +20,7 @@
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=3900 # size of memory disk, in blocks
+options MEMORY_DISK_ROOT_SIZE=3900 # size of memory disk, in blocks
makeoptions COPTS="-Os" # generates smaller code than -O2, -O1
@@ -69,8 +69,8 @@
#options LKM # loadable kernel modules
options USERCONF # userconf(4) support
-options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-options MALLOC_NOINLINE # Not inlining MALLOC saves memory
+options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+options MALLOC_NOINLINE # Not inlining MALLOC saves memory
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
@@ -78,7 +78,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
#options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-#options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+#options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -102,20 +102,20 @@
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
# File systems
-file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system PORTAL # portal filesystem (still experimental)
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system FFS # UFS
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system PORTAL # portal filesystem (still experimental)
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
# File system options
#options QUOTA # UFS quotas
@@ -123,7 +123,7 @@
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
options NFS_V2_ONLY # Exclude NFS3 and NQNFS code to save space
-options VNODE_OP_NOINLINE # Not inlining vnode op calls saves mem
+options VNODE_OP_NOINLINE # Not inlining vnode op calls saves mem
# Networking options
#options GATEWAY # packet forwarding
@@ -160,7 +160,7 @@
#
mainbus0 at root
-cpu0 at mainbus0
+cpu0 at mainbus0
#apm0 at mainbus0 # Advanced power management
@@ -190,7 +190,7 @@
#isa0 at pcib?
# PCMCIA bus support
-#pcmcia* at pcic? controller ? socket ?
+#pcmcia* at pcic? controller ? socket ?
# ISA PCMCIA controllers
#pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
@@ -350,7 +350,7 @@
# ATAPI devices
cd* at atapibus? drive ? # ATAPI CD-ROM drives
sd* at atapibus? drive ? # ATAPI disk drives
-st* at atapibus? drive ? flags 0x0000 # ATAPI tape drives
+st* at atapibus? drive ? flags 0x0000 # ATAPI tape drives
# Miscellaneous mass storage devices
@@ -402,10 +402,10 @@
ate0 at isa? port 0x2a0 irq ? # AT1700
cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-ep* at isa? port ? irq ? # 3C509 ethernet cards
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep* at isa? port ? irq ? # 3c509 Ethernet cards
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
@@ -417,7 +417,7 @@
#le* at nele?
#bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
#le* at bicc?
-ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
+ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
@@ -433,7 +433,7 @@
# Audio Devices
# ISA Plug-and-Play audio devices
-#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
+#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
#sb* at isapnp? # SoundBlaster-compatible audio
# ISA audio devices
@@ -467,7 +467,7 @@
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
--- INSTALL_TINY Sun Aug 24 11:21:34 2003
+++ INSTALL_TINY.proposed Mon Aug 25 12:51:36 2003
@@ -20,7 +20,7 @@
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
options MEMORY_DISK_SERVER=0 # no userspace memory disk support
-options MEMORY_DISK_ROOT_SIZE=3100 # size of memory disk, in blocks
+options MEMORY_DISK_ROOT_SIZE=3100 # size of memory disk, in blocks
maxusers 2 # estimated number of users
@@ -69,8 +69,8 @@
#options LKM # loadable kernel modules
#options USERCONF # userconf(4) support
-options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-options MALLOC_NOINLINE # Not inlining MALLOC saves memory
+options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+options MALLOC_NOINLINE # Not inlining MALLOC saves memory
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
@@ -78,7 +78,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
#options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-#options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+#options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -102,26 +102,26 @@
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
# File systems
-file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-#file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system PORTAL # portal filesystem (still experimental)
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system FFS # UFS
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+#file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system PORTAL # portal filesystem (still experimental)
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
# Filesystem options
#options QUOTA # UFS quotas
#options NFSSERVER # Network File System server
options NFS_V2_ONLY # Exclude NFS3 and NQNFS code to save space
-options VNODE_OP_NOINLINE # Not inlining vnode op calls saves mem
+options VNODE_OP_NOINLINE # Not inlining vnode op calls saves mem
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
@@ -165,7 +165,7 @@
# Device configuration
#
-mainbus0 at root
+mainbus0 at root
cpu0 at mainbus0
#apm0 at mainbus0 # Advanced power management
@@ -189,8 +189,8 @@
options PCIC_ISA_INTR_ALLOC_MASK=0xff47
# PCMCIA bus support
-pcmcia* at pcic? controller ? socket ?
-#pcmcia* at tcic? controller ? socket ?
+pcmcia* at pcic? controller ? socket ?
+#pcmcia* at tcic? controller ? socket ?
# ISA PCMCIA controllers
pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
@@ -206,7 +206,7 @@
#isa0 at pcib?
# ISA Plug-and-Play bus support
-#isapnp0 at isa?
+#isapnp0 at isa?
# Coprocessor Support
@@ -339,7 +339,7 @@
# IDE and related devices
# PCMCIA IDE controllers
-wdc* at pcmcia? function ?
+wdc* at pcmcia? function ?
# ST506, ESDI, and ISA IDE controllers
# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
@@ -407,22 +407,22 @@
# ISA network interfaces
ate0 at isa? port 0x2a0 irq ? # AT1700
ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
-el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-ep0 at isa? port ? irq ? # 3C509 ethernet cards
-ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+ep0 at isa? port ? irq ? # 3c509 Ethernet cards
+ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
ix0 at isa? port 0x300 irq 10 # EtherExpress/16
iy0 at isa? port 0x360 irq ? # EtherExpress PRO 10 ISA
lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
-#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
+#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
#le* at depca?
#nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
#le* at nele?
#bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
#le* at bicc?
-ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
+ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
@@ -440,7 +440,7 @@
# Audio Devices
# ISA Plug-and-Play audio devices
-#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
+#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
#sb* at isapnp? # SoundBlaster-compatible audio
# ISA audio devices
@@ -474,7 +474,7 @@
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
--- IOPENER Sun Aug 24 11:22:02 2003
+++ IOPENER.proposed Mon Aug 25 12:55:02 2003
@@ -1,14 +1,14 @@
# $NetBSD: IOPENER,v 1.37 2003/04/10 22:06:58 christos Exp $
+# from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
#
# IOPENER -- GENERIC-like kernel for the Netpliance i-opener
-# from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
#
include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "IOPENER-$Revision: 1.37 $"
+#ident "IOPENER-$Revision: 1.37 $"
maxusers 32 # estimated number of users
@@ -47,7 +47,7 @@
#options LKM # loadable kernel modules
#options USERCONF # userconf(4) support
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Diagnostic/debugging support options
options DIAGNOSTIC # expensive kernel consistency checks
@@ -55,7 +55,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -79,22 +79,22 @@
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
# File systems
-file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-#file-system NTFS # Windows/NT file system (experimental)
-#file-system CD9660 # ISO 9660 + Rock Ridge file system
-#file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system OVERLAY # overlay file system
-#file-system PORTAL # portal filesystem (still experimental)
-#file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system FFS # UFS
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+#file-system NTFS # Windows/NT file system (experimental)
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+#file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system OVERLAY # overlay file system
+#file-system PORTAL # portal filesystem (still experimental)
+#file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
#file-system CODA # Coda File System; also needs vcoda (below)
# File system options
@@ -108,7 +108,7 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_DEBUG # debug for IP security
@@ -209,7 +209,7 @@
isa* at pcib?
# ISA Plug-and-Play bus support
-isapnp0 at isa?
+isapnp0 at isa?
# Coprocessor Support
@@ -226,12 +226,12 @@
#options NORWEGIAN_KBD
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
vga* at pci? dev ? function ?
wsdisplay* at vga? console ?
-wskbd* at pckbd? console ?
+wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
pcppi0 at isa?
@@ -274,12 +274,12 @@
# MII/PHY support
exphy* at mii? phy ? # 3Com internal PHYs
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
-lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+lxtphy* at mii? phy ? # Level One LXT-970 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
-nsphyter* at mii? phy ? # NS83843 PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
@@ -300,7 +300,7 @@
uhub* at uhub? port ? configuration ? interface ?
# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
+uhidev* at uhub? port ? configuration ? interface ?
# USB Mice
ums* at uhidev? reportid ?
@@ -317,7 +317,7 @@
ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
-umodem* at uhub? port ? configuration ?
+umodem* at uhub? port ? configuration ?
ucom* at umodem?
# USB Mass Storage
@@ -325,7 +325,7 @@
#scsibus* at scsi?
# USB audio
-uaudio* at uhub? port ? configuration ?
+uaudio* at uhub? port ? configuration ?
# USB Ethernet adapters
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
@@ -335,11 +335,11 @@
url* at uhub? port ? # Realtek RTL8150L based adapters
# USB Handspring Visor
-#uvisor* at uhub? port ?
+#uvisor* at uhub? port ?
#ucom* at uvisor?
# Y@P firmware loader
-uyap* at uhub? port ?
+uyap* at uhub? port ?
# USB Generic driver
ugen* at uhub? port ?
@@ -368,7 +368,7 @@
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
@@ -389,8 +389,8 @@
#pseudo-device strip 2 # Starmode Radio IP (Metricom)
#pseudo-device tun 2 # network tunneling over tty
#pseudo-device gre 2 # generic L3 over IP tunnel
-#pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device faith 1 # IPv[46] tcp relay translation i/f
+#pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC 1933)
+#pseudo-device faith 1 # IPv[46] TCP relay translation i/f
#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
# miscellaneous pseudo-devices
--- LAMB Sun Aug 24 11:22:32 2003
+++ LAMB.proposed Mon Aug 25 12:57:24 2003
@@ -1,13 +1,13 @@
# $NetBSD: LAMB,v 1.33 2003/04/10 22:06:58 christos Exp $
#
-# LAMB - a complete kernel for wildlab LAMB, http://www.wildlab.com/
+# LAMB -- a complete kernel for wildlab LAMB, http://www.wildlab.com/
#
-include "arch/i386/conf/std.i386"
+include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-Revision: 1.503"
+#ident "GENERIC-Revision: 1.503"
maxusers 32 # estimated number of users
@@ -69,7 +69,7 @@
#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
-options TIMER_FREQ=1189200 # LAMB uses nonstandard timer freq
+options TIMER_FREQ=1189200 # LAMB uses nonstandard timer freq
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
@@ -77,7 +77,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -104,22 +104,22 @@
#options COMPAT_PECOFF # kernel support to run Win32 apps
# File systems
-file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-#file-system NTFS # Windows/NT file system (experimental)
-#file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-#file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system OVERLAY # overlay file system
-#file-system PORTAL # portal filesystem (still experimental)
-file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system FFS # UFS
+#file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+#file-system NTFS # Windows/NT file system (experimental)
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+#file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system OVERLAY # overlay file system
+#file-system PORTAL # portal filesystem (still experimental)
+file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
#file-system CODA # Coda File System; also needs vcoda (below)
# File system options
@@ -133,7 +133,7 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_DEBUG # debug for IP security
@@ -249,7 +249,7 @@
isa0 at mainbus?
# ISA Plug-and-Play bus support
-isapnp0 at isa?
+isapnp0 at isa?
# Coprocessor Support
@@ -272,7 +272,7 @@
# wscons
-#pckbc0 at isa? # pc keyboard controller
+#pckbc0 at isa? # PC keyboard controller
#pckbd* at pckbc? # PC keyboard
#pms* at pckbc? # PS/2 mouse for wsmouse
#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
@@ -333,7 +333,7 @@
# Pull in optional local configuration
-#include "arch/i386/conf/LAMB.local"
+#include "arch/i386/conf/LAMB.local"
# Pseudo-Devices
@@ -364,8 +364,8 @@
#pseudo-device irframetty # IrDA frame line discipline
pseudo-device tun 2 # network tunneling over tty
pseudo-device gre 2 # generic L3 over IP tunnel
-pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
-#pseudo-device faith 1 # IPv[46] tcp relay translation i/f
+pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC 1933)
+#pseudo-device faith 1 # IPv[46] TCP relay translation i/f
#pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
--- NET4501 Sun Aug 24 11:23:25 2003
+++ NET4501.proposed Mon Aug 25 12:59:55 2003
@@ -1,16 +1,16 @@
-# $NetBSD: NET4501,v 1.20 2003/04/10 22:06:59 christos Exp $
+# $NetBSD: NET4501,v 1.20 2003/04/10 22:06:59 christos Exp $
#
-# NET4501 -- kernel configuration for a Soekris Engineering net4501
-# single-board computer.
+# NET4501 -- kernel configuration for a Soekris Engineering net4501
+# single-board computer.
#
# http://www.soekris.com/
-#
+#
-include "arch/i386/conf/std.i386"
+include "arch/i386/conf/std.i386"
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "NET4501-$Revision: 1.20 $"
+#ident "NET4501-$Revision: 1.20 $"
maxusers 32 # estimated number of users
@@ -83,7 +83,7 @@
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-options DDB_HISTORY_SIZE=512 # enable history editing in DDB
+options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -110,22 +110,22 @@
#options COMPAT_PECOFF # kernel support to run Win32 apps
# File systems
-file-system FFS # UFS
-#file-system EXT2FS # second extended file system (linux)
-#file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-#file-system NTFS # Windows/NT file system (experimental)
-#file-system CD9660 # ISO 9660 + Rock Ridge file system
-#file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system OVERLAY # overlay file system
-#file-system PORTAL # portal filesystem (still experimental)
-file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system FFS # UFS
+#file-system EXT2FS # second extended file system (linux)
+#file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+#file-system NTFS # Windows/NT file system (experimental)
+#file-system CD9660 # ISO 9660 + Rock Ridge file system
+#file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system OVERLAY # overlay file system
+#file-system PORTAL # portal filesystem (still experimental)
+file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
#file-system CODA # Coda File System; also needs vcoda (below)
# File system options
@@ -139,7 +139,7 @@
# Networking options
options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
#options IPSEC # IP security
#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_DEBUG # debug for IP security
@@ -175,7 +175,7 @@
#
mainbus0 at root
-cpu0 at mainbus0
+cpu0 at mainbus0
# Basic Bus Support
@@ -193,7 +193,7 @@
#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup
# PCI bridges
-elansc* at pci? dev ? function ? # Elan SC520 System Controller
+elansc* at pci? dev ? function ? # Elan SC520 System Controller
# ISA bus support
isa0 at mainbus?
@@ -243,10 +243,10 @@
wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b)
# PCMCIA network interfaces
-wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
# MII/PHY support
-nsphyter* at mii? phy ? # NS83843 PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
# Pseudo-Devices
@@ -260,8 +260,8 @@
#pseudo-device strip 2 # Starmode Radio IP (Metricom)
pseudo-device tun 2 # network tunneling over tty
#pseudo-device gre 2 # generic L3 over IP tunnel
-pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
-pseudo-device faith 1 # IPv[46] tcp relay translation i/f
+pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC 1933)
+pseudo-device faith 1 # IPv[46] TCP relay translation i/f
pseudo-device stf 1 # 6to4 IPv6 over IPv4 encapsulation
pseudo-device vlan # IEEE 802.1q encapsulation
pseudo-device bridge # simple inter-network bridging
--- SWINGER.MP Sun Aug 24 11:24:49 2003
+++ SWINGER.MP.proposed Sun Aug 24 23:00:51 2003
@@ -5,7 +5,7 @@
include "arch/i386/conf/SWINGER"
-options MULTIPROCESSOR
+options MULTIPROCESSOR
options COM_MPLOCK # com MP locking; REQUIRED on MP i386
#options LOCKDEBUG
@@ -14,4 +14,4 @@
options MPBIOS
#options DEBUG
-ioapic* at mainbus? apid ?
+ioapic* at mainbus? apid ?
--- SWINGER Sun Aug 24 11:23:54 2003
+++ SWINGER.proposed Mon Aug 25 13:05:23 2003
@@ -8,7 +8,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "SWINGER-$Revision: 1.43 $"
+#ident "SWINGER-$Revision: 1.43 $"
maxusers 64 # estimated number of users
@@ -64,7 +64,7 @@
options LKM # loadable kernel modules
#options USERCONF # userconf(4) support
-#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Diagnostic/debugging support options
options DIAGNOSTIC # expensive kernel consistency checks
@@ -72,7 +72,7 @@
options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
#options DDB_ONPANIC=1 # see also sysctl(8): `ddb.onpanic'
-options DDB_HISTORY_SIZE=100 # enable history editing in DDB
+options DDB_HISTORY_SIZE=100 # enable history editing in DDB
#options KGDB # remote debugger
#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
@@ -96,22 +96,22 @@
#options COMPAT_FREEBSD # binary compatibility with FreeBSD
# File systems
-file-system FFS # UFS
-file-system EXT2FS # second extended file system (linux)
-file-system LFS # log-structured file system
-file-system MFS # memory file system
-file-system NFS # Network File System client
-file-system NTFS # Windows/NT file system (experimental)
-file-system CD9660 # ISO 9660 + Rock Ridge file system
-file-system MSDOSFS # MS-DOS file system
-file-system FDESC # /dev/fd
-file-system KERNFS # /kern
-#file-system NULLFS # loopback file system
-#file-system OVERLAY # overlay file system
-#file-system PORTAL # portal filesystem (still experimental)
-file-system PROCFS # /proc
-#file-system UMAPFS # NULLFS + uid and gid remapping
-#file-system UNION # union file system
+file-system FFS # UFS
+file-system EXT2FS # second extended file system (linux)
+file-system LFS # log-structured file system
+file-system MFS # memory file system
+file-system NFS # Network File System client
+file-system NTFS # Windows/NT file system (experimental)
+file-system CD9660 # ISO 9660 + Rock Ridge file system
+file-system MSDOSFS # MS-DOS file system
+file-system FDESC # /dev/fd
+file-system KERNFS # /kern
+#file-system NULLFS # loopback file system
+#file-system OVERLAY # overlay file system
+#file-system PORTAL # portal filesystem (still experimental)
+file-system PROCFS # /proc
+#file-system UMAPFS # NULLFS + uid and gid remapping
+#file-system UNION # union file system
#file-system CODA # Coda File System; also needs vcoda (below)
# File system options
@@ -125,7 +125,7 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
-options INET6 # IPV6
+options INET6 # IPv6
options IPSEC # IP security
options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
#options IPSEC_DEBUG # debug for IP security
@@ -230,8 +230,8 @@
isa* at pcib?
# PCMCIA bus support
-#pcmcia* at pcic? controller ? socket ?
-#pcmcia* at tcic? controller ? socket ?
+#pcmcia* at pcic? controller ? socket ?
+#pcmcia* at tcic? controller ? socket ?
# ISA PCMCIA controllers
#pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
@@ -242,7 +242,7 @@
#pcic0 at pci? dev? function ?
# ISA Plug-and-Play bus support
-isapnp0 at isa?
+isapnp0 at isa?
# ISA Plug-and-Play PCMCIA controllers
#pcic* at isapnp?
@@ -272,7 +272,7 @@
#options NORWEGIAN_KBD
# wscons
-pckbc0 at isa? # pc keyboard controller
+pckbc0 at isa? # PC keyboard controller
pckbd* at pckbc? # PC keyboard
pms* at pckbc? # PS/2 mouse for wsmouse
#vga0 at isa?
@@ -280,7 +280,7 @@
#pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga? console ?
#wsdisplay* at pcdisplay? console ?
-wskbd* at pckbd? console ?
+wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
pcppi0 at isa?
@@ -298,7 +298,7 @@
# PCMCIA serial interfaces
#com* at pcmcia? function ? # Modems and serial cards
-#pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
+#pcmcom* at pcmcia? function ? # PCMCIA multi-port serial cards
#com* at pcmcom? slave ? # ...and the slave devices
# CardBus serial interfaces
@@ -468,7 +468,7 @@
# PCI network interfaces
#en* at pci? dev ? function ? # ENI/Adaptec ATM
#ep* at pci? dev ? function ? # 3Com 3c59x
-ex* at pci? dev ? function ? # 3Com 90x[BC]
+ex* at pci? dev ? function ? # 3Com 3c90x[BC]
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
#esh* at pci? dev ? function ? # Essential HIPPI card
#fpa* at pci? dev ? function ? # DEC DEFPA FDDI
@@ -491,7 +491,7 @@
# ISA Plug-and-Play network interfaces
#ep* at isapnp? # 3Com 3c509 Ethernet
#ne* at isapnp? # NE2000-compatible Ethernet
-#tr* at isapnp? # IBM/3COM TROPIC Token-Ring
+#tr* at isapnp? # IBM/3Com TROPIC Token-Ring
# PCMCIA network interfaces
#awi* at pcmcia? function ? # BayStack 650/660 (802.11FH/DS)
@@ -501,7 +501,7 @@
#ne* at pcmcia? function ? # NE2000-compatible Ethernet
#ray* at pcmcia? function ? # Raytheon Raylink (802.11)
#sm* at pcmcia? function ? # Megahertz Ethernet
-#wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
+#wi* at pcmcia? function ? # Lucent/Intersil WaveLAN/IEEE (802.11)
#xi* at pcmcia? function ? # Xircom CreditCard Ethernet
#mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
@@ -512,33 +512,33 @@
#ate0 at isa? port 0x2a0 irq ? # AT1700
#cs0 at isa? port 0x300 iomem ? irq ? drq ? # CS8900 Ethernet
#ec0 at isa? port 0x250 iomem 0xd8000 irq 9 # 3Com 3c503 Ethernet
-#eg0 at isa? port 0x280 irq 9 # 3C505 ethernet cards
-#el0 at isa? port 0x300 irq 9 # 3C501 ethernet cards
-#ep0 at isa? port ? irq ? # 3C509 ethernet cards
-#ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3C507
+#eg0 at isa? port 0x280 irq 9 # 3c505 Ethernet cards
+#el0 at isa? port 0x300 irq 9 # 3c501 Ethernet cards
+#ep0 at isa? port ? irq ? # 3c509 Ethernet cards
+#ef0 at isa? port 0x360 iomem 0xd0000 irq 7 # 3c507
#ai0 at isa? port 0x360 iomem 0xd0000 irq 7 # StarLAN
#fmv0 at isa? port 0x2a0 irq ? # FMV-180 series
#ix0 at isa? port 0x300 irq 10 # EtherExpress/16
#iy0 at isa? port 0x360 irq ? # EtherExpress PRO 10 ISA
#lc0 at isa? port 0x320 iomem ? irq ? # DEC EtherWORKS III (LEMAC)
-#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
+#depca0 at isa? port 0x300 iomem 0xc8000 iosiz 0x8000 irq 5 # DEPCA
#le* at depca?
#nele0 at isa? port 0x320 irq 9 drq 7 # NE2100
-#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial
+#ntwoc0 at isa? port 0x300 irq 5 iomem 0xc8000 flags 1 # Riscom/N2 sync serial
#le* at nele?
#bicc0 at isa? port 0x320 irq 10 drq 7 # BICC IsoLan
#le* at bicc?
-#ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
+#ne0 at isa? port 0x280 irq 9 # NE[12]000 Ethernet cards
#ne1 at isa? port 0x300 irq 10
#sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
#tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
#tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
-#tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
+#tr* at isa? port ? irq ? # 3Com TROPIC based Token-Ring
#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
#we1 at isa? port 0x300 iomem 0xcc000 irq 10
# CardBus network cards
-#ex* at cardbus? dev ? function ? # 3Com 3C575TX
+#ex* at cardbus? dev ? function ? # 3Com 3c575TX
#fxp* at cardbus? dev ? function ? # Intel i8255x
#tlp* at cardbus? dev ? function ? # DECchip 21143
#rtk* at cardbus? dev ? function ? # Realtek 8129/8139
@@ -546,12 +546,12 @@
# MII/PHY support
exphy* at mii? phy ? # 3Com internal PHYs
dmphy* at mii? phy ? # Davicom DM9101 PHYs
-icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
+icsphy* at mii? phy ? # Integrated Circuit Systems ICS189x
inphy* at mii? phy ? # Intel 82555 PHYs
iophy* at mii? phy ? # Intel 82553 PHYs
-lxtphy* at mii? phy ? # Level One LXT-970 PHYs
+lxtphy* at mii? phy ? # Level One LXT-970 PHYs
nsphy* at mii? phy ? # NS83840 PHYs
-nsphyter* at mii? phy ? # NS83843 PHYs
+nsphyter* at mii? phy ? # NS83843 PHYs
qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs
sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs
tlphy* at mii? phy ? # ThunderLAN PHYs
@@ -576,7 +576,7 @@
uhub* at uhub? port ? configuration ? interface ?
# USB HID device
-uhidev* at uhub? port ? configuration ? interface ?
+uhidev* at uhub? port ? configuration ? interface ?
# USB Mice
ums* at uhidev? reportid ?
@@ -593,14 +593,14 @@
ulpt* at uhub? port ? configuration ? interface ?
# USB Modem
-umodem* at uhub? port ? configuration ?
+umodem* at uhub? port ? configuration ?
ucom* at umodem?
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
# USB audio
-uaudio* at uhub? port ? configuration ?
+uaudio* at uhub? port ? configuration ?
# USB Ethernet adapters
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
@@ -621,7 +621,7 @@
urio* at uhub? port ?
# USB Handspring Visor
-uvisor* at uhub? port ?
+uvisor* at uhub? port ?
ucom* at uvisor?
# USB Generic driver
@@ -660,7 +660,7 @@
# ISA Plug-and-Play audio devices
#ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio
-#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
+#guspnp* at isapnp? # Gravis Ultra Sound PnP audio
sb* at isapnp? # SoundBlaster-compatible audio
#wss* at isapnp? # Windows Sound System
#ym* at isapnp? # Yamaha OPL3-SA3 audio
@@ -706,7 +706,7 @@
# TV cards
# Brooktree 848/849/878/879 based TV cards
-bktr* at pci? dev ? function ?
+bktr* at pci? dev ? function ?
# Mice
@@ -738,7 +738,7 @@
# Pull in optional local configuration
-include "arch/i386/conf/GENERIC.local"
+include "arch/i386/conf/GENERIC.local"
# Pseudo-Devices
@@ -759,8 +759,8 @@
#pseudo-device strip 2 # Starmode Radio IP (Metricom)
#pseudo-device tun 2 # network tunneling over tty
#pseudo-device gre 2 # generic L3 over IP tunnel
-pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
-pseudo-device faith 1 # IPv[46] tcp relay translation i/f
+pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC 1933)
+pseudo-device faith 1 # IPv[46] TCP relay translation i/f
# miscellaneous pseudo-devices
pseudo-device pty # pseudo-terminals
--- files.i386 Sun Aug 24 11:25:16 2003
+++ files.i386.proposed Sun Aug 24 19:21:57 2003
@@ -91,8 +91,8 @@
file arch/i386/i386/vm_machdep.c
file dev/cons.c
-file arch/i386/i386/mptramp.S multiprocessor
-file arch/i386/i386/ipifuncs.c multiprocessor
+file arch/i386/i386/mptramp.S multiprocessor
+file arch/i386/i386/ipifuncs.c multiprocessor
file arch/i386/i386/pmc.c perfctrs
@@ -149,7 +149,7 @@
include "dev/pci/files.pci"
include "dev/pci/files.agp"
-file arch/i386/pci/agp_machdep.c agp
+file arch/i386/pci/agp_machdep.c agp
file arch/i386/pci/pcibios.c pcibios
file arch/i386/pci/pci_intr_fixup.c pcibios & pcibios_intr_fixup
file arch/i386/pci/piix.c pcibios & pcibios_intr_fixup
include "arch/i386/conf/GENERIC"
#makeoptions DEBUG="-g" # compile full symbol table
options VERIFIED_EXEC
#options VERIFIED_EXEC_DEBUG
#options VERIFIED_EXEC_DEBUG_VERBOSE
pseudo-device verifiedexec 1
>Release-Note:
>Audit-Trail:
>Unformatted:
<Please check that the above is correct for the bug being reported,>
<and append source date of snapshot, if applicable (one line).>