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 Merge sommerfeld_i386mp_1 branch...
details: https://anonhg.NetBSD.org/src/rev/c21feaeaccb7
branches: sommerfeld_i386mp_1
changeset: 482384:c21feaeaccb7
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Mon Apr 30 16:23:08 2001 +0000
description:
Merge sommerfeld_i386mp_1 branch with -current as of today.
GENERIC.MP kernel boots and runs multiuser on my ABIT BP6
diffstat:
sys/arch/i386/conf/CARDBUS | 40 ++++++-
sys/arch/i386/conf/GENERIC | 26 ++++-
sys/arch/i386/conf/GENERIC.MP | 6 +-
sys/arch/i386/conf/GENERIC_LAPTOP | 17 ++-
sys/arch/i386/conf/GENERIC_TINY | 6 +-
sys/arch/i386/conf/INSTALL | 10 +-
sys/arch/i386/conf/IOPENER | 6 +-
sys/arch/i386/conf/MINBAR | 25 ++--
sys/arch/i386/conf/files.i386 | 11 ++-
sys/arch/i386/i386/apicvec.s | 13 ++-
sys/arch/i386/i386/apm.c | 43 +++++++-
sys/arch/i386/i386/bus_machdep.c | 66 +++++++++++++-
sys/arch/i386/i386/conf.c | 86 ++---------------
sys/arch/i386/i386/genassym.cf | 5 +-
sys/arch/i386/i386/locore.s | 33 +++---
sys/arch/i386/i386/machdep.c | 170 +++++++++++++++++++++++------------
sys/arch/i386/i386/mainbus.c | 4 +-
sys/arch/i386/i386/pmap.c | 76 ++++++---------
sys/arch/i386/i386/procfs_machdep.c | 4 +-
sys/arch/i386/i386/sys_machdep.c | 22 +--
sys/arch/i386/i386/trap.c | 14 ++-
sys/arch/i386/i386/vm_machdep.c | 8 +-
sys/arch/i386/include/apmvar.h | 4 +-
sys/arch/i386/include/bus.h | 72 ++++++++------
sys/arch/i386/include/cpu.h | 7 +-
sys/arch/i386/include/frame.h | 6 +-
sys/arch/i386/include/intr.h | 83 +++++++++++++++--
sys/arch/i386/include/param.h | 9 +-
sys/arch/i386/include/pmap.h | 6 +-
sys/arch/i386/include/types.h | 19 +---
sys/arch/i386/isa/clock.c | 45 +++++++-
sys/arch/i386/isa/icu.s | 20 ++-
sys/arch/i386/isa/npx.c | 3 +-
33 files changed, 605 insertions(+), 360 deletions(-)
diffs (truncated from 2376 to 300 lines):
diff -r 0191b2416a78 -r c21feaeaccb7 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Sat Apr 28 15:41:32 2001 +0000
+++ b/sys/arch/i386/conf/CARDBUS Mon Apr 30 16:23:08 2001 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: CARDBUS,v 1.28.2.2 2001/01/23 06:34:53 thorpej Exp $
+# $NetBSD: CARDBUS,v 1.28.2.3 2001/04/30 16:23:08 sommerfeld Exp $
#
# CARDBUS: GENERIC + CardBus support. Additionally, some
# things typically not found on laptops have been commented out.
-# from: GENERIC,v 1.390 2001/01/09 00:40:53 lukem Exp
+# from: GENERIC,v 1.400 2001/02/04 17:36:03 perry Exp $
#
include "arch/i386/conf/std.i386"
-#ident "CARDBUS-$Revision: 1.28.2.2 $"
+#ident "CARDBUS-$Revision: 1.28.2.3 $"
maxusers 32 # estimated number of users
@@ -61,7 +61,7 @@
options LKM # loadable kernel modules
# Diagnostic/debugging support options
-options DIAGNOSTIC # cheap kernel consistency checks
+options DIAGNOSTIC # expensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
@@ -78,6 +78,7 @@
options COMPAT_12 # NetBSD 1.2,
options COMPAT_13 # NetBSD 1.3,
options COMPAT_14 # NetBSD 1.4,
+options COMPAT_15 # NetBSD 1.5,
options COMPAT_43 # and 4.3BSD
options COMPAT_386BSD_MBRPART # recognize old partition ID
@@ -473,9 +474,12 @@
# RAID controllers and devices
#cac* at eisa? # Compaq EISA array controllers
#cac* at pci? dev ? function ? # Compaq PCI array controllers
+#mlx* at pci? dev ? function ? # Mylex DAC960 & DEC SWXCR family
#twe* at pci? dev ? function ? # 3ware Escalade RAID controllers
-#ld* at cac? unit ? # Compaq array disk devices
-#ld* at twe? unit ? # 3ware array disk devices
+
+#ld* at cac? unit ? # logical disk devices
+#ld* at twe? unit ?
+#ld* at mlx? unit ?
# IDE and related devices
@@ -690,6 +694,9 @@
# USB audio
uaudio* at uhub? port ? configuration ?
+# USB MIDI
+umidi* at uhub? port ? configuration ?
+
# USB Ethernet adapters
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
cue* at uhub? port ? # CATC USB-EL1201A based adapters
@@ -700,8 +707,14 @@
# Serial adapters
# FTDI FT8U100AX serial adapter
-#uftdi* at uhub? port ?
-#ucom* at uftdi? portno ?
+uftdi* at uhub? port ?
+ucom* at uftdi? portno ?
+
+uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
+ucom* at uplcom? portno ?
+
+umct* at uhub? port ? # MCT USB-RS232 serial adapter
+ucom* at umct? portno ?
# Diamond Multimedia Rio 500
urio* at uhub? port ?
@@ -713,6 +726,10 @@
# USB scanners
uscanner* at uhub? port ?
+# 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 ?
@@ -726,6 +743,7 @@
auich* at pci? dev ? function ? # Intel ICH integrated AC'97 Audio
auvia* at pci? dev ? function ? # VIA VT82C686A integrated AC'97 Audio
clcs* at pci? dev ? function ? # Cirrus Logic CS4280
+clct* at pci? dev ? function ? # Cirrus Logic CS4281
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
eap* at pci? dev ? function ? # Ensoniq AudioPCI
esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator
@@ -769,6 +787,7 @@
audio* at auich?
audio* at auvia?
audio* at clcs?
+audio* at clct?
audio* at cmpci?
audio* at eap?
audio* at esm?
@@ -794,12 +813,15 @@
#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 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
@@ -830,6 +852,8 @@
# Joysticks
+#joy* at pnpbios? index ? # Game port
+
# ISA Plug-and-Play joysticks
#joy* at isapnp? # Game ports (usually on audio cards)
diff -r 0191b2416a78 -r c21feaeaccb7 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Sat Apr 28 15:41:32 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC Mon Apr 30 16:23:08 2001 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.300.2.13 2001/01/23 06:34:53 thorpej Exp $
+# $NetBSD: GENERIC,v 1.300.2.14 2001/04/30 16:23:08 sommerfeld Exp $
#
# GENERIC -- everything that's currently supported
#
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.300.2.13 $"
+#ident "GENERIC-$Revision: 1.300.2.14 $"
maxusers 32 # estimated number of users
@@ -58,7 +58,7 @@
options LKM # loadable kernel modules
# Diagnostic/debugging support options
-options DIAGNOSTIC # cheap kernel consistency checks
+#options DIAGNOSTIC # expensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
@@ -75,6 +75,7 @@
options COMPAT_12 # NetBSD 1.2,
options COMPAT_13 # NetBSD 1.3,
options COMPAT_14 # NetBSD 1.4,
+options COMPAT_15 # NetBSD 1.5,
options COMPAT_43 # and 4.3BSD
options COMPAT_386BSD_MBRPART # recognize old partition ID
@@ -472,10 +473,12 @@
# RAID controllers and devices
cac* at eisa? # Compaq EISA array controllers
cac* at pci? dev ? function ? # Compaq PCI array controllers
+mlx* at pci? dev ? function ? # Mylex DAC960 & DEC SWXCR family
twe* at pci? dev ? function ? # 3ware Escalade RAID controllers
-ld* at cac? unit ? # Compaq array disk devices
-ld* at twe? unit ? # 3ware array disk devices
+ld* at cac? unit ? # logical disk devices
+ld* at twe? unit ?
+ld* at mlx? unit ?
# IDE and related devices
# PCI IDE controllers - see pciide(4) for supported hardware.
@@ -689,6 +692,9 @@
# USB audio
uaudio* at uhub? port ? configuration ?
+# USB MIDI
+umidi* at uhub? port ? configuration ?
+
# USB Ethernet adapters
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
cue* at uhub? port ? # CATC USB-EL1201A based adapters
@@ -705,6 +711,9 @@
uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
ucom* at uplcom? portno ?
+umct* at uhub? port ? # MCT USB-RS232 serial adapter
+ucom* at umct? portno ?
+
# Diamond Multimedia Rio 500
urio* at uhub? port ?
@@ -740,6 +749,7 @@
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
+yds* at pci? dev ? function ? # Yamaha DS-1 PCI Audio
# ISA Plug-and-Play audio devices
ess* at isapnp? # ESS Tech ES1887, ES1888, ES888 audio
@@ -769,6 +779,7 @@
opl* at sb?
opl* at sv?
opl* at wss?
+opl* at yds?
opl* at ym?
# Audio support
@@ -792,6 +803,7 @@
audio* at sv?
audio* at uaudio?
audio* at wss?
+audio* at yds?
audio* at ym?
# MPU 401 UARTs
@@ -799,6 +811,7 @@
mpu* at eso?
mpu* at fms?
mpu* at sb?
+mpu* at yds?
mpu* at ym?
# MIDI support
@@ -810,6 +823,7 @@
midi* at opl? # OPL FM synth
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
@@ -840,6 +854,8 @@
# Joysticks
+#joy* at pnpbios? index ? # Game port
+
# ISA Plug-and-Play joysticks
joy* at isapnp? # Game ports (usually on audio cards)
diff -r 0191b2416a78 -r c21feaeaccb7 sys/arch/i386/conf/GENERIC.MP
--- a/sys/arch/i386/conf/GENERIC.MP Sat Apr 28 15:41:32 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC.MP Mon Apr 30 16:23:08 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC.MP,v 1.1.2.3 2001/01/07 19:36:11 sommerfeld Exp $
+# $NetBSD: GENERIC.MP,v 1.1.2.4 2001/04/30 16:23:08 sommerfeld Exp $
#
# GENERIC.MP -- Generic, plus enable Multiprocessor support.
#
@@ -8,9 +8,11 @@
options MULTIPROCESSOR
options COM_MPLOCK # com MP locking; REQUIRED on MP i386
+options DIAGNOSTIC # STRONGLY RECOMMENDED
+
#options LOCKDEBUG
#options MPDEBUG
#options MPVERBOSE
-#options DEBUG
+#options DEBUG
ioapic* at mainbus? apid ?
diff -r 0191b2416a78 -r c21feaeaccb7 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Sat Apr 28 15:41:32 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Mon Apr 30 16:23:08 2001 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC_LAPTOP,v 1.8.2.2 2001/01/23 06:34:53 thorpej Exp $
+# $NetBSD: GENERIC_LAPTOP,v 1.8.2.3 2001/04/30 16:23:08 sommerfeld Exp $
#
# GENERIC -- everything that's currently supported
#
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.8.2.2 $"
+#ident "GENERIC-$Revision: 1.8.2.3 $"
maxusers 32 # estimated number of users
@@ -58,7 +58,7 @@
options LKM # loadable kernel modules
# Diagnostic/debugging support options
-options DIAGNOSTIC # cheap kernel consistency checks
+#options DIAGNOSTIC # expensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
#options KMEMSTATS # kernel memory statistics (vmstat -m)
options DDB # in-kernel debugger
@@ -75,6 +75,7 @@
options COMPAT_12 # NetBSD 1.2,
Home |
Main Index |
Thread Index |
Old Index