Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/sommerfeld_i386mp_1]: src/sys/arch/i386 Snapshot of merge-in-progress wi...
details: https://anonhg.NetBSD.org/src/rev/5efbc8736d5d
branches: sommerfeld_i386mp_1
changeset: 482354:5efbc8736d5d
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Sun Jan 07 22:12:38 2001 +0000
description:
Snapshot of merge-in-progress with -current.
[Not expected to build]. Catch up with the last N months worth of
changes to -current.
diffstat:
sys/arch/i386/conf/GENERIC | 58 +-
sys/arch/i386/conf/INSTALL | 78 ++-
sys/arch/i386/conf/files.i386 | 13 +-
sys/arch/i386/eisa/eisa_machdep.c | 46 ++-
sys/arch/i386/i386/autoconf.c | 10 +-
sys/arch/i386/i386/bus_machdep.c | 10 +-
sys/arch/i386/i386/db_memrw.c | 241 ++++++++---
sys/arch/i386/i386/freebsd_syscall.c | 267 ++++++++++++
sys/arch/i386/i386/gdt.c | 30 +-
sys/arch/i386/i386/genassym.cf | 14 +-
sys/arch/i386/i386/ibcs2_syscall.c | 268 ++++++++++++
sys/arch/i386/i386/linux_syscall.c | 265 ++++++++++++
sys/arch/i386/i386/locore.s | 257 +++--------
sys/arch/i386/i386/machdep.c | 745 ++++++++++++++++++++++++++++++----
sys/arch/i386/i386/pmap.c | 439 ++++++++++++++------
sys/arch/i386/i386/process_machdep.c | 18 +-
sys/arch/i386/i386/svr4_sigcode.s | 184 ++++++++
sys/arch/i386/i386/svr4_syscall.c | 262 ++++++++++++
sys/arch/i386/i386/syscall.c | 304 ++++++++++++++
sys/arch/i386/i386/trap.c | 356 +---------------
sys/arch/i386/i386/vm_machdep.c | 31 +-
sys/arch/i386/include/cpu.h | 13 +-
sys/arch/i386/include/eisa_machdep.h | 11 +-
sys/arch/i386/include/frame.h | 7 +-
sys/arch/i386/include/gdt.h | 7 +-
sys/arch/i386/include/param.h | 9 +-
sys/arch/i386/include/pcb.h | 3 +-
sys/arch/i386/include/pmap.h | 77 ++-
sys/arch/i386/include/types.h | 4 +-
sys/arch/i386/isa/isa_machdep.c | 43 +-
sys/arch/i386/pci/pci_machdep.c | 4 +-
31 files changed, 3123 insertions(+), 951 deletions(-)
diffs (truncated from 6085 to 300 lines):
diff -r 86a9a0db7f21 -r 5efbc8736d5d sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Sun Jan 07 19:38:12 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC Sun Jan 07 22:12:38 2001 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.300.2.11 2001/01/07 19:36:48 sommerfeld Exp $
+# $NetBSD: GENERIC,v 1.300.2.12 2001/01/07 22:12:38 sommerfeld Exp $
#
# GENERIC -- everything that's currently supported
#
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.300.2.11 $"
+#ident "GENERIC-$Revision: 1.300.2.12 $"
maxusers 32 # estimated number of users
@@ -17,7 +17,7 @@
# CPU-related options.
options MATH_EMULATE # floating point emulation
-#options VM86 # virtual 8086 emulation
+options VM86 # virtual 8086 emulation
options USER_LDT # user-settable LDT; used by WINE
# eliminate delay no-ops in I/O; recommended on all but very old machines
#options DUMMY_NOPS
@@ -78,11 +78,11 @@
options COMPAT_43 # and 4.3BSD
options COMPAT_386BSD_MBRPART # recognize old partition ID
-#options COMPAT_SVR4 # binary compatibility with SVR4
-#options COMPAT_IBCS2 # binary compatibility with SCO and ISC
-#options COMPAT_LINUX # binary compatibility with Linux
-#options COMPAT_FREEBSD # binary compatibility with FreeBSD
-#options COMPAT_PECOFF # kernel support to run Win32 apps
+options COMPAT_SVR4 # binary compatibility with SVR4
+options COMPAT_IBCS2 # binary compatibility with SCO and ISC
+options COMPAT_LINUX # binary compatibility with Linux
+options COMPAT_FREEBSD # binary compatibility with FreeBSD
+#options COMPAT_PECOFF # kernel support to run Win32 apps
# File systems
file-system FFS # UFS
@@ -115,7 +115,6 @@
#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
@@ -145,7 +144,8 @@
options SCSIVERBOSE # human readable SCSI error messages
options USBVERBOSE # verbose USB device autoconfig messages
#options PNPBIOSVERBOSE # verbose PnP BIOS messages
-#options PNPBIOSDEBUG # more fullsome Pnp BIOS debugging messages
+#options PNPBIOSDEBUG # more fulsome Pnp BIOS debugging messages
+options I2OVERBOSE # verbose I2O driver messages
options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
@@ -169,6 +169,8 @@
#options WSDISPLAY_DEFAULTSCREENS=4
# use a large software cursor that doesn't blink
options PCDISPLAY_SOFTCURSOR
+# modify the screen type of the console; defaults to "80x25"
+#options VGA_CONSOLE_SCREENTYPE="\"80x24\""
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
@@ -231,11 +233,12 @@
# Configure PCI using BIOS information
#options PCIBIOS # PCI BIOS support
#options PCIBIOSVERBOSE # PCI BIOS verbose info
+#options PCIBIOS_ADDR_FIXUP # fixup PCI I/O addresses
+#options PCIBIOS_BUS_FIXUP # fixup PCI bus numbering
#options PCIBIOS_INTR_FIXUP # fixup PCI interrupt routing
#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
-#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
@@ -357,6 +360,8 @@
#cy0 at isa? iomem 0xd4000 irq 12 # Cyclades serial cards
#addcom0 at isa? port 0x108 irq 5 # Addonics FlexPort 8S
#com* at addcom? slave ?
+#moxa0 at isa? port 0x100 irq 5 # MOXA C168H serial card (experimental)
+#com* at moxa? slave ?
# Parallel Printer Interfaces
@@ -379,6 +384,12 @@
#viaenv* at viapm?
+# I2O devices
+iop* at pci? dev ? function ? # I/O processor
+iopsp* at iop? tid ? # SCSI/FC-AL ports
+ld* at iop? tid ? # block devices
+
+
# SCSI Controllers and Devices
# PCI SCSI controllers
@@ -408,7 +419,7 @@
aic* at isapnp? # Adaptec AHA-1520B
# ISA SCSI controllers
-adv0 at isa? port ? irq ? drq ? # AdvanSys APB-514[02]
+adv0 at isa? port ? irq ? drq ? # AdvanSys APB-514[02] SCSI
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
@@ -417,7 +428,7 @@
bha1 at isa? port 0x334 irq ? drq ?
# The "nca" and "dpt" probes might give false hits or hang your machine.
#dpt0 at isa? port 0x170 irq ? drq ? # DPT SmartCache/SmartRAID
-#nca0 at isa? port 0x360 irq 15 # Port-mapped NCR 53C80 contoller
+#nca0 at isa? port 0x360 irq 15 # Port-mapped NCR 53C80 controller
#nca1 at isa? iomem 0xd8000 irq 5 # Memory-mapped controller (T128, etc.)
sea0 at isa? iomem 0xc8000 irq 5 # Seagate/Future Domain SCSI
uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI
@@ -438,6 +449,7 @@
scsibus* at bha?
scsibus* at dpt?
scsibus* at esp?
+scsibus* at iopsp?
scsibus* at isp?
#scsibus* at nca?
#scsibus* at ncr?
@@ -456,11 +468,12 @@
ss* at scsibus? target ? lun ? # SCSI scanners
uk* at scsibus? target ? lun ? # SCSI unknown
+
# RAID controllers and devices
cac* at eisa? # Compaq EISA array controllers
-cac* at pci? dev ? function ? # Compaq array controller
+cac* at pci? dev ? function ? # Compaq PCI array controllers
twe* at pci? dev ? function ? # 3ware Escalade RAID controllers
-ld* at cac? unit ? # Compaq array disk device
+ld* at cac? unit ? # Compaq array disk devices
ld* at twe? unit ? # 3ware array disk devices
@@ -531,6 +544,7 @@
# Network Interfaces
# PCI network interfaces
+an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11)
de* at pci? dev ? function ? # DEC 21x4x-based Ethernet
en* at pci? dev ? function ? # ENI/Adaptec ATM
ep* at pci? dev ? function ? # 3Com 3c59x
@@ -560,11 +574,13 @@
tlp* at eisa? slot ? # DEC DE-425 Ethernet
# ISA Plug-and-Play network interfaces
+an* at isapnp? # Aironet 802.11
ep* at isapnp? # 3Com 3c509 Ethernet
ne* at isapnp? # NE2000-compatible Ethernet
tr* at isapnp? # IBM/3COM TROPIC Token-Ring
# PCMCIA network interfaces
+an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11)
awi* at pcmcia? function ? # BayStack 650/660 (802.11FH/DS)
cnw* at pcmcia? function ? # Xircom/Netwave AirSurfer
ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet
@@ -693,6 +709,9 @@
uvisor* at uhub? port ?
ucom* at uvisor?
+# USB scanners
+uscanner* at uhub? port ?
+
# USB Generic driver
ugen* at uhub? port ?
@@ -701,11 +720,13 @@
# PCI audio devices
auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio
+auich* at pci? dev ? function ? # Intel ICH integrated AC'97 Audio
clcs* at pci? dev ? function ? # Cirrus Logic CS4280
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
eap* at pci? dev ? function ? # Ensoniq AudioPCI
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
fms* at pci? dev ? function ? # Forte Media FM801
+neo* at pci? dev ? function ? # NeoMagic 256 AC'97 Audio
sv* at pci? dev ? function ? # S3 SonicVibes
# ISA Plug-and-Play audio devices
@@ -741,6 +762,7 @@
# Audio support
#audio* at aria?
audio* at auvia?
+audio* at auich?
audio* at clcs?
audio* at cmpci?
audio* at eap?
@@ -749,6 +771,7 @@
audio* at fms?
audio* at gus?
audio* at guspnp?
+audio* at neo?
audio* at pas?
audio* at sb?
audio* at sp?
@@ -844,9 +867,10 @@
pseudo-device gif 4 # IPv[46] over IPv[46] tunnel (RFC1933)
#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
# miscellaneous pseudo-devices
-pseudo-device pty 64 # pseudo-terminals
+pseudo-device pty # 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.
diff -r 86a9a0db7f21 -r 5efbc8736d5d sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL Sun Jan 07 19:38:12 2001 +0000
+++ b/sys/arch/i386/conf/INSTALL Sun Jan 07 22:12:38 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.135.2.6 2000/08/07 01:08:29 sommerfeld Exp $
+# $NetBSD: INSTALL,v 1.135.2.7 2001/01/07 22:12:38 sommerfeld Exp $
#
# INSTALL - Installation kernel.
#
@@ -11,6 +11,8 @@
include "arch/i386/conf/std.i386"
+makeoptions COPTS="-Os" # Optimise for space. Implies -O2
+
# Enable the hooks used for initializing the root memory-disk.
options MEMORY_DISK_HOOKS
options MEMORY_DISK_IS_ROOT # force root on memory disk
@@ -18,8 +20,6 @@
options MINIROOTSIZE=4096 # size of memory disk, in blocks
#options MINIROOTSIZE=2880 # 1.44M, same as a floppy
-makeoptions COPTS="-Os" # generates smaller code than -O2, -O1
-
maxusers 32 # estimated number of users
# CPU support. At least one is REQUIRED.
@@ -51,7 +51,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
@@ -79,7 +79,7 @@
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
#options "KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
-#makeoptions DEBUG="-g" # compile full symbol table
+#makeoptions DEBUG="-g" # compile full symbol table
# Compatibility options
#options COMPAT_NOMID # compatibility with 386BSD, BSDI, NetBSD 0.8,
@@ -114,9 +114,11 @@
#file-system UMAPFS # NULLFS + uid and gid remapping
#file-system UNION # union file system
-# File system options
+# 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 # Save space by not inlining vnode op calls
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
@@ -147,6 +149,7 @@
#options PCI_CONFIG_DUMP # verbosely dump PCI config space
#options PCMCIAVERBOSE # verbose PCMCIA configuration messages
#options SCSIVERBOSE # human readable SCSI error messages
+#options I2OVERBOSE # verbose I2O driver messages
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
@@ -194,9 +197,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
Home |
Main Index |
Thread Index |
Old Index