Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/sys/arch/i386/conf Pullup rev 1.16, approved by jhawk:
details: https://anonhg.NetBSD.org/src/rev/ba8dd989b6d5
branches: netbsd-1-5
changeset: 488589:ba8dd989b6d5
user: jhawk <jhawk%NetBSD.org@localhost>
date: Wed Jul 19 18:38:21 2000 +0000
description:
Pullup rev 1.16, approved by jhawk:
Pullup rev 1.233 - rev 1.358 of GENERIC to CARDBUS, and merge conflicts.
Add GENERIC rev in "from:" line to aid future merging.
Major highlights include COMPAT_14, COMPAT_AOUT, NTFS, OVERLAY,
SOFTDEP, INET6, IPSEC, pcic iosiz changes, cz, dpt, rtk (cardbus!),
awi, cnw, ray, wi, xi, joy, and gif.
diffstat:
sys/arch/i386/conf/CARDBUS | 317 +++++++++++++++++++++++++++++++++++---------
1 files changed, 252 insertions(+), 65 deletions(-)
diffs (truncated from 712 to 300 lines):
diff -r fbe7b7ac07dc -r ba8dd989b6d5 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Wed Jul 19 18:21:22 2000 +0000
+++ b/sys/arch/i386/conf/CARDBUS Wed Jul 19 18:38:21 2000 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: CARDBUS,v 1.14.2.1 2000/07/06 14:10:34 sommerfeld Exp $
+# $NetBSD: CARDBUS,v 1.14.2.2 2000/07/19 18:38:21 jhawk Exp $
#
# CARDBUS -- GENERIC + CardBus support
+# from: GENERIC,v 1.358 2000/07/05 04:07:25 sommerfeld Exp
#
include "arch/i386/conf/std.i386"
@@ -23,10 +24,6 @@
# delay between "rebooting ..." message and hardware reset, in milliseconds
#options CPURESET_DELAY=2000
-# Misc. i386-specific options
-options XSERVER # X server support in console drivers
-#options XSERVER_DDB # PF12 gets you into DDB when X is running
-
# This option allows you to force a serial console at the specified
# I/O address. see console(4) for details.
#options "CONSDEVNAME=\"com\"",CONADDR=0x2f8,CONSPEED=57600
@@ -76,6 +73,7 @@
options COMPAT_11 # NetBSD 1.1,
options COMPAT_12 # NetBSD 1.2,
options COMPAT_13 # NetBSD 1.3,
+options COMPAT_14 # NetBSD 1.4,
options COMPAT_43 # and 4.3BSD
options COMPAT_386BSD_MBRPART # recognize old partition ID
@@ -84,17 +82,21 @@
options COMPAT_LINUX # binary compatibility with Linux
options COMPAT_FREEBSD # binary compatibility with FreeBSD
+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
@@ -103,8 +105,8 @@
# File system options
options QUOTA # UFS quotas
-#options FFS_EI # FFS Endian Independant support
-#options SOFTDEP # FFS soft updates support.
+#options FFS_EI # FFS Endian Independent support
+options SOFTDEP # FFS soft updates support.
options NFSSERVER # Network File System server
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
@@ -112,6 +114,11 @@
# Networking options
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
+options INET6 # IPV6
+options PULLDOWN_TEST # use m_pulldown for IPv4/v6 processing
+#options IPSEC # IP security
+#options IPSEC_ESP # IP security (encryption part; define w/IPSEC)
+#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
options NS # XNS
#options NSIP # XNS tunneling over IP
@@ -119,11 +126,11 @@
#options EON # OSI tunneling over IP
options CCITT,LLC,HDLC # X.25
options NETATALK # AppleTalk networking protocols
-#options PPP_BSDCOMP # BSD-Compress compression support for PPP
-#options PPP_DEFLATE # Deflate compression support for PPP
-#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 PPP_BSDCOMP # BSD-Compress compression support for PPP
+options PPP_DEFLATE # Deflate compression support for PPP
+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
# Compatibility with 4.2BSD implementation of TCP/IP. Not recommended.
#options TCP_COMPAT_42
@@ -131,13 +138,15 @@
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
options EISAVERBOSE # verbose EISA device autoconfig messages
+options MIIVERBOSE # verbose PHY autoconfig messages
options PCIVERBOSE # verbose PCI device autoconfig messages
#options PCI_CONFIG_DUMP # verbosely dump PCI config space
#options PCMCIAVERBOSE # verbose PCMCIA configuration messages
options SCSIVERBOSE # human readable SCSI error messages
options USBVERBOSE # verbose USB device autoconfig messages
-
-options NFS_BOOT_BOOTP,NFS_BOOT_BOOTPARAM
+#options PNPBIOSVERBOSE # verbose PnP BIOS messages
+#options PNPBIOSDEBUG # more fullsome Pnp BIOS debugging messages
+options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
#
# wscons options
@@ -157,6 +166,8 @@
#options PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
# allocate a number of virtual screens at autoconfiguration time
#options WSDISPLAY_DEFAULTSCREENS=4
+# use a large software cursor that doesn't blink
+options PCDISPLAY_SOFTCURSOR
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
@@ -171,14 +182,58 @@
#apm0 at mainbus0 # Advanced power management
+# Tuning for power management, see apm(4) for more details.
+#options APM_NO_IDLE # Don't call BIOS CPU idle function
+#options APM_V10_ONLY # Use only the APM 1.0 calls
+#options APM_NO_POWEROFF # Don't power off on halt(8)
+#options APM_POWER_PRINT # Print stats on the console
+#options APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
+
# Basic Bus Support
+# Plug-and-Play BIOS and attached devices
+
+#pnpbios* at mainbus?
+
+# mainboard audio chips
+#ess* at pnpbios? index ? # ESS AudioDrive
+#sb* at pnpbios? index ? # NeoMagic 256AV in sb mode
+#wss* at pnpbios? index ? # NeoMagic 256AV in wss mode
+#ym* at pnpbios? index ? # OPL3-SA3
+
+# com port
+# If enabled, consider changing "com0", "com1", and "com2" under "ISA Serial
+# Interfaces" to "com*", otherwise com2 will attach at pnpbios? and there
+# will be no com0. A side effect is pcmcia (and other) com? previously
+# starting at com3 may attach as com1 or com2.
+#com* at pnpbios? index ? # serial ports
+
+# parallel port
+# The above "com*" comments apply, cf. "lpt0" under "ISA parallel
+# "printer interfaces".
+#lpt* at pnpbios? index ? # parallel ports
+
+#pckbc* at pnpbios? index ? # PC keyboard/mouse controller
+#fdc* at pnpbios? index ? # floppy controller
+
+# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
+#pciide* at pnpbios? index ?
+
# PCI bus support
pci* at mainbus? bus ?
pci* at pchb? bus ?
pci* at ppb? bus ?
+# Configure PCI using BIOS information
+#options PCIBIOS # PCI BIOS support
+#options PCIBIOSVERBOSE # PCI BIOS verbose info
+#options PCIBIOS_INTR_FIXUP # fixup PCI interrupt routing
+#options PCIBIOS_IRQS_HINT="0x0a00" # PCI interrupts hint. IRQ 9 or 11
+#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup
+#options PCIBIOS_BUS_FIXUP # fixup PCI bus numbering
+#options PCIBIOS_ADDR_FIXUP # fixup PCI I/O addresses
+
# PCI bridges
pchb* at pci? dev ? function ? # PCI-Host bridges
pceb* at pci? dev ? function ? # PCI-EISA bridges
@@ -201,9 +256,9 @@
pcmcia* at tcic? controller ? socket ?
# ISA PCMCIA controllers
-pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x4000
-pcic1 at isa? port 0x3e2 iomem 0xd4000 iosiz 0x4000
-tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x4000
+pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
+pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
+tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
# PCI PCMCIA controllers
pcic0 at pci? dev? function ?
@@ -214,14 +269,14 @@
# ISA Plug-and-Play PCMCIA controllers
pcic* at isapnp?
+# CardBus bridge support
+cbb* at pci? dev ? function ?
+cardslot* at cbb?
+
# CardBus bus support
cardbus* at cardslot?
pcmcia* at cardslot?
-cbb* at pci? dev? function ?
-
-cardslot* at cbb?
-
# Coprocessor Support
# Math Coprocessor support
@@ -232,30 +287,33 @@
# ISA console
#pc0 at isa? port 0x60 irq 1 # pccons generic PC console driver
-
# Keyboard layout configuration for pccons
#options FRENCH_KBD
#options FINNISH_KBD
#options GERMAN_KBD
#options NORWEGIAN_KBD
+# pccons-specific options:
+#options XSERVER_DDB # PF12 gets you into DDB when X is running
+#options XSERVER # X server support
+
# wscons
-pckbc0 at isa? # pc keyboard controller
-pckbd* at pckbc? # PC keyboard
+pckbc0 at isa? # pc keyboard controller
+pckbd* at pckbc? # PC keyboard
# "opms" should not be enabled together with "pms" or "pmsi"
-#pms* at pckbc? # PS/2 mouse for wsmouse
-#pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse
-opms* at pckbc? # backwards compatible PS/2 mouse
+pms* at pckbc? # PS/2 mouse for wsmouse
+pmsi* at pckbc? # PS/2 "Intelli"mouse for wsmouse
+#opms* at pckbc? # backwards compatible PS/2 mouse
vga0 at isa?
-vga* at pci?
+vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga? console ?
wsdisplay* at pcdisplay? console ?
-wskbd* at pckbd? console ?
-#wsmouse* at pms?
-#wsmouse* at pmsi?
+wskbd* at pckbd? console ?
+wsmouse* at pms? mux 0
+wsmouse* at pmsi? mux 0
-pcppi0 at isa?
+pcppi0 at isa?
sysbeep0 at pcppi?
# Serial Devices
@@ -263,6 +321,7 @@
# PCI serial interfaces
com* at puc? port ? # 16x50s on "universal" comm boards
cy* at pci? dev ? function ? # Cyclades Cyclom-Y serial boards
+cz* at pci? dev ? function ? # Cyclades-Z multi-port serial boards
# ISA Plug-and-Play serial interfaces
com* at isapnp? # Modems and serial boards
@@ -285,12 +344,16 @@
#ast0 at isa? port 0x1a0 irq 5 # AST 4-port serial cards
#com* at ast? slave ?
#boca0 at isa? port 0x100 irq 5 # BOCA 8-port serial cards
+#boca0 at isa? port 0x100 irq 5 # BOCA 16-port serial cards (BB2016)
+#boca1 at isa? port 0x140 irq 5 # this line is also needed for BB2016
#com* at boca? slave ?
#tcom0 at isa? port 0x100 irq 7 # TC-800 8-port serial cards
#com* at tcom? slave ?
#rtfps0 at isa? port 0x1230 irq 10 # RT 4-port serial cards
#com* at rtfps? slave ?
#cy0 at isa? iomem 0xd4000 irq 12 # Cyclades serial cards
+#addcom0 at isa? port 0x108 irq 5 # Addonics FlexPort 8S
+#com* at addcom? slave ?
# Parallel Printer Interfaces
@@ -303,46 +366,65 @@
lpt1 at isa? port 0x278
lpt2 at isa? port 0x3bc
+# Hardware monitors
+
+# LM7[89] and compatible hardware monitors
+#lm0 at isa? port 0x290 # other common ports: 0x280, 0x310
+
+# VIA VT82C686A hardware monitor
+#viapm* at pci? dev ? function ?
+#viaenv* at viapm?
+
# SCSI Controllers and Devices
# PCI SCSI controllers
adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
-adw* at pci? dev ? function ? # AdvanSys 9xxUW SCSI
Home |
Main Index |
Thread Index |
Old Index