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 Resynch with -current.
details: https://anonhg.NetBSD.org/src/rev/2e8c8b5cb0fc
branches: sommerfeld_i386mp_1
changeset: 482559:2e8c8b5cb0fc
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Tue Jun 25 15:44:43 2002 +0000
description:
Resynch with -current.
diffstat:
sys/arch/i386/MP-UPDATING | 9 ++
sys/arch/i386/conf/CARDBUS | 65 +------------
sys/arch/i386/conf/DELPHI | 48 +---------
sys/arch/i386/conf/DISKLESS | 23 +---
sys/arch/i386/conf/DR-EVIL | 53 +----------
sys/arch/i386/conf/GENERIC | 81 +++--------------
sys/arch/i386/conf/GENERIC_LAPTOP | 52 +---------
sys/arch/i386/conf/GENERIC_PS2TINY | 6 +-
sys/arch/i386/conf/GENERIC_TINY | 29 +-----
sys/arch/i386/conf/HOMEWORLD | 38 +-------
sys/arch/i386/conf/INSTALL | 97 ++++++++++-----------
sys/arch/i386/conf/INSTALL_LAPTOP | 65 ++++++++++----
sys/arch/i386/conf/INSTALL_SMALL | 27 +-----
sys/arch/i386/conf/INSTALL_TINY | 25 +----
sys/arch/i386/conf/IOPENER | 12 +-
sys/arch/i386/conf/LAMB | 6 +-
sys/arch/i386/conf/MINBAR | 38 +-------
sys/arch/i386/conf/NBFTP | 38 +-------
sys/arch/i386/conf/NET4501 | 6 +-
sys/arch/i386/conf/SWINGER | 50 +---------
sys/arch/i386/conf/files.i386 | 18 +++-
sys/arch/i386/i386/bus_machdep.c | 5 +-
sys/arch/i386/i386/conf.c | 12 ++-
sys/arch/i386/i386/freebsd_syscall.c | 42 ++++----
sys/arch/i386/i386/genassym.cf | 5 +-
sys/arch/i386/i386/ibcs2_sigcode.s | 24 ++--
sys/arch/i386/i386/ibcs2_syscall.c | 44 ++++-----
sys/arch/i386/i386/linux_syscall.c | 47 +++++-----
sys/arch/i386/i386/locore.s | 24 +---
sys/arch/i386/i386/machdep.c | 156 ++++++++++++++++++++++++++++------
sys/arch/i386/i386/svr4_sigcode.s | 12 +--
sys/arch/i386/i386/svr4_syscall.c | 45 ++++-----
sys/arch/i386/i386/syscall.c | 44 ++++-----
sys/arch/i386/include/frame.h | 12 +-
sys/arch/i386/include/mpbiosvar.h | 6 +-
sys/arch/i386/isa/isa_machdep.c | 22 ++++-
sys/arch/i386/isa/vector.s | 70 ++++++++++++++-
sys/arch/i386/pci/p64h2apic.c | 61 +++++++++++++
sys/arch/i386/pci/pchb.c | 12 ++-
sys/arch/i386/pci/pci_machdep.c | 6 +-
40 files changed, 659 insertions(+), 776 deletions(-)
diffs (truncated from 3060 to 300 lines):
diff -r 7d8153a51f8d -r 2e8c8b5cb0fc sys/arch/i386/MP-UPDATING
--- a/sys/arch/i386/MP-UPDATING Tue Jun 25 01:08:49 2002 +0000
+++ b/sys/arch/i386/MP-UPDATING Tue Jun 25 15:44:43 2002 +0000
@@ -1,3 +1,12 @@
+Last Synchronized: Tue Jun 25 10:28:59 EDT 2002
+
+merged with -current as of today.
+Improved softint locking (thanks, Frank)
+Has new ACPI code and systrace.
+Revised low-physmem allocation in machdep.c
+Note: options PERFCTRS needs work for MP (each cpu has separate counters..)
+so has been disabled in this branch GENERIC.
+
Last Synchronized: Sat May 18 12:48:18 EDT 2002
merged with -current as of today.
diff -r 7d8153a51f8d -r 2e8c8b5cb0fc sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Tue Jun 25 01:08:49 2002 +0000
+++ b/sys/arch/i386/conf/CARDBUS Tue Jun 25 15:44:43 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CARDBUS,v 1.28.2.12 2002/05/03 19:12:54 sommerfeld Exp $
+# $NetBSD: CARDBUS,v 1.28.2.13 2002/06/25 15:44:44 sommerfeld Exp $
#
# CARDBUS: GENERIC + CardBus support. Additionally, some
# things typically not found on laptops have been commented out.
@@ -10,7 +10,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "CARDBUS-$Revision: 1.28.2.12 $"
+#ident "CARDBUS-$Revision: 1.28.2.13 $"
maxusers 32 # estimated number of users
@@ -28,6 +28,7 @@
#options DUMMY_NOPS
options MTRR # memory-type range register syscall support
+#options PERFCTRS # performance-monitoring counters support
# delay between "rebooting ..." message and hardware reset, in milliseconds
#options CPURESET_DELAY=2000
@@ -466,23 +467,7 @@
#aha* at mca? slot ? # Adaptec AHA-1640
# SCSI bus support
-#scsibus* at adv?
-#scsibus* at adw?
-#scsibus* at aha?
-#scsibus* at ahb?
-scsibus* at ahc?
-scsibus* at aic?
-#scsibus* at bha?
-#scsibus* at dpt?
-scsibus* at esp?
-#scsibus* at iopsp?
-#scsibus* at isp?
-#scsibus* at nca?
-#scsibus* at pcscp?
-#scsibus* at sea?
-#scsibus* at siop?
-#scsibus* at uha?
-#scsibus* at wds?
+scsibus* at scsi?
# SCSI devices
sd* at scsibus? target ? lun ? # SCSI disk drives
@@ -540,8 +525,7 @@
wd* at pciide? channel ? drive ? flags 0x0000
# ATAPI bus support
-atapibus* at wdc? channel ?
-atapibus* at pciide? channel ?
+atapibus* at atapi?
# ATAPI devices
# flags have the same meaning as for IDE drives.
@@ -722,8 +706,6 @@
# USB Mass Storage
umass* at uhub? port ? configuration ? interface ?
-atapibus* at umass? channel ?
-scsibus* at umass? channel ?
# USB audio
uaudio* at uhub? port ? configuration ?
@@ -762,7 +744,6 @@
# USB scanners that use SCSI emulation, e.g., HP5300
usscanner* at uhub? port ?
-scsibus* at usscanner? channel ?
# Y@P firmware loader
uyap* at uhub? port ?
@@ -826,31 +807,7 @@
#opl* at ym?
# Audio support
-#audio* at aria?
-audio* at auich?
-audio* at auvia?
-audio* at clcs?
-audio* at clct?
-audio* at cmpci?
-audio* at eap?
-audio* at emuxki?
-audio* at esa?
-audio* at esl?
-audio* at esm?
-audio* at eso?
-#audio* at ess?
-audio* at fms?
-#audio* at gus?
-#audio* at guspnp?
-audio* at neo?
-#audio* at pas?
-audio* at sb?
-#audio* at sp?
-audio* at sv?
-audio* at uaudio?
-audio* at wss?
-audio* at yds?
-#audio* at ym?
+audio* at audiobus?
# MPU 401 UARTs
#mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card
@@ -862,15 +819,8 @@
#mpu* at ym?
# MIDI support
-midi* at clcs? # Cirrus Logic CS4280 MIDI port
-#midi* at clct? # Cirrus Logic CS4281 MIDI port
-#midi* at cms? # Creative Music System
-midi* at eap? # 137[01] MIDI port
-midi* at mpu? # MPU 401
-midi* at opl? # OPL FM synth
+midi* at midibus?
midi* at pcppi? # MIDI interface to the PC speaker
-midi* at sb? # SB1 MIDI port
-midi* at umidi? # USB MIDI
# The spkr driver provides a simple tone interface to the built in speaker.
#spkr0 at pcppi? # PC speaker
@@ -953,6 +903,7 @@
# 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)
+pseudo-device clockctl # user control of clock subsystem
# a pseudo device needed for Coda # also needs CODA (above)
pseudo-device vcoda 4 # coda minicache <-> venus comm.
diff -r 7d8153a51f8d -r 2e8c8b5cb0fc sys/arch/i386/conf/DELPHI
--- a/sys/arch/i386/conf/DELPHI Tue Jun 25 01:08:49 2002 +0000
+++ b/sys/arch/i386/conf/DELPHI Tue Jun 25 15:44:43 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DELPHI,v 1.17.2.2 2002/05/03 19:12:54 sommerfeld Exp $
+# $NetBSD: DELPHI,v 1.17.2.3 2002/06/25 15:44:44 sommerfeld Exp $
#
# DELPHI -- one of thorpej%zembu.com@localhost's devel machines
#
@@ -7,7 +7,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-ident "DELPHI-$Revision: 1.17.2.2 $"
+ident "DELPHI-$Revision: 1.17.2.3 $"
maxusers 64 # estimated number of users
@@ -385,21 +385,7 @@
#adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
# SCSI bus support
-#scsibus* at adv?
-#scsibus* at adw?
-#scsibus* at aha?
-#scsibus* at ahb?
-scsibus* at ahc?
-#scsibus* at aic?
-#scsibus* at bha?
-#scsibus* at dpt?
-#scsibus* at isp?
-#scsibus* at nca?
-#scsibus* at ncr?
-#scsibus* at pcscp?
-#scsibus* at sea?
-#scsibus* at uha?
-#scsibus* at wds?
+scsibus* at scsi?
# SCSI devices
#sd* at scsibus? target ? lun ? # SCSI disk drives
@@ -445,8 +431,7 @@
wd* at pciide? channel ? drive ? flags 0x0000
# ATAPI bus support
-#atapibus* at wdc? channel ?
-atapibus* at pciide? channel ?
+atapibus* at atapi?
# ATAPI devices
# flags have the same meaning as for IDE drives.
@@ -607,7 +592,6 @@
# USB Mass Storage
#umass* at uhub? port ? configuration ? interface ?
-#scsibus* at umass? channel ?
# USB audio
#uaudio* at uhub? port ? configuration ?
@@ -680,22 +664,7 @@
#opl* at ym?
# Audio support
-#audio* at aria?
-#audio* at clcs?
-audio* at eap?
-#audio* at eso?
-#audio* at ess?
-#audio* at fms?
-#audio* at gus?
-#audio* at guspnp?
-#audio* at pas?
-#audio* at sb?
-#audio* at sbl?
-#audio* at sp?
-#audio* at sv?
-#audio* at uaudio?
-#audio* at wss?
-#audio* at ym?
+audio* at audiobus?
# MPU 401 UARTs
#mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card
@@ -705,11 +674,7 @@
#mpu* at ym?
# MIDI support
-midi* at eap? # 137[01] MIDI port
-#midi* at mpu? # MPU 401
-#midi* at opl? # OPL FM synth
-#midi* at pcppi? # MIDI interface to the PC speaker
-#midi* at sb? # SB1 MIDI port
+midi* at midibus?
# The spkr driver provides a simple tone interface to the built in speaker.
spkr0 at pcppi? # PC speaker
@@ -780,6 +745,7 @@
# 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)
+pseudo-device clockctl # user control of clock subsystem
# a pseudo device needed for Coda # also needs CODA (above)
#pseudo-device vcoda 4 # coda minicache <-> venus comm.
diff -r 7d8153a51f8d -r 2e8c8b5cb0fc sys/arch/i386/conf/DISKLESS
--- a/sys/arch/i386/conf/DISKLESS Tue Jun 25 01:08:49 2002 +0000
+++ b/sys/arch/i386/conf/DISKLESS Tue Jun 25 15:44:43 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.85.2.2 2002/05/03 19:12:54 sommerfeld Exp $
+# $NetBSD: DISKLESS,v 1.85.2.3 2002/06/25 15:44:45 sommerfeld Exp $
#
# DISKLESS -- Generic machine setup for diskless boot.
# This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
@@ -157,31 +157,24 @@
#aha0 at isa? port 0x330 irq ? drq ? # Adaptec 154[02] SCSI controllers
#aha1 at isa? port 0x334 irq ? drq ? # Adaptec 154[02] SCSI controllers
-#scsibus* at aha?
#ahb* at eisa? slot ? # Adaptec 174[024] SCSI controllers
-#scsibus* at ahb?
#ahc0 at isa? port ? irq ? # Adaptec 284x SCSI controllers
#ahc* at eisa? slot ? # Adaptec 274x, aic7770 SCSI controllers
#ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI controllers
-#scsibus* at ahc?
#aic0 at isa? port 0x340 irq 11 # Adaptec 152[02] SCSI controllers
-#scsibus* at aic?
#bha0 at isa? port 0x330 irq ? drq ? # BusLogic [57]4X SCSI controllers
#bha1 at isa? port 0x334 irq ? drq ? # BusLogic [57]4X SCSI controllers
#bha* at eisa? slot ?
#bha* at pci? dev ? function ?
-#scsibus* at bha?
#sea0 at isa? iomem 0xc8000 irq 5
-#scsibus* at sea?
#uha0 at isa? port 0x330 irq ? drq ? # UltraStor [13]4f SCSI controllers
#uha1 at isa? port 0x340 irq ? drq ? # UltraStor [13]4f SCSI controllers
#uha* at eisa? slot ? # UltraStor 24f SCSI controllers
-#scsibus* at uha?
#wds0 at isa? port 0x350 irq 15 drq 6 # WD7000 and TMC-7000 controllers
#wds1 at isa? port 0x358 irq 11 drq 5
-#scsibus* at wds?
#isp* at pci? dev ? function ? # Qlogic ISP 10x0 SCSI controllers
-#scsibus* at isp?
+
+#scsibus* at scsi?
#sd* at scsibus? target ? lun ? # SCSI disk drives
#st* at scsibus? target ? lun ? # SCSI tape drives
@@ -199,7 +192,7 @@
Home |
Main Index |
Thread Index |
Old Index