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 Yet Another mergeup with -current.
details: https://anonhg.NetBSD.org/src/rev/b0bc9bbb2e83
branches: sommerfeld_i386mp_1
changeset: 482484:b0bc9bbb2e83
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Mon Jan 28 04:21:35 2002 +0000
description:
Yet Another mergeup with -current.
diffstat:
sys/arch/i386/MP-UPDATING | 9 +++++
sys/arch/i386/conf/CARDBUS | 16 +++++++-
sys/arch/i386/conf/GENERIC | 65 ++++++++++++++++++++++++++++++++++----
sys/arch/i386/conf/GENERIC_ISDN | 3 +-
sys/arch/i386/conf/GENERIC_LAPTOP | 18 +++++++++-
sys/arch/i386/conf/GENERIC_TINY | 4 +-
sys/arch/i386/conf/INSTALL | 6 ++-
sys/arch/i386/conf/IOPENER | 6 ++-
sys/arch/i386/conf/MINBAR | 4 +-
sys/arch/i386/conf/files.i386 | 4 +-
sys/arch/i386/i386/autoconf.c | 8 +++-
sys/arch/i386/i386/conf.c | 17 +++++++++-
sys/arch/i386/i386/machdep.c | 13 ++++++-
sys/arch/i386/i386/pmap.c | 17 +---------
sys/arch/i386/include/segments.h | 42 +++++++++++++++---------
sys/arch/i386/isa/clock.c | 27 ++++++++++------
sys/arch/i386/isa/npx.c | 8 +---
sys/arch/i386/isa/npx_isa.c | 52 +++++++++++++++++++++----------
sys/arch/i386/pci/pchb.c | 5 +-
19 files changed, 228 insertions(+), 96 deletions(-)
diffs (truncated from 891 to 300 lines):
diff -r 08f84acda26a -r b0bc9bbb2e83 sys/arch/i386/MP-UPDATING
--- a/sys/arch/i386/MP-UPDATING Thu Jan 24 02:52:16 2002 +0000
+++ b/sys/arch/i386/MP-UPDATING Mon Jan 28 04:21:35 2002 +0000
@@ -1,3 +1,12 @@
+Last Synchronized: Sun Jan 27 22:33:13 EST 2002
+
+Yet another mergeup.
+
+Note that the mainline got RAIDframe added to GENERIC; however, this
+has been commented out on the branch because RAIDframe currently
+doesn't use locks correctly; with LOCKDEBUG, you'll panic, which means
+without LOCKDEBUG, you'll likely probably deadlock/hang in ugly ways.
+
Last Synchronized: Sat Dec 29 14:45:06 EST 2001
Yet another mergeup.
diff -r 08f84acda26a -r b0bc9bbb2e83 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Thu Jan 24 02:52:16 2002 +0000
+++ b/sys/arch/i386/conf/CARDBUS Mon Jan 28 04:21:35 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CARDBUS,v 1.28.2.8 2001/12/29 21:09:03 sommerfeld Exp $
+# $NetBSD: CARDBUS,v 1.28.2.9 2002/01/28 04:21:35 sommerfeld Exp $
#
# CARDBUS: GENERIC + CardBus support. Additionally, some
# things typically not found on laptops have been commented out.
@@ -8,7 +8,7 @@
include "arch/i386/conf/std.i386"
-#ident "CARDBUS-$Revision: 1.28.2.8 $"
+#ident "CARDBUS-$Revision: 1.28.2.9 $"
maxusers 32 # estimated number of users
@@ -45,6 +45,11 @@
#options REALBASEMEM=639 # size of base memory (in KB)
#options REALEXTMEM=15360 # size of extended memory (in KB)
+# following makes ARMADA M700's happy
+#options RBUS_MIN_START=0x20000000
+#options RBUS_IO_BASE=0x600
+#options RBUS_IO_SIZE=0x100
+
# Standard system options
options UCONSOLE # users can use TIOCCONS (for xconsole)
@@ -66,6 +71,8 @@
options LKM # loadable kernel modules
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
@@ -256,6 +263,7 @@
pcib* at pci? dev ? function ? # PCI-ISA bridges
#pcmb* at pci? dev ? function ? # PCI-MCA bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
+ppb* at cardbus? dev ? function ? # Cardbus-PCI bridges (www.magma.com)
# XXX 'puc's aren't really bridges, but there's no better place for them here
puc* at pci? dev ? function ? # PCI "universal" comm. cards
@@ -452,8 +460,8 @@
#wds1 at isa? port 0x358 irq 11 drq 5
# CardBus SCSI cards
+adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
ahc* at cardbus? dev ? function ? # Adaptec ADP-1480
-adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
# MCA SCSI cards
#aha* at mca? slot ? # Adaptec AHA-1640
@@ -779,6 +787,7 @@
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
eap* at pci? dev ? function ? # Ensoniq AudioPCI
emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512
+esa* at pci? dev ? function ? # ESS Allegro-1 / Maestro-3 PCI Audio
esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
fms* at pci? dev ? function ? # Forte Media FM801
@@ -831,6 +840,7 @@
audio* at cmpci?
audio* at eap?
audio* at emuxki?
+audio* at esa?
audio* at esl?
audio* at esm?
audio* at eso?
diff -r 08f84acda26a -r b0bc9bbb2e83 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Thu Jan 24 02:52:16 2002 +0000
+++ b/sys/arch/i386/conf/GENERIC Mon Jan 28 04:21:35 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.300.2.24 2001/12/29 23:21:18 sommerfeld Exp $
+# $NetBSD: GENERIC,v 1.300.2.25 2002/01/28 04:21:35 sommerfeld Exp $
#
# GENERIC machine description file
#
@@ -20,7 +20,7 @@
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.300.2.24 $"
+#ident "GENERIC-$Revision: 1.300.2.25 $"
maxusers 32 # estimated number of users
@@ -78,6 +78,8 @@
options LKM # loadable kernel modules
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
@@ -473,8 +475,8 @@
wds1 at isa? port 0x358 irq 11 drq 5
# CardBus SCSI cards
+#adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
#ahc* at cardbus? dev ? function ? # Adaptec ADP-1480
-#adv* at cardbus? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI
# MCA SCSI cards
aha* at mca? slot ? # Adaptec AHA-1640
@@ -776,10 +778,15 @@
# USB MIDI
umidi* at uhub? port ? configuration ?
-# USB IrDA bridges
+# USB IrDA
+# USB-IrDA bridge spec
uirda* at uhub? port ? configuration ? interface ?
irframe* at uirda?
+# SigmaTel STIr4200 USB/IrDA Bridge
+ustir* at uhub? port ?
+irframe* at ustir?
+
# USB Ethernet adapters
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
cue* at uhub? port ? # CATC USB-EL1201A based adapters
@@ -816,6 +823,10 @@
# Y@P firmware loader
uyap* at uhub? port ?
+# D-Link DSB-R100 USB radio
+udsbr* at uhub? port ?
+radio* at udsbr?
+
# USB Generic driver
ugen* at uhub? port ?
@@ -838,6 +849,7 @@
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
eap* at pci? dev ? function ? # Ensoniq AudioPCI
emuxki* at pci? dev ? function ? # Creative SBLive! and PCI512
+esa* at pci? dev ? function ? # ESS Allegro-1 / Maestro-3 PCI Audio
esm* at pci? dev ? function ? # ESS Maestro-1/2/2e PCI Audio Accelerator
eso* at pci? dev ? function ? # ESS Solo-1 PCI AudioDrive
fms* at pci? dev ? function ? # Forte Media FM801
@@ -858,8 +870,8 @@
#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
-sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver
+#pss0 at isa? port 0x220 irq 7 drq 6 # Personal Sound System
+#sp0 at pss0 port 0x530 irq 10 drq 0 # sound port driver
sb0 at isa? port 0x220 irq 5 drq 1 drq2 5 # SoundBlaster
wss0 at isa? port 0x530 irq 10 drq 0 drq2 1 # Windows Sound System
@@ -891,6 +903,7 @@
audio* at cmpci?
audio* at eap?
audio* at emuxki?
+audio* at esa?
#audio* at esl?
audio* at esm?
audio* at eso?
@@ -901,7 +914,7 @@
audio* at neo?
audio* at pas?
audio* at sb?
-audio* at sp?
+#audio* at sp?
audio* at sv?
audio* at uaudio?
audio* at wss?
@@ -933,10 +946,34 @@
#spkr0 at pcppi? # PC speaker
+# FM-Radio devices
+# ISA radio devices
+#az0 at isa? port 0x350 # Aztech/PackardBell FM Radio Card
+#az1 at isa? port 0x358
+#rt0 at isa? port 0x20c # AIMS Lab Radiotrack & compatible
+#rt1 at isa? port 0x284
+#rt2 at isa? port 0x30c
+#rt3 at isa? port 0x384
+#rtii0 at isa? port 0x20c # AIMS Lab Radiotrack II FM Radio Card
+#rtii1 at isa? port 0x30c
+#sf2r0 at isa? port 0x384 # SoundForte RadioLink SF16-FMR2 FM Radio Card
+
+# PCI radio devices
+#mr* at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card
+
+# Radio support
+#radio* at az?
+#radio* at mr?
+#radio* at rt?
+#radio* at rtii?
+#radio* at sf2r?
+
+
# TV cards
# Brooktree 848/849/878/879 based TV cards
bktr* at pci? dev ? function ?
+radio* at bktr?
# Mice
@@ -975,6 +1012,9 @@
# Planetconnect Satellite receiver driver.
#satlink0 at isa? port 0x300 drq 1
+# Middle Digital, Inc. PCI-Weasel serial console board control
+# devices (watchdog timer, etc.)
+weasel* at pci?
# Pull in optional local configuration
include "arch/i386/conf/GENERIC.local"
@@ -984,8 +1024,17 @@
# disk/mass storage pseudo-devices
pseudo-device ccd 4 # concatenated/striped disk devices
-#pseudo-device raid 4 # RAIDframe disk driver
+# RAIDframe is broken with MULTIPROCESSOR / LOCKDEBUG
+#pseudo-device raid 8 # RAIDframe disk driver
#options RAID_AUTOCONFIG # auto-configuration of RAID components
+# Options to enable various other RAIDframe RAID types.
+# options RF_INCLUDE_EVENODD=1
+# options RF_INCLUDE_RAID5_RS=1
+# options RF_INCLUDE_PARITYLOGGING=1
+# options RF_INCLUDE_CHAINDECLUSTER=1
+# options RF_INCLUDE_INTERDECLUSTER=1
+# options RF_INCLUDE_PARITY_DECLUSTERING=1
+# options RF_INCLUDE_PARITY_DECLUSTERING_DS=1
pseudo-device md 1 # memory disk device (ramdisk)
pseudo-device vnd 4 # disk-like interface to files
diff -r 08f84acda26a -r b0bc9bbb2e83 sys/arch/i386/conf/GENERIC_ISDN
--- a/sys/arch/i386/conf/GENERIC_ISDN Thu Jan 24 02:52:16 2002 +0000
+++ b/sys/arch/i386/conf/GENERIC_ISDN Mon Jan 28 04:21:35 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_ISDN,v 1.3.2.3 2001/12/29 21:09:04 sommerfeld Exp $
+# $NetBSD: GENERIC_ISDN,v 1.3.2.4 2002/01/28 04:21:36 sommerfeld Exp $
#
# GENERIC kernel with all supported ISDN devices and drivers
@@ -43,6 +43,7 @@
options ISICPNP_SEDLBAUER # Sedlbauer WinSpeed
options ISICPNP_DYNALINK # Dynalink IS64PH
options ISICPNP_SIEMENS_ISURF2 # Siemens I-Surf
+options ISICPNP_ITKIX # ITK IX PnP cards
isic* at isapnp?
#
#---------------------------------------------------------------------
diff -r 08f84acda26a -r b0bc9bbb2e83 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Thu Jan 24 02:52:16 2002 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Mon Jan 28 04:21:35 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_LAPTOP,v 1.8.2.9 2001/12/29 23:20:29 sommerfeld Exp $
+# $NetBSD: GENERIC_LAPTOP,v 1.8.2.10 2002/01/28 04:21:36 sommerfeld Exp $
# From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
#
# GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -6,7 +6,7 @@
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.8.2.9 $"
+#ident "GENERIC-$Revision: 1.8.2.10 $"
maxusers 32 # estimated number of users
@@ -64,6 +64,8 @@
options LKM # loadable kernel modules
+#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
+
# Diagnostic/debugging support options
#options DIAGNOSTIC # expensive kernel consistency checks
#options DEBUG # expensive debugging checks/support
@@ -603,6 +605,7 @@
cmpci* at pci? dev ? function ? # C-Media CMI8338/8738
Home |
Main Index |
Thread Index |
Old Index