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 Sync with the trunk.



details:   https://anonhg.NetBSD.org/src/rev/9b701c7db1eb
branches:  sommerfeld_i386mp_1
changeset: 482369:9b701c7db1eb
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Tue Jan 23 06:34:52 2001 +0000

description:
Sync with the trunk.

diffstat:

 sys/arch/i386/conf/CARDBUS           |   889 +++++++++++++++++
 sys/arch/i386/conf/GENERIC           |    27 +-
 sys/arch/i386/conf/GENERIC_ISDN      |    77 +
 sys/arch/i386/conf/GENERIC_LAPTOP    |   721 ++++++++++++++
 sys/arch/i386/conf/GENERIC_TINY      |   562 +++++++++++
 sys/arch/i386/conf/INSTALL           |     5 +-
 sys/arch/i386/conf/IOPENER           |   404 ++++++++
 sys/arch/i386/conf/KICKME            |   105 --
 sys/arch/i386/conf/MINBAR            |   618 ++++++++++++
 sys/arch/i386/conf/files.i386        |     3 +-
 sys/arch/i386/conf/kern.ldscript.4MB |   142 ++
 sys/arch/i386/i386/apm.c             |  1709 ++++++++++++++++++++++++++++++++++
 sys/arch/i386/i386/conf.c            |   527 ++++++++++
 sys/arch/i386/i386/db_interface.c    |     5 +-
 sys/arch/i386/i386/db_trace.c        |    11 +-
 sys/arch/i386/i386/machdep.c         |    13 +-
 sys/arch/i386/i386/procfs_machdep.c  |   156 +++
 sys/arch/i386/i386/sys_machdep.c     |   419 ++++++++
 sys/arch/i386/include/apmvar.h       |     4 +-
 sys/arch/i386/include/pc/display.h   |    47 -
 sys/arch/i386/include/pc/msdos.h     |    65 -
 sys/arch/i386/isa/isa_machdep.c      |    19 +-
 sys/arch/i386/isa/npx.c              |    11 +-
 sys/arch/i386/isa/npx_isa.c          |   123 ++
 sys/arch/i386/stand/newvers.sh       |    44 -
 25 files changed, 6413 insertions(+), 293 deletions(-)

diffs (truncated from 6987 to 300 lines):

diff -r 3ce31d26ba8e -r 9b701c7db1eb sys/arch/i386/conf/CARDBUS
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/conf/CARDBUS        Tue Jan 23 06:34:52 2001 +0000
@@ -0,0 +1,889 @@
+#      $NetBSD: CARDBUS,v 1.28.2.2 2001/01/23 06:34:53 thorpej 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
+#
+
+include "arch/i386/conf/std.i386"
+
+#ident         "CARDBUS-$Revision: 1.28.2.2 $"
+
+maxusers       32              # estimated number of users
+
+# CPU support.  At least one is REQUIRED.
+options        I386_CPU
+options        I486_CPU
+options        I586_CPU
+options        I686_CPU
+
+# CPU-related options.
+options        MATH_EMULATE    # floating point emulation
+options        VM86            # virtual 8086 emulation
+options        USER_LDT        # user-settable LDT; used by WINE
+# eliminate delay no-ops in I/O; recommended on all but very old machines
+#options       DUMMY_NOPS
+
+# 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
+#      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
+
+# The following options override the memory sizes passed in from the boot
+# block.  Use them *only* if the boot block is unable to determine the correct
+# values.  Note that the BIOS may *correctly* report less than 640k of base
+# memory if the extended BIOS data area is located at the top of base memory
+# (as is the case on most recent systems).
+#options       REALBASEMEM=639         # size of base memory (in KB)
+#options       REALEXTMEM=15360        # size of extended memory (in KB)
+
+# Standard system options
+
+options        UCONSOLE        # users can use TIOCCONS (for xconsole)
+options        INSECURE        # disable kernel security levels
+
+options        RTC_OFFSET=0    # hardware clock is this many mins. west of GMT
+options        NTP             # NTP phase/frequency locked loop
+
+options        KTRACE          # system call tracing via ktrace(1)
+
+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        LKM             # loadable kernel modules
+
+# Diagnostic/debugging support options
+options        DIAGNOSTIC      # cheap 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
+#makeoptions   DEBUG="-g"      # compile full symbol table
+
+# Compatibility options
+options        COMPAT_NOMID    # compatibility with 386BSD, BSDI, NetBSD 0.8,
+options        COMPAT_09       # NetBSD 0.9,
+options        COMPAT_10       # NetBSD 1.0,
+options        COMPAT_11       # NetBSD 1.1,
+options        COMPAT_12       # NetBSD 1.2,
+options        COMPAT_13       # NetBSD 1.3,
+options        COMPAT_14       # NetBSD 1.4,
+options        COMPAT_43       # and 4.3BSD
+options        COMPAT_386BSD_MBRPART # recognize old partition ID
+
+options        COMPAT_SVR4     # binary compatibility with SVR4
+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_PECOFF   # kernel support to run Win32 apps
+
+# File systems
+file-system    FFS             # UFS
+file-system    EXT2FS          # second extended file system (linux)
+file-system    LFS             # log-structured file system
+file-system    MFS             # memory file system
+file-system    NFS             # Network File System client
+file-system    NTFS            # Windows/NT file system (experimental)
+file-system    CD9660          # ISO 9660 + Rock Ridge file system
+file-system    MSDOSFS         # MS-DOS file system
+file-system    FDESC           # /dev/fd
+file-system    KERNFS          # /kern
+file-system    NULLFS          # loopback file system
+file-system    OVERLAY         # overlay file system
+file-system    PORTAL          # portal filesystem (still experimental)
+file-system    PROCFS          # /proc
+file-system    UMAPFS          # NULLFS + uid and gid remapping
+file-system    UNION           # union file system
+file-system    CODA            # Coda File System; also needs vcoda (below)
+
+# File system options
+options        QUOTA           # UFS quotas
+#options       FFS_EI          # FFS Endian Independent 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.
+
+# Networking options
+#options       GATEWAY         # packet forwarding
+options        INET            # IP + ICMP + TCP + UDP
+options        INET6           # IPV6
+#options       IPSEC           # IP security
+#options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
+#options       IPSEC_DEBUG     # debug for IP security
+#options       MROUTING        # IP multicast routing
+options        NS              # XNS
+#options       NSIP            # XNS tunneling over IP
+options        ISO,TPIP        # OSI
+#options       EON             # OSI tunneling over IP
+options        CCITT,LLC,HDLC  # X.25
+options        NETATALK        # AppleTalk networking protocols
+options        PPP_BSDCOMP     # BSD-Compress compression support for PPP
+options        PPP_DEFLATE     # Deflate compression support for PPP
+options        PPP_FILTER      # Active filter support for PPP (requires bpf)
+options        PFIL_HOOKS      # pfil(9) packet filter hooks
+options        IPFILTER_LOG    # ipmon(8) log support
+
+# Compatibility with 4.2BSD implementation of TCP/IP.  Not recommended.
+#options       TCP_COMPAT_42
+
+# 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        MIIVERBOSE      # verbose PHY autoconfig messages
+options        PCIVERBOSE      # verbose PCI device autoconfig messages
+#options       PCI_CONFIG_DUMP # verbosely dump PCI config space
+#options       PCMCIAVERBOSE   # verbose PCMCIA configuration messages
+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       I2OVERBOSE      # verbose I2O driver messages
+
+options        NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
+
+#
+# wscons options
+#
+# builtin terminal emulations
+#options       WSEMUL_SUN              # sun terminal emulation
+options        WSEMUL_VT100            # VT100 / VT220 emulation
+# different kernel output - see dev/wscons/wsdisplayvar.h
+options        WS_KERNEL_FG=WSCOL_GREEN
+#options       WS_KERNEL_BG=WSCOL_BLACK
+# compatibility to other console drivers
+options        WSDISPLAY_COMPAT_PCVT           # emulate some ioctls
+options        WSDISPLAY_COMPAT_SYSCONS        # emulate some ioctls
+options        WSDISPLAY_COMPAT_USL            # VT handling
+options        WSDISPLAY_COMPAT_RAWKBD         # can get raw scancodes
+# see dev/pckbc/wskbdmap_mfii.c for implemented layouts
+#options       PCKBD_LAYOUT="(KB_DE | KB_NODEAD)"
+# allocate a number of virtual screens at autoconfiguration time
+#options       WSDISPLAY_DEFAULTSCREENS=4
+# use a large software cursor that doesn't blink
+options        PCDISPLAY_SOFTCURSOR
+# modify the screen type of the console; defaults to "80x25"
+#options       VGA_CONSOLE_SCREENTYPE="\"80x24\""
+
+# Kernel root file system and dump configuration.
+config         netbsd  root on ? type ?
+#config                netbsd  root on sd0a type ffs
+#config                netbsd  root on ? type nfs
+
+#
+# Device configuration
+#
+
+mainbus0 at root
+
+#apm0  at mainbus0                     # Advanced power management
+
+# Tuning for power management, see apm(4) for more details.
+#options       APM_NO_IDLE             # Don't call BIOS CPU idle function
+#options       APM_V10_ONLY            # Use only the APM 1.0 calls
+#options       APM_NO_POWEROFF         # Don't power off on halt(8)
+#options       APM_POWER_PRINT         # Print stats on the console
+#options       APM_DISABLE_INTERRUPTS=0 # Don't disable interrupts
+
+
+# Basic Bus Support
+
+# Plug-and-Play BIOS and attached devices
+
+#pnpbios*      at mainbus?
+
+# mainboard audio chips
+#ess*          at pnpbios? index ?     # ESS AudioDrive
+#sb*           at pnpbios? index ?     # NeoMagic 256AV in sb mode
+#wss*          at pnpbios? index ?     # NeoMagic 256AV in wss mode
+#ym*           at pnpbios? index ?     # OPL3-SA3
+
+# com port
+# If enabled, consider changing "com0", "com1", and "com2" under "ISA Serial
+# Interfaces" to "com*", otherwise com2 will attach at pnpbios? and there
+# will be no com0.  A side effect is pcmcia (and other) com? previously
+# starting at com3 may attach as com1 or com2.
+#com*          at pnpbios? index ?     # serial ports
+
+# parallel port
+# The above "com*" comments apply, cf. "lpt0" under "ISA parallel
+# "printer interfaces".
+#lpt*          at pnpbios? index ?     # parallel ports
+
+#pckbc*                at pnpbios? index ?     # PC keyboard/mouse controller
+#fdc*          at pnpbios? index ?     # floppy controller
+
+# IDE controller on Toshiba Portege 3000 series (crippled PCI device)
+#pciide*       at pnpbios? index ?
+
+# PCI bus support
+pci*   at mainbus? bus ?
+pci*   at pchb? bus ?
+pci*   at ppb? bus ?
+
+# Configure PCI using BIOS information
+options        PCIBIOS                 # PCI BIOS support
+#options       PCIBIOSVERBOSE          # PCI BIOS verbose info
+options        PCIBIOS_ADDR_FIXUP      # fixup PCI I/O addresses
+options        PCIBIOS_BUS_FIXUP       # fixup PCI bus numbering
+options        PCIBIOS_INTR_FIXUP      # fixup PCI interrupt routing
+#options       PCIBIOS_IRQS_HINT=0x0a00 # PCI interrupts hint. IRQ 9 or 11
+options        PCIBIOS_INTR_GUESS      # see pcibios(4)
+#options       PCIINTR_DEBUG           # super-verbose PCI interrupt fixup
+
+# PCI bridges
+pchb*  at pci? dev ? function ?        # PCI-Host bridges
+pceb*  at pci? dev ? function ?        # PCI-EISA bridges
+pcib*  at pci? dev ? function ?        # PCI-ISA 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
+
+# EISA bus support
+#eisa* at mainbus?
+#eisa* at pceb?
+
+# ISA bus support
+isa*   at mainbus?
+isa*   at pceb?
+isa*   at pcib?
+
+# PCMCIA bus support
+#pcmcia*       at pcic? controller ? socket ?
+#pcmcia*       at tcic? controller ? socket ?
+
+# ISA PCMCIA controllers
+#pcic0 at isa? port 0x3e0 iomem 0xd0000 iosiz 0x10000
+#pcic1 at isa? port 0x3e2 iomem 0xe0000 iosiz 0x4000
+#tcic0 at isa? port 0x240 iomem 0xd0000 iosiz 0x10000
+
+# PCI PCMCIA controllers
+#pcic0 at pci? dev? function ?
+
+# ISA Plug-and-Play bus support
+#isapnp0       at isa?
+
+# ISA Plug-and-Play PCMCIA controllers
+#pcic* at isapnp?
+
+# CardBus bridge support
+cbb*           at pci? dev ? function ?
+cardslot*      at cbb? 
+
+# CardBus bus support
+cardbus*       at cardslot?
+pcmcia*                at cardslot?
+
+# Coprocessor Support
+
+# Math Coprocessor support
+npx0   at isa? port 0xf0 irq 13        # x86 math coprocessor
+
+
+# Console Devices
+
+# ISA console
+#pc0   at isa? port 0x60 irq 1         # pccons generic PC console driver



Home | Main Index | Thread Index | Old Index