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 with current as of today
details: https://anonhg.NetBSD.org/src/rev/819eb5e629b9
branches: sommerfeld_i386mp_1
changeset: 482518:819eb5e629b9
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Sat Apr 27 20:24:43 2002 +0000
description:
Merge with current as of today
diffstat:
sys/arch/i386/MP-UPDATING | 5 +
sys/arch/i386/conf/CARDBUS | 20 +-
sys/arch/i386/conf/GENERIC | 49 ++--
sys/arch/i386/conf/GENERIC_ISDN | 22 +-
sys/arch/i386/conf/GENERIC_LAPTOP | 33 ++-
sys/arch/i386/conf/GENERIC_TINY | 14 +-
sys/arch/i386/conf/INSTALL | 34 +-
sys/arch/i386/conf/INSTALL_LAPTOP | 16 +-
sys/arch/i386/conf/IOPENER | 12 +-
sys/arch/i386/conf/MINBAR | 12 +-
sys/arch/i386/conf/files.i386 | 9 +-
sys/arch/i386/i386/bus_machdep.c | 6 +-
sys/arch/i386/i386/conf.c | 38 +--
sys/arch/i386/i386/linux_syscall.c | 20 +-
sys/arch/i386/i386/locore.s | 368 +++---------------------------------
sys/arch/i386/i386/machdep.c | 29 +-
sys/arch/i386/i386/mainbus.c | 8 +-
sys/arch/i386/i386/pmap.c | 75 +++++--
sys/arch/i386/i386/sys_machdep.c | 34 +++-
sys/arch/i386/i386/syscall.c | 8 +-
sys/arch/i386/include/param.h | 7 +-
sys/arch/i386/include/types.h | 10 +-
sys/arch/i386/isa/npx.c | 59 +++--
sys/arch/i386/pci/agp_machdep.c | 23 ++
sys/arch/i386/pci/pchb.c | 9 +-
sys/arch/i386/pci/pci_machdep.c | 10 +-
26 files changed, 367 insertions(+), 563 deletions(-)
diffs (truncated from 2315 to 300 lines):
diff -r 5603cbf84ed1 -r 819eb5e629b9 sys/arch/i386/MP-UPDATING
--- a/sys/arch/i386/MP-UPDATING Sat Apr 27 14:39:33 2002 +0000
+++ b/sys/arch/i386/MP-UPDATING Sat Apr 27 20:24:43 2002 +0000
@@ -1,3 +1,8 @@
+Last Synchronized: Sat Apr 27 11:54:52 EDT 2002
+
+merged with -current as of today.
+Added TRAPLOG support, fixed misc. minor bugs in ioapic.c, mpbios.c
+
Last Synchronized: Sat Feb 23 18:41:03 EST 2002
Pick up pxeboot; merge in joystick rototill, linux compat changes.
diff -r 5603cbf84ed1 -r 819eb5e629b9 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Sat Apr 27 14:39:33 2002 +0000
+++ b/sys/arch/i386/conf/CARDBUS Sat Apr 27 20:24:43 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CARDBUS,v 1.28.2.10 2002/02/24 00:17:41 sommerfeld Exp $
+# $NetBSD: CARDBUS,v 1.28.2.11 2002/04/27 20:24:43 sommerfeld Exp $
#
# CARDBUS: GENERIC + CardBus support. Additionally, some
# things typically not found on laptops have been commented out.
@@ -8,7 +8,9 @@
include "arch/i386/conf/std.i386"
-#ident "CARDBUS-$Revision: 1.28.2.10 $"
+#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+
+#ident "CARDBUS-$Revision: 1.28.2.11 $"
maxusers 32 # estimated number of users
@@ -71,6 +73,7 @@
options LKM # loadable kernel modules
+#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Diagnostic/debugging support options
@@ -328,10 +331,7 @@
# wscons
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
-#opms* at pckbc? # backwards compatible PS/2 mouse
vga0 at isa?
vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
@@ -339,7 +339,6 @@
wsdisplay* at pcdisplay? console ?
wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
-wsmouse* at pmsi? mux 0
pcppi0 at isa?
sysbeep0 at pcppi?
@@ -578,7 +577,6 @@
# 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
ex* at pci? dev ? function ? # 3Com 90x[BC]
@@ -594,11 +592,7 @@
#sip* at pci? dev ? function ? # SiS 900 Ethernet
#ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet
#tl* at pci? dev ? function ? # ThunderLAN-based Ethernet
-#tlp* at pci? dev ? function ? # DECchip 21x4x (and clones) Ethernet
-#options TLP_MATCH_21040
-#options TLP_MATCH_21041
-#options TLP_MATCH_21140
-#options TLP_MATCH_21142
+#tlp* at pci? dev ? function ? # DECchip 21x4x and clones
#vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
# EISA network interfaces
@@ -902,7 +896,6 @@
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
-#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
# Joysticks
@@ -947,7 +940,6 @@
pseudo-device strip 2 # Starmode Radio IP (Metricom)
pseudo-device tun 2 # network tunneling over tty
pseudo-device gre 2 # generic L3 over IP tunnel
-pseudo-device ipip 2 # IP Encapsulation within IP (RFC 2003)
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
diff -r 5603cbf84ed1 -r 819eb5e629b9 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Sat Apr 27 14:39:33 2002 +0000
+++ b/sys/arch/i386/conf/GENERIC Sat Apr 27 20:24:43 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.300.2.27 2002/02/24 01:58:56 sommerfeld Exp $
+# $NetBSD: GENERIC,v 1.300.2.28 2002/04/27 20:24:44 sommerfeld Exp $
#
# GENERIC machine description file
#
@@ -20,7 +20,9 @@
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.300.2.27 $"
+options INCLUDE_CONFIG_FILE # embed config file in kernel binary
+
+#ident "GENERIC-$Revision: 1.300.2.28 $"
maxusers 32 # estimated number of users
@@ -78,6 +80,7 @@
options LKM # loadable kernel modules
+#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
# Diagnostic/debugging support options
@@ -276,7 +279,7 @@
# 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
-#agp* at pchb?
+agp* at pchb?
# EISA bus support
eisa0 at mainbus?
@@ -340,10 +343,8 @@
# wscons
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
-#opms* at pckbc? # backwards compatible PS/2 mouse
+#options PMS_DISABLE_POWERHOOK
vga0 at isa?
vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
@@ -351,7 +352,6 @@
wsdisplay* at pcdisplay? console ?
wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
-wsmouse* at pmsi? mux 0
pcppi0 at isa?
sysbeep0 at pcppi?
@@ -440,6 +440,7 @@
mly* at pci? dev ? function ? # Mylex AcceleRAID and eXtremeRAID
pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI
siop* at pci? dev ? function ? # Symbios 53c8xx SCSI
+#options SIOP_SYMLED # drive the act. LED in software
trm* at pci? dev ? function ? # Tekram DC-395U/UW/F, DC-315/U SCSI
# EISA SCSI controllers
@@ -515,16 +516,23 @@
# RAID controllers and devices
+aac* at pci? dev ? function ? # Adaptec AAC family
cac* at eisa? slot ? # Compaq EISA array controllers
cac* at pci? dev ? function ? # Compaq PCI array controllers
+icp* at pci? dev ? function ? # ICP-Vortex GDT & Intel RAID
mlx* at pci? dev ? function ? # Mylex DAC960 & DEC SWXCR family
mlx* at eisa? slot ? # Mylex DAC960 & DEC SWXCR family
twe* at pci? dev ? function ? # 3ware Escalade RAID controllers
-ld* at cac? unit ? # logical disk devices
+ld* at aac? unit ? # logical disk devices
+ld* at cac? unit ?
+ld* at icp? unit ?
ld* at twe? unit ?
ld* at mlx? unit ?
+icpsp* at icp? unit ? # SCSI pass-through
+scsibus* at icpsp?
+
# IDE and related devices
# PCI IDE controllers - see pciide(4) for supported hardware.
# The 0x0001 flag force the driver to use DMA, even if the driver doesn't know
@@ -598,7 +606,6 @@
# 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
epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet
@@ -620,13 +627,10 @@
stge* at pci? dev ? function ? # Sundance/Tamarack TC9021 Gigabit
ti* at pci? dev ? function ? # Alteon ACEnic gigabit Ethernet
tl* at pci? dev ? function ? # ThunderLAN-based Ethernet
-tlp* at pci? dev ? function ? # DECchip 21x4x (and clones) Ethernet
-#options TLP_MATCH_21040
-#options TLP_MATCH_21041
-#options TLP_MATCH_21140
-#options TLP_MATCH_21142
+tlp* at pci? dev ? function ? # DECchip 21x4x and clones
vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet
wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b)
+wm* at pci? dev ? function ? # Intel 82543/82544 gigabit
# EISA network interfaces
ep* at eisa? slot ? # 3Com 3c579 Ethernet
@@ -723,6 +727,7 @@
tlphy* at mii? phy ? # ThunderLAN PHYs
tqphy* at mii? phy ? # TDK Semiconductor PHYs
ukphy* at mii? phy ? # generic unknown PHYs
+urlphy* at mii? phy ? # Realtek RTL8150L internal PHYs
# USB Controller and Devices
@@ -792,20 +797,23 @@
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
cue* at uhub? port ? # CATC USB-EL1201A based adapters
kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters
+url* at uhub? port ? # Realtek RTL8150L based adapters
-# Prolofic PL2301/PL2302 host-to-host adapter
+# Prolific PL2301/PL2302 host-to-host adapter
upl* at uhub? port ?
# Serial adapters
-# FTDI FT8U100AX serial adapter
-uftdi* at uhub? port ?
+uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter
ucom* at uftdi? portno ?
+umct* at uhub? port ? # MCT USB-RS232 serial adapter
+ucom* at umct? 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 ?
+uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter
+ucom* at uvscom? portno ?
# Diamond Multimedia Rio 500
urio* at uhub? port ?
@@ -991,7 +999,6 @@
#olms1 at isa? port 0x238 irq 5
#omms0 at isa? port 0x23c irq 5 # Microsoft InPort mouse
#omms1 at isa? port 0x238 irq 5
-#opms0 at pc? irq 12 # PS/2 auxiliary port mouse
# Joysticks
@@ -1003,6 +1010,7 @@
# PCI joysticks
joy* at pci? # Game ports (usually on audio cards)
+joy* at eso? # ESS Solo-1 on-board joystick
# ISA joysticks. Probe is a little strange; add only if you have one.
#joy0 at isa? port 0x201
@@ -1051,7 +1059,6 @@
pseudo-device irframetty # IrDA frame line discipline
pseudo-device tun 2 # network tunneling over tty
pseudo-device gre 2 # generic L3 over IP tunnel
-pseudo-device ipip 2 # IP Encapsulation within IP (RFC 2003)
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
diff -r 5603cbf84ed1 -r 819eb5e629b9 sys/arch/i386/conf/GENERIC_ISDN
--- a/sys/arch/i386/conf/GENERIC_ISDN Sat Apr 27 14:39:33 2002 +0000
+++ b/sys/arch/i386/conf/GENERIC_ISDN Sat Apr 27 20:24:43 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_ISDN,v 1.3.2.4 2002/01/28 04:21:36 sommerfeld Exp $
+# $NetBSD: GENERIC_ISDN,v 1.3.2.5 2002/04/27 20:24:44 sommerfeld Exp $
#
# GENERIC kernel with all supported ISDN devices and drivers
@@ -49,9 +49,11 @@
#---------------------------------------------------------------------
# Supported PCI cards:
#
-options ISICPCI_ELSA_QS1PCI # ELSA QuickStep 1000 (PCI Version)
-options ISICPCI_AVM_A1 # AVM Fritz!Card (PCI Version)
isic* at pci?
+
+# AVM Fritz!PCI card
+ifpci* at pci?
+
#
#---------------------------------------------------------------------
# Supported PCMCIA cards:
@@ -67,12 +69,12 @@
# ISDN user land devices, drivers and pseudo-devices.
#---------------------------------------------------------------------
#
-pseudo-device i4b # communication with userland daemon
-pseudo-device i4btrc 2 # userland driver to do ISDN tracing
Home |
Main Index |
Thread Index |
Old Index