Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch/i386/conf Sync with GENERIC.
details: https://anonhg.NetBSD.org/src/rev/b5c02ea4e909
branches: trunk
changeset: 475042:b5c02ea4e909
user: mycroft <mycroft%NetBSD.org@localhost>
date: Fri Jul 30 02:35:18 1999 +0000
description:
Sync with GENERIC.
diffstat:
sys/arch/i386/conf/BIKINI | 63 +++++++++++++++++++--------
sys/arch/i386/conf/TRINITY | 63 +++++++++++++++++++---------
sys/arch/i386/conf/ZYGORTHIAN-SPACE-RAIDERS | 64 +++++++++++++++++++---------
3 files changed, 131 insertions(+), 59 deletions(-)
diffs (truncated from 686 to 300 lines):
diff -r 84bbdfa297b3 -r b5c02ea4e909 sys/arch/i386/conf/BIKINI
--- a/sys/arch/i386/conf/BIKINI Fri Jul 30 02:29:04 1999 +0000
+++ b/sys/arch/i386/conf/BIKINI Fri Jul 30 02:35:18 1999 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: BIKINI,v 1.15 1999/07/29 10:37:17 augustss Exp $
-# From: GENERIC,v 1.220 1999/02/16 17:46:17 abs Exp
+# $NetBSD: BIKINI,v 1.16 1999/07/30 02:35:18 mycroft Exp $
+# From: GENERIC,v 1.246 1999/07/29 19:36:59 augustss Exp
#
# BIKINI -- Mycroft's development machine
#
@@ -86,12 +86,15 @@
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
file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
file-system FDESC # /dev/fd
@@ -139,18 +142,24 @@
#options NFS_BOOT_BOOTP,NFS_BOOT_BOOTPARAM
+#
# wscons options
+#
+# builtin terminal emulations
#options WSEMUL_SUN # sun terminal emulation
options WSEMUL_VT100 # VT100 / VT220 emulation
# different kernel output - see dev/wscons/wsdisplayvar.h
+options WS_KERNEL_FG=WSCOL_WHITE
options WS_KERNEL_BG=WSCOL_RED
-options WS_KERNEL_FG=WSCOL_WHITE
+# 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
# 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
+#options WSDISPLAY_DEFAULTSCREENS=4
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
@@ -192,10 +201,12 @@
# PCMCIA bus support
pcmcia* at pcic? controller ? socket ?
+#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
# PCI PCMCIA controllers
#pcic0 at pci? dev? function ?
@@ -225,8 +236,8 @@
#options NORWEGIAN_KBD
# 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
@@ -236,9 +247,9 @@
#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?
sysbeep0 at pcppi?
@@ -311,6 +322,7 @@
#aic* at isapnp? # Adaptec AHA-1520B
# ISA SCSI controllers
+#adv0 at isa? port ? irq ? drq ? # AdvanSys APB-514[02]
#aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI
#aha1 at isa? port 0x334 irq ? drq ?
#ahc0 at isa? port ? irq ? # Adaptec 284x SCSI
@@ -364,8 +376,11 @@
#wdc* at pcmcia? function ?
# ISA ST506, ESDI, and IDE controllers
-#wdc0 at isa? port 0x1f0 irq 14
-#wdc1 at isa? port 0x170 irq 15
+# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will
+# fall back to 16bits I/O if 32bits I/O are not functionnal).
+# Some controllers pass the initial 32bit test, but will fail later.
+#wdc0 at isa? port 0x1f0 irq 14 flags 0x00
+#wdc1 at isa? port 0x170 irq 15 flags 0x00
# IDE drives
# Flags are used only with controllers that support DMA operations
@@ -426,6 +441,7 @@
#ne* at pci? dev ? function ? # NE2000-compatible Ethernet
#tl* at pci? dev ? function ? # ThunderLAN-based Ethernet
#vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
+#lmc* at pci? dev ? function ? # Lan Media Corp SSI/HSSI/DS3
# EISA network interfaces
#ep* at eisa? slot ? # 3Com 3c579 Ethernet
@@ -434,6 +450,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
# PCMCIA network interfaces
ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
@@ -463,6 +480,9 @@
#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
#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
#we1 at isa? port 0x300 iomem 0xcc000 irq 10
@@ -493,11 +513,11 @@
# USB Mice
#ums* at uhub? port ? configuration ? interface ?
-#wsmouse* at ums?
+#wsmouse* at ums? mux 0
# USB Keyboards
#ukbd* at uhub? port ? configuration ? interface ?
-#wskbd* at ukbd? console ?
+#wskbd* at ukbd? console ? mux 1
# USB Generic HID devices
#uhid* at uhub? port ? configuration ? interface ?
@@ -506,12 +526,13 @@
#ulpt* at uhub? port ? configuration ? interface ?
# USB Generic driver
-#ugen* at uhub? port ? configuration ? interface ?
+#ugen* at uhub? port ?
# Audio Devices
# PCI audio devices
eap* at pci? dev ? function ? # Ensoniq AudioPCI
+#eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
sv* at pci? dev ? function ? # S3 SonicVibes
# ISA Plug-and-Play audio devices
@@ -523,7 +544,9 @@
#ym* at isapnp? # Yamaha OPL3-SA3 audio
# ISA audio devices
+# the "aria" probe might give false hits
#aria0 at isa? port 0x290 irq 10 # Aria
+#ess0 at isa? port 0x220 irq 5 drq 1 drq2 5 # ESS 18XX
#gus0 at isa? port 0x220 irq 7 drq 1 drq2 6 # Gravis Ultra Sound
#pas0 at isa? port 0x220 irq 7 drq 1 # ProAudio Spectrum
#pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System
@@ -534,16 +557,15 @@
# OPL[23] FM syntheziers
#opl0 at isa? port 0x388 # use only if not attached to sound card
+#opl* at eso?
#opl* at ess?
opl* at sb?
opl* at sv?
-# USB Audio devices
-#uaudio* at uhub? port ? configuration ? interface ?
-
# Audio support
#audio* at aria?
audio* at eap?
+#audio* at eso?
#audio* at ess?
#audio* at gus?
#audio* at guspnp?
@@ -551,7 +573,6 @@
audio* at sb?
#audio* at sp?
audio* at sv?
-#audio* at uaudio?
audio* at wss?
#audio* at ym?
@@ -572,8 +593,8 @@
#lms1 at isa? port 0x238 irq 5
#mms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#mms1 at isa? port 0x238 irq 5
-#wsmouse* at lms?
-#wsmouse* at mms?
+#wsmouse* at lms? mux 0
+#wsmouse* at mms? mux 0
# backwards compatible versions
#olms0 at isa? port 0x23c irq 5 # Logitech bus mouse
#olms1 at isa? port 0x238 irq 5
@@ -625,8 +646,12 @@
pseudo-device pty 64 # pseudo-terminals
#pseudo-device tb 1 # tablet line discipline
pseudo-device sequencer 1 # MIDI sequencer
+# rnd works; RND_COM does not on port i386 yet.
pseudo-device rnd # /dev/random and in-kernel generator
#options RND_COM # use "com" randomness as well (BROKEN)
# a pseudo device needed for Coda # also needs CODA (above)
#pseudo-device vcoda 4 # coda minicache <-> venus comm.
+
+# mouse & keyboard multiplexor pseudo-devices
+pseudo-device wsmux 2
diff -r 84bbdfa297b3 -r b5c02ea4e909 sys/arch/i386/conf/TRINITY
--- a/sys/arch/i386/conf/TRINITY Fri Jul 30 02:29:04 1999 +0000
+++ b/sys/arch/i386/conf/TRINITY Fri Jul 30 02:35:18 1999 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: TRINITY,v 1.84 1999/07/29 10:37:18 augustss Exp $
-# From: GENERIC,v 1.220 1999/02/16 17:46:17 abs Exp
+# $NetBSD: TRINITY,v 1.85 1999/07/30 02:35:19 mycroft Exp $
+# From: GENERIC,v 1.246 1999/07/29 19:36:59 augustss Exp
#
# TRINITY -- Mycroft's laptop
#
@@ -88,12 +88,15 @@
#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
#file-system CD9660 # ISO 9660 + Rock Ridge file system
file-system MSDOSFS # MS-DOS file system
file-system FDESC # /dev/fd
@@ -141,18 +144,24 @@
#options NFS_BOOT_BOOTP,NFS_BOOT_BOOTPARAM
+#
# wscons options
+#
+# builtin terminal emulations
#options WSEMUL_SUN # sun terminal emulation
options WSEMUL_VT100 # VT100 / VT220 emulation
# different kernel output - see dev/wscons/wsdisplayvar.h
+options WS_KERNEL_FG=WSCOL_WHITE
options WS_KERNEL_BG=WSCOL_RED
-options WS_KERNEL_FG=WSCOL_WHITE
+# 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
# 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
+#options WSDISPLAY_DEFAULTSCREENS=4
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
@@ -194,10 +203,12 @@
# PCMCIA bus support
pcmcia* at pcic? controller ? socket ?
+#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
# PCI PCMCIA controllers
#pcic0 at pci? dev? function ?
@@ -227,8 +238,8 @@
#options NORWEGIAN_KBD
# wscons
-pckbc0 at isa? # pc keyboard controller
-pckbd* at pckbc? # PC keyboard
Home |
Main Index |
Thread Index |
Old Index