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 merged with -current as of today.
details: https://anonhg.NetBSD.org/src/rev/bf335c3bd874
branches: sommerfeld_i386mp_1
changeset: 482572:bf335c3bd874
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Mon Aug 19 01:22:14 2002 +0000
description:
merged with -current as of today.
rearranged gdt init to deal with KVM86 changes; however, KVM86 has no
chance of working yet; good thing it's not part of GENERIC
diffstat:
sys/arch/i386/MP-UPDATING | 6 ++
sys/arch/i386/conf/CARDBUS | 11 ++-
sys/arch/i386/conf/DELPHI | 8 +-
sys/arch/i386/conf/DISKLESS | 4 +-
sys/arch/i386/conf/DR-EVIL | 6 +-
sys/arch/i386/conf/GENERIC | 26 ++++++--
sys/arch/i386/conf/GENERIC_LAPTOP | 10 +-
sys/arch/i386/conf/GENERIC_PS2TINY | 6 +-
sys/arch/i386/conf/GENERIC_TINY | 6 +-
sys/arch/i386/conf/HOMEWORLD | 4 +-
sys/arch/i386/conf/INSTALL | 11 ++-
sys/arch/i386/conf/INSTALL_LAPTOP | 11 ++-
sys/arch/i386/conf/INSTALL_SMALL | 7 +-
sys/arch/i386/conf/INSTALL_TINY | 9 +-
sys/arch/i386/conf/IOPENER | 6 +-
sys/arch/i386/conf/LAMB | 108 +++++++++++++++++++-----------------
sys/arch/i386/conf/MINBAR | 4 +-
sys/arch/i386/conf/NBFTP | 4 +-
sys/arch/i386/conf/NET4501 | 24 ++++++-
sys/arch/i386/conf/SWINGER | 8 +-
sys/arch/i386/conf/files.i386 | 36 ++++++++++-
sys/arch/i386/i386/apm.c | 66 +++++++++++++++++++---
sys/arch/i386/i386/autoconf.c | 31 +++++++---
sys/arch/i386/i386/conf.c | 16 ++++-
sys/arch/i386/i386/cpu.c | 4 +-
sys/arch/i386/i386/db_trace.c | 9 ++-
sys/arch/i386/i386/gdt.c | 26 +++-----
sys/arch/i386/i386/locore.s | 18 +++---
sys/arch/i386/i386/machdep.c | 42 +++++++++----
sys/arch/i386/i386/mainbus.c | 19 +++++-
sys/arch/i386/i386/microtime.s | 12 ++--
sys/arch/i386/i386/pmap.c | 15 ++++-
sys/arch/i386/i386/sys_machdep.c | 12 ++--
sys/arch/i386/i386/trap.c | 37 +++++++++++-
sys/arch/i386/include/cpufunc.h | 20 ++++++-
sys/arch/i386/include/gdt.h | 3 +-
sys/arch/i386/include/kvm86.h | 13 ++++
sys/arch/i386/include/types.h | 4 +-
sys/arch/i386/isa/clock.c | 30 +++++-----
sys/arch/i386/pci/pci_machdep.c | 10 +-
40 files changed, 472 insertions(+), 230 deletions(-)
diffs (truncated from 2055 to 300 lines):
diff -r f655889547a3 -r bf335c3bd874 sys/arch/i386/MP-UPDATING
--- a/sys/arch/i386/MP-UPDATING Tue Aug 13 05:33:52 2002 +0000
+++ b/sys/arch/i386/MP-UPDATING Mon Aug 19 01:22:14 2002 +0000
@@ -1,3 +1,9 @@
+Last Synchronized: Sun Aug 18 19:21:52 EDT 2002
+
+merged with -current as of today.
+rearranged gdt init to deal with KVM86 changes; however, KVM86 has no
+chance of working yet; good thing it's not part of GENERIC
+
Last Synchronized: Tue Jun 25 10:28:59 EDT 2002
merged with -current as of today.
diff -r f655889547a3 -r bf335c3bd874 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Tue Aug 13 05:33:52 2002 +0000
+++ b/sys/arch/i386/conf/CARDBUS Mon Aug 19 01:22:14 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CARDBUS,v 1.28.2.13 2002/06/25 15:44:44 sommerfeld Exp $
+# $NetBSD: CARDBUS,v 1.28.2.14 2002/08/19 01:22:15 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.13 $"
+#ident "CARDBUS-$Revision: 1.28.2.14 $"
maxusers 32 # estimated number of users
@@ -70,7 +70,7 @@
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
+#options SHMMAXPGS=2048 # 2048 pages is the default
options LKM # loadable kernel modules
@@ -261,6 +261,9 @@
options PCIBIOS_INTR_GUESS # see pcibios(4)
#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup
+# System Controllers
+elansc* at pci? dev ? function ? # AMD Elan SC520 System Controller
+
# PCI bridges
pchb* at pci? dev ? function ? # PCI-Host bridges
#pceb* at pci? dev ? function ? # PCI-EISA bridges
@@ -599,7 +602,7 @@
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
xi* at pcmcia? function ? # Xircom CreditCard Ethernet
mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
diff -r f655889547a3 -r bf335c3bd874 sys/arch/i386/conf/DELPHI
--- a/sys/arch/i386/conf/DELPHI Tue Aug 13 05:33:52 2002 +0000
+++ b/sys/arch/i386/conf/DELPHI Mon Aug 19 01:22:14 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DELPHI,v 1.17.2.3 2002/06/25 15:44:44 sommerfeld Exp $
+# $NetBSD: DELPHI,v 1.17.2.4 2002/08/19 01:22:15 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.3 $"
+ident "DELPHI-$Revision: 1.17.2.4 $"
maxusers 64 # estimated number of users
@@ -59,7 +59,7 @@
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
+#options SHMMAXPGS=2048 # 2048 pages is the default
options LKM # loadable kernel modules
@@ -497,7 +497,7 @@
#ne* at pcmcia? function ? # NE2000-compatible Ethernet
#ray* at pcmcia? function ? # Raytheon Raylink (802.11)
#sm* at pcmcia? function ? # Megahertz Ethernet
-#wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
+#wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
#xe* at pcmcia? function ? # Xircom PCMCIA cards
#mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
diff -r f655889547a3 -r bf335c3bd874 sys/arch/i386/conf/DISKLESS
--- a/sys/arch/i386/conf/DISKLESS Tue Aug 13 05:33:52 2002 +0000
+++ b/sys/arch/i386/conf/DISKLESS Mon Aug 19 01:22:14 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DISKLESS,v 1.85.2.3 2002/06/25 15:44:45 sommerfeld Exp $
+# $NetBSD: DISKLESS,v 1.85.2.4 2002/08/19 01:22:16 sommerfeld Exp $
#
# DISKLESS -- Generic machine setup for diskless boot.
# This kernel can be loaded from a bootable floppy (i.e. kernel-copy)
@@ -45,7 +45,7 @@
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
+#options SHMMAXPGS=2048 # 2048 pages is the default
#options USERCONF # userconf(4) support
#options PIPE_SOCKETPAIR # smaller, but slower pipe(2)
diff -r f655889547a3 -r bf335c3bd874 sys/arch/i386/conf/DR-EVIL
--- a/sys/arch/i386/conf/DR-EVIL Tue Aug 13 05:33:52 2002 +0000
+++ b/sys/arch/i386/conf/DR-EVIL Mon Aug 19 01:22:14 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: DR-EVIL,v 1.44.2.3 2002/06/25 15:44:45 sommerfeld Exp $
+# $NetBSD: DR-EVIL,v 1.44.2.4 2002/08/19 01:22:16 sommerfeld Exp $
#
# DR-EVIL -- Dell Inspiron 3800 laptop used by thorpej%netbsd.org@localhost
#
@@ -66,7 +66,7 @@
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
+#options SHMMAXPGS=2048 # 2048 pages is the default
options LKM # loadable kernel modules
@@ -543,7 +543,7 @@
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon RayLink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-#wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
+#wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
xi* at pcmcia? function ? # Xircom CreditCard Ethernet
mhzc* at pcmcia? function ? # Megaherz combo cards
diff -r f655889547a3 -r bf335c3bd874 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Tue Aug 13 05:33:52 2002 +0000
+++ b/sys/arch/i386/conf/GENERIC Mon Aug 19 01:22:14 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.300.2.30 2002/06/25 15:44:45 sommerfeld Exp $
+# $NetBSD: GENERIC,v 1.300.2.31 2002/08/19 01:22:17 sommerfeld Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.300.2.30 $"
+#ident "GENERIC-$Revision: 1.300.2.31 $"
maxusers 32 # estimated number of users
@@ -64,7 +64,7 @@
# Standard system options
options UCONSOLE # users can use TIOCCONS (for xconsole)
-options INSECURE # disable kernel security levels
+options INSECURE # disable kernel security levels - X needs this
options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
options NTP # NTP phase/frequency locked loop
@@ -79,7 +79,7 @@
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
+#options SHMMAXPGS=2048 # 2048 pages is the default
options LKM # loadable kernel modules
@@ -203,6 +203,12 @@
options PCDISPLAY_SOFTCURSOR
# modify the screen type of the console; defaults to "80x25"
#options VGA_CONSOLE_SCREENTYPE="\"80x24\""
+# work around a hardware bug that loaded fonts don't work; found on ATI cards
+#options VGA_CONSOLE_ATI_BROKEN_FONTSEL
+# the following enables some functions to get mouse console support.
+# if you want a really secure system, it may be better not to enable them,
+# see wsmoused(8), section SECURITY CONSIDERATIONS for more info.
+#options WSDISPLAY_CHARFUNCS # mouse console support
# Kernel root file system and dump configuration.
config netbsd root on ? type ?
@@ -273,6 +279,9 @@
#options PCIBIOS_INTR_GUESS # see pcibios(4)
#options PCIINTR_DEBUG # super-verbose PCI interrupt fixup
+# System Controllers
+elansc* at pci? dev ? function ? # AMD Elan SC520 System Controller
+
# PCI bridges
pchb* at pci? dev ? function ? # PCI-Host bridges
pceb* at pci? dev ? function ? # PCI-EISA bridges
@@ -358,7 +367,7 @@
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
wsdisplay* at vga? console ?
wsdisplay* at pcdisplay? console ?
-wskbd* at pckbd? console ?
+wskbd* at pckbd? console ?
wsmouse* at pms? mux 0
pcppi0 at isa?
@@ -642,7 +651,7 @@
sm* at pcmcia? function ? # Megahertz Ethernet
# tr at pcmcia has problems with Cardbus bridges
#tr* at pcmcia? function ? # TROPIC based Token-Ring
-wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
xi* at pcmcia? function ? # Xircom CreditCard Ethernet
mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
@@ -730,10 +739,14 @@
#ehci* at cardbus? dev ? function ? # Enhanced Host Controller
#ohci* at cardbus? dev ? function ? # Open Host Controller
+# ISA USB controllers
+#slhci0 at isa? port 0x300 irq 5 # ScanLogic SL811HS
+
# USB bus support
#usb* at ehci?
usb* at ohci?
usb* at uhci?
+#usb* at slhci?
# USB Hubs
uhub* at usb?
@@ -1032,4 +1045,3 @@
# wscons pseudo-devices
pseudo-device wsmux # mouse & keyboard multiplexor
pseudo-device wsfont
-
diff -r f655889547a3 -r bf335c3bd874 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Tue Aug 13 05:33:52 2002 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Mon Aug 19 01:22:14 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_LAPTOP,v 1.8.2.14 2002/06/25 15:44:46 sommerfeld Exp $
+# $NetBSD: GENERIC_LAPTOP,v 1.8.2.15 2002/08/19 01:22:18 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
@@ -8,7 +8,7 @@
#options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.8.2.14 $"
+#ident "GENERIC-$Revision: 1.8.2.15 $"
maxusers 32 # estimated number of users
@@ -49,7 +49,7 @@
# Standard system options
options UCONSOLE # users can use TIOCCONS (for xconsole)
-options INSECURE # disable kernel security levels
+options INSECURE # disable kernel security levels - X needs this
options RTC_OFFSET=0 # hardware clock is this many mins. west of GMT
options NTP # NTP phase/frequency locked loop
@@ -63,7 +63,7 @@
#options SEMUME=10 # max number of undo entries per process
#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
-#options SHMMAXPGS=1024 # 1024 pages is the default
+#options SHMMAXPGS=2048 # 2048 pages is the default
options LKM # loadable kernel modules
@@ -482,7 +482,7 @@
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
+wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11)
xi* at pcmcia? function ? # Xircom CreditCard Ethernet
mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards
diff -r f655889547a3 -r bf335c3bd874 sys/arch/i386/conf/GENERIC_PS2TINY
--- a/sys/arch/i386/conf/GENERIC_PS2TINY Tue Aug 13 05:33:52 2002 +0000
+++ b/sys/arch/i386/conf/GENERIC_PS2TINY Mon Aug 19 01:22:14 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_PS2TINY,v 1.12.2.3 2002/06/25 15:44:46 sommerfeld Exp $
+# $NetBSD: GENERIC_PS2TINY,v 1.12.2.4 2002/08/19 01:22:18 sommerfeld Exp $
#
# GENERIC-style kernel config for IBM PS/2 with MCA bus. It only contains
# IBM PS/2 related stuff and has been generally trimmed down somewhat,
@@ -49,7 +49,7 @@
# Standard system options
options UCONSOLE # users can use TIOCCONS (for xconsole)
-options INSECURE # disable kernel security levels
+options INSECURE # disable kernel security levels - X needs this
options RTC_OFFSET=-600 # hardware clock is this many mins. west of GMT
options NTP # NTP phase/frequency locked loop
Home |
Main Index |
Thread Index |
Old Index