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.
details: https://anonhg.NetBSD.org/src/rev/7d02551aed64
branches: sommerfeld_i386mp_1
changeset: 482471:7d02551aed64
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Sat Dec 29 21:09:02 2001 +0000
description:
Yet another mergeup.
New work:
- Frank van der Linden's tlb shootdown fix.
Mainline functionality merged:
- IrDA
- Kernel RCSID's
- Transmeta CPU support
- ACPI
- XMM register access through procfs
diffstat:
sys/arch/i386/MP-UPDATING | 13 +
sys/arch/i386/conf/CARDBUS | 97 +++++++--
sys/arch/i386/conf/GENERIC | 101 ++++++++--
sys/arch/i386/conf/GENERIC_ISDN | 46 ++--
sys/arch/i386/conf/GENERIC_LAPTOP | 67 ++++--
sys/arch/i386/conf/GENERIC_TINY | 37 +-
sys/arch/i386/conf/INSTALL | 65 ++++--
sys/arch/i386/conf/IOPENER | 26 +-
sys/arch/i386/conf/MINBAR | 17 +-
sys/arch/i386/conf/files.i386 | 48 ++--
sys/arch/i386/eisa/eisa_machdep.c | 5 +-
sys/arch/i386/i386/apm.c | 7 +-
sys/arch/i386/i386/autoconf.c | 5 +-
sys/arch/i386/i386/bus_machdep.c | 8 +-
sys/arch/i386/i386/conf.c | 13 +-
sys/arch/i386/i386/db_disasm.c | 6 +-
sys/arch/i386/i386/db_interface.c | 6 +-
sys/arch/i386/i386/db_memrw.c | 5 +-
sys/arch/i386/i386/db_trace.c | 5 +-
sys/arch/i386/i386/freebsd_syscall.c | 5 +-
sys/arch/i386/i386/gdt.c | 46 +++-
sys/arch/i386/i386/ibcs2_syscall.c | 5 +-
sys/arch/i386/i386/linux_syscall.c | 5 +-
sys/arch/i386/i386/machdep.c | 337 +++++++++++++++++++++++++++++++++-
sys/arch/i386/i386/mainbus.c | 49 ++++-
sys/arch/i386/i386/mtrr_i686.c | 7 +-
sys/arch/i386/i386/process_machdep.c | 240 +++++++++++++++++++++++-
sys/arch/i386/i386/procfs_machdep.c | 64 ++++++-
sys/arch/i386/i386/svr4_sigcode.s | 14 +-
sys/arch/i386/i386/svr4_syscall.c | 5 +-
sys/arch/i386/i386/sys_machdep.c | 5 +-
sys/arch/i386/i386/syscall.c | 5 +-
sys/arch/i386/i386/trap.c | 5 +-
sys/arch/i386/i386/vm_machdep.c | 5 +-
sys/arch/i386/include/bus.h | 94 ++++----
sys/arch/i386/include/cpu.h | 15 +-
sys/arch/i386/include/intr.h | 6 +-
sys/arch/i386/include/pmap.h | 34 +--
sys/arch/i386/isa/clock.c | 16 +-
sys/arch/i386/isa/isa_machdep.c | 13 +-
sys/arch/i386/isa/npx.c | 17 +-
sys/arch/i386/isa/npx_isa.c | 5 +-
sys/arch/i386/pci/pchb.c | 6 +-
sys/arch/i386/pci/pci_machdep.c | 5 +-
44 files changed, 1248 insertions(+), 337 deletions(-)
diffs (truncated from 3895 to 300 lines):
diff -r e0662d28d4cf -r 7d02551aed64 sys/arch/i386/MP-UPDATING
--- a/sys/arch/i386/MP-UPDATING Sat Dec 29 20:59:22 2001 +0000
+++ b/sys/arch/i386/MP-UPDATING Sat Dec 29 21:09:02 2001 +0000
@@ -1,3 +1,16 @@
+Last Synchronized: Sat Dec 29 14:45:06 EST 2001
+
+Yet another mergeup.
+
+New work:
+ - Frank van der Linden's tlb shootdown fix.
+Mainline functionality merged:
+ - IrDA
+ - Kernel RCSID's
+ - Transmeta CPU support
+ - ACPI
+ - XMM register access through procfs
+
Last Synchronized: Sun Sep 23 21:12:12 EDT 2001
Now using new toolchain. Most (but not all) of the new assembler
diff -r e0662d28d4cf -r 7d02551aed64 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Sat Dec 29 20:59:22 2001 +0000
+++ b/sys/arch/i386/conf/CARDBUS Sat Dec 29 21:09:02 2001 +0000
@@ -1,14 +1,14 @@
-# $NetBSD: CARDBUS,v 1.28.2.7 2001/09/22 23:00:54 sommerfeld Exp $
+# $NetBSD: CARDBUS,v 1.28.2.8 2001/12/29 21:09:03 sommerfeld Exp $
#
# CARDBUS: GENERIC + CardBus support. Additionally, some
# things typically not found on laptops have been commented out.
-# from: GENERIC,v 1.400 2001/02/04 17:36:03 perry Exp $
+# from: GENERIC,v 1.432 2001/10/17 18:41:20 jdolecek Exp $
#
include "arch/i386/conf/std.i386"
-#ident "CARDBUS-$Revision: 1.28.2.7 $"
+#ident "CARDBUS-$Revision: 1.28.2.8 $"
maxusers 32 # estimated number of users
@@ -25,12 +25,14 @@
# eliminate delay no-ops in I/O; recommended on all but very old machines
#options DUMMY_NOPS
+options MTRR # memory-type range register syscall support
+
# delay between "rebooting ..." message and hardware reset, in milliseconds
#options CPURESET_DELAY=2000
# This option allows you to force a serial console at the specified
# I/O address. see console(4) for details.
-#options "CONSDEVNAME=\"com\"",CONADDR=0x2f8,CONSPEED=57600
+#options CONSDEVNAME="\"com\"",CONADDR=0x2f8,CONSPEED=57600
# you don't want the option below ON iff you are using the
# serial console option of the new boot strap code.
#options CONS_OVERRIDE # Always use above! independent of boot info
@@ -55,19 +57,23 @@
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
+#options SEMMNI=10 # number of semaphore identifiers
+#options SEMMNS=60 # number of semaphores in system
+#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 LKM # loadable kernel modules
# Diagnostic/debugging support options
-options DIAGNOSTIC # expensive 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
options DDB_HISTORY_SIZE=512 # enable history editing in DDB
#options KGDB # remote debugger
-#options "KGDB_DEVNAME=\"com\"",KGDBADDR=0x3f8,KGDBRATE=9600
+#options KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x3f8,KGDB_DEVRATE=9600
#makeoptions DEBUG="-g" # compile full symbol table
# Compatibility options
@@ -87,6 +93,8 @@
options COMPAT_IBCS2 # binary compatibility with SCO and ISC
options COMPAT_LINUX # binary compatibility with Linux
options COMPAT_FREEBSD # binary compatibility with FreeBSD
+#options COMPAT_MACH # binary compatibility with Mach binaries
+#options EXEC_MACHO # exec MACH-O binaries
#options COMPAT_PECOFF # kernel support to run Win32 apps
# File systems
@@ -111,7 +119,7 @@
# File system options
options QUOTA # UFS quotas
#options FFS_EI # FFS Endian Independent support
-options SOFTDEP # FFS soft updates support.
+options SOFTDEP # FFS soft updates support.
options NFSSERVER # Network File System server
#options EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
# immutable) behave as system flags.
@@ -139,7 +147,7 @@
# These options enable verbose messages for several subsystems.
# Warning, these may compile large string tables into the kernel!
-options EISAVERBOSE # verbose EISA device autoconfig messages
+#options EISAVERBOSE # verbose EISA device autoconfig messages
options MIIVERBOSE # verbose PHY autoconfig messages
options PCIVERBOSE # verbose PCI device autoconfig messages
#options PCI_CONFIG_DUMP # verbosely dump PCI config space
@@ -147,8 +155,9 @@
options SCSIVERBOSE # human readable SCSI error messages
options USBVERBOSE # verbose USB device autoconfig messages
#options PNPBIOSVERBOSE # verbose PnP BIOS messages
-#options PNPBIOSDEBUG # more fulsome PnP BIOS debugging messages
+#options PNPBIOSDEBUG # more fulsome PnP BIOS debugging messages
#options I2OVERBOSE # verbose I2O driver messages
+#options MCAVERBOSE # verbose MCA device autoconfig messages
options NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
@@ -243,8 +252,9 @@
# PCI bridges
pchb* at pci? dev ? function ? # PCI-Host bridges
-pceb* at pci? dev ? function ? # PCI-EISA bridges
+#pceb* at pci? dev ? function ? # PCI-EISA bridges
pcib* at pci? dev ? function ? # PCI-ISA bridges
+#pcmb* at pci? dev ? function ? # PCI-MCA bridges
ppb* at pci? dev ? function ? # PCI-PCI bridges
# 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
@@ -255,13 +265,16 @@
# ISA bus support
isa0 at mainbus?
-isa0 at pceb?
+#isa0 at pceb?
isa0 at pcib?
# PCMCIA bus support
#pcmcia* at pcic? controller ? socket ?
#pcmcia* at tcic? controller ? socket ?
+# MCA bus support
+#mca0 at mainbus?
+
# ISA PCMCIA controllers
#pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
#pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
@@ -278,7 +291,7 @@
# CardBus bridge support
cbb* at pci? dev ? function ?
-cardslot* at cbb?
+cardslot* at cbb?
# CardBus bus support
cardbus* at cardslot?
@@ -364,6 +377,8 @@
#moxa0 at isa? port 0x100 irq 5 # MOXA C168H serial card (experimental)
#com* at moxa? slave ?
+# MCA serial interfaces
+#com* at mca? slot ? # 16x50s on comm boards
# Parallel Printer Interfaces
@@ -375,7 +390,7 @@
lpt1 at isa? port 0x278
lpt2 at isa? port 0x3bc
-# Hardware monitors
+# Hardware monitors
# LM7[89] and compatible hardware monitors
#lm0 at isa? port 0x290 # other common ports: 0x280, 0x310
@@ -438,6 +453,10 @@
# CardBus SCSI cards
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
# SCSI bus support
#scsibus* at adv?
@@ -487,7 +506,7 @@
pciide* at pci? dev ? function ? flags 0x0000
# ISA Plug-and-Play IDE controllers
-#wdc* at isapnp?
+#wdc* at isapnp?
# PCMCIA IDE controllers
wdc* at pcmcia? function ?
@@ -542,6 +561,10 @@
# uncomment it unless you are actually using it.
#wt0 at isa? port 0x308 irq 5 drq 1 # Archive and Wangtek QIC tape drives
+# MCA ESDI devices
+#edc* at mca? slot ? # IBM ESDI Disk Controllers
+#ed* at edc?
+
# Network Interfaces
@@ -620,8 +643,8 @@
#ne0 at isa? port 0x280 irq 9 # NE[12]000 ethernet cards
#ne1 at isa? port 0x300 irq 10
sm0 at isa? port 0x300 irq 10 # SMC91C9x Ethernet
-#tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
-#tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
+#tr0 at isa? port 0xa20 iomem 0xd8000 irq ? # IBM TROPIC based Token-Ring
+#tr1 at isa? port 0xa24 iomem 0xd0000 irq ? # IBM TROPIC based Token-Ring
#tr* at isa? port ? irq ? # 3COM TROPIC based Token-Ring
#we0 at isa? port 0x280 iomem 0xd0000 irq 9 # WD/SMC Ethernet
#we1 at isa? port 0x300 iomem 0xcc000 irq 10
@@ -632,6 +655,15 @@
rtk* at cardbus? dev ? function ? # Realtek 8129/8139
tlp* at cardbus? dev ? function ? # DECchip 21143
+# MCA network cards
+#elmc* at mca? slot ? # 3Com EtherLink/MC (3c523)
+#ep* at mca? slot ? # 3Com EtherLink III (3c529)
+#we* at mca? slot ? # WD/SMC Ethernet
+#ate* at mca? slot ? # Allied Telesis AT1720
+#ne* at mca? slot ? # Novell NE/2 and clones
+#tr* at mca? slot ? # IBM Token Ring adapter
+#le* at mca? slot ? # SKNET Personal/MC2+
+
# MII/PHY support
dmphy* at mii? phy ? # Davicom DM9101 PHYs
exphy* at mii? phy ? # 3Com internal PHYs
@@ -665,16 +697,19 @@
uhub* at usb?
uhub* at uhub? port ? configuration ? interface ?
+# USB HID device
+uhidev* at uhub? port ? configuration ? interface ?
+
# USB Mice
-ums* at uhub? port ? configuration ? interface ?
+ums* at uhidev? reportid ?
wsmouse* at ums? mux 0
# USB Keyboards
-ukbd* at uhub? port ? configuration ? interface ?
+ukbd* at uhidev? reportid ?
wskbd* at ukbd? console ? mux 1
# USB Generic HID devices
-uhid* at uhub? port ? configuration ? interface ?
+uhid* at uhidev? reportid ?
# USB Printer
ulpt* at uhub? port ? configuration ? interface ?
@@ -708,7 +743,7 @@
ucom* at uftdi? portno ?
uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter
-ucom* at uplcom? portno ?
+ucom* at uplcom? portno ?
umct* at uhub? port ? # MCT USB-RS232 serial adapter
ucom* at umct? portno ?
@@ -743,11 +778,13 @@
clct* at pci? dev ? function ? # Cirrus Logic CS4281
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
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
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
@@ -762,21 +799,27 @@
#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
+#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
+# PCMCIA audio devices
+esl* at pcmcia? function ? # ESS 1688 AudioDrive
+
#cms0 at isa? port 0x220 # Creative Music System
# OPL[23] FM synthesizers
#opl0 at isa? port 0x388 # use only if not attached to sound card
+opl* at cmpci? flags 1
+opl* at esl?
Home |
Main Index |
Thread Index |
Old Index