Date: Thu, 4 Apr 2002 12:12:55 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 9049 for review Message-ID: <200204042012.g34KCtg37849@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9049 Change 9049 by jhb@jhb_laptop on 2002/04/04 12:12:37 IFC. Affected files ... ... //depot/projects/smpng/sys/alpha/alpha/machdep.c#36 integrate ... //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#7 integrate ... //depot/projects/smpng/sys/boot/efi/loader/Makefile#6 integrate ... //depot/projects/smpng/sys/coda/coda_psdev.c#6 integrate ... //depot/projects/smpng/sys/compat/linux/linux_signal.c#4 integrate ... //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#5 integrate ... //depot/projects/smpng/sys/conf/NOTES#3 integrate ... //depot/projects/smpng/sys/conf/majors#7 integrate ... //depot/projects/smpng/sys/dev/bge/if_bge.c#10 integrate ... //depot/projects/smpng/sys/dev/bge/if_bgereg.h#4 integrate ... //depot/projects/smpng/sys/dev/my/if_my.c#1 branch ... //depot/projects/smpng/sys/dev/my/if_myreg.h#1 branch ... //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#6 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi.c#28 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pccard.c#2 integrate ... //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/smpng/sys/dev/wi/if_wireg.h#10 integrate ... //depot/projects/smpng/sys/dev/wi/if_wivar.h#2 integrate ... //depot/projects/smpng/sys/geom/geom.h#4 integrate ... //depot/projects/smpng/sys/geom/geom_bsd.c#5 integrate ... //depot/projects/smpng/sys/geom/geom_dev.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_disk.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_dump.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_event.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_int.h#2 integrate ... //depot/projects/smpng/sys/geom/geom_io.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_mbr.c#4 integrate ... //depot/projects/smpng/sys/geom/geom_pc98.c#2 integrate ... //depot/projects/smpng/sys/geom/geom_slice.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_slice.h#3 integrate ... //depot/projects/smpng/sys/geom/geom_subr.c#3 integrate ... //depot/projects/smpng/sys/geom/geom_sunlabel.c#4 integrate ... //depot/projects/smpng/sys/i386/conf/Makefile#2 integrate ... //depot/projects/smpng/sys/i386/conf/NOTES#33 integrate ... //depot/projects/smpng/sys/i386/i386/autoconf.c#10 integrate ... //depot/projects/smpng/sys/i386/i386/machdep.c#32 integrate ... //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.c#4 integrate ... //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#17 integrate ... //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#8 integrate ... //depot/projects/smpng/sys/ia64/ia64/autoconf.c#8 integrate ... //depot/projects/smpng/sys/ia64/ia64/machdep.c#33 integrate ... //depot/projects/smpng/sys/ia64/ia64/trap.c#26 integrate ... //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#11 integrate ... //depot/projects/smpng/sys/ia64/include/elf.h#5 integrate ... //depot/projects/smpng/sys/kern/kern_prot.c#56 integrate ... //depot/projects/smpng/sys/kern/kern_sig.c#27 integrate ... //depot/projects/smpng/sys/kern/subr_eventhandler.c#6 integrate ... //depot/projects/smpng/sys/kern/subr_trap.c#32 integrate ... //depot/projects/smpng/sys/kern/vfs_aio.c#17 integrate ... //depot/projects/smpng/sys/net/bpf.c#12 integrate ... //depot/projects/smpng/sys/net/bsd_comp.c#4 integrate ... //depot/projects/smpng/sys/net/ethernet.h#5 integrate ... //depot/projects/smpng/sys/net/if_arcsubr.c#3 integrate ... //depot/projects/smpng/sys/net/if_ethersubr.c#15 integrate ... //depot/projects/smpng/sys/net/if_loop.c#8 integrate ... //depot/projects/smpng/sys/net/if_ppp.c#13 integrate ... //depot/projects/smpng/sys/net/if_sl.c#12 integrate ... //depot/projects/smpng/sys/net/if_tap.c#12 integrate ... //depot/projects/smpng/sys/net/if_tun.c#11 integrate ... //depot/projects/smpng/sys/net/if_vlan.c#9 integrate ... //depot/projects/smpng/sys/net/ppp_deflate.c#4 integrate ... //depot/projects/smpng/sys/pc98/i386/machdep.c#28 integrate ... //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#23 integrate ... //depot/projects/smpng/sys/sys/disklabel.h#12 integrate ... //depot/projects/smpng/sys/sys/param.h#19 integrate ... //depot/projects/smpng/sys/sys/proc.h#42 integrate ... //depot/projects/smpng/sys/sys/signalvar.h#7 integrate ... //depot/projects/smpng/sys/ufs/ffs/ffs_tables.c#2 integrate ... //depot/projects/smpng/sys/ufs/ffs/fs.h#5 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#36 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.171 2002/04/02 22:19:14 jhb Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.172 2002/04/04 17:49:44 bde Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1471,6 +1471,7 @@ */ SIGSETOLD(p->p_sigmask, ksc.sc_mask); SIG_CANTMASK(p->p_sigmask); + signotify(p); PROC_UNLOCK(p); set_regs(td, (struct reg *)ksc.sc_regs); @@ -1553,6 +1554,7 @@ p->p_sigmask = uc.uc_sigmask; SIG_CANTMASK(p->p_sigmask); + signotify(p); PROC_UNLOCK(p); /* XXX ksc.sc_ownedfp ? */ ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#7 (text+ko) ==== @@ -30,7 +30,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.15 2002/03/20 18:58:46 obrien Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.16 2002/04/04 17:49:44 bde Exp $ */ #include <sys/param.h> @@ -491,11 +491,13 @@ case OSF1_SIG_UNBLOCK: SIGSETNAND(p->p_sigmask, bss); + signotify(p); break; case OSF1_SIG_SETMASK: p->p_sigmask = bss; SIG_CANTMASK(p->p_sigmask); + signotify(p); break; default: @@ -729,6 +731,7 @@ */ osf1_to_bsd_sigset(&ksc.sc_mask, &p->p_sigmask); SIG_CANTMASK(p->p_sigmask); + signotify(p); PROC_UNLOCK(p); set_regs(td, (struct reg *)ksc.sc_regs); ==== //depot/projects/smpng/sys/boot/efi/loader/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.10 2002/03/31 20:48:13 marcel Exp $ +# $FreeBSD: src/sys/boot/efi/loader/Makefile,v 1.11 2002/04/04 06:04:38 peter Exp $ .PATH: ${.CURDIR}/../common @@ -33,7 +33,7 @@ CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR} CFLAGS+= -I${.CURDIR}/../../.. -I. CFLAGS+= -I${.CURDIR}/../libefi -CFLAGS+= -I/usr/src/lib/libstand +CFLAGS+= -I${.CURDIR}/../../../../lib/libstand CFLAGS+= -DLOADER LDSCRIPT= ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/ldscript.${MACHINE_ARCH} ==== //depot/projects/smpng/sys/coda/coda_psdev.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_psdev.c,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_psdev.c,v 1.21 2001/12/10 08:09:40 obrien Exp $ + * $FreeBSD: src/sys/coda/coda_psdev.c,v 1.22 2002/04/04 17:49:44 bde Exp $ * */ @@ -602,6 +602,7 @@ } } while (error && i++ < 128 && VC_OPEN(vcp)); p->p_sigmask = psig_omask; + signotify(p); PROC_UNLOCK(p); #else (void) tsleep(&vmp->vm_sleep, coda_call_sleep, "coda_call", 0); ==== //depot/projects/smpng/sys/compat/linux/linux_signal.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.32 2001/09/12 08:36:57 julian Exp $ + * $FreeBSD: src/sys/compat/linux/linux_signal.c,v 1.33 2002/04/04 17:49:45 bde Exp $ */ #include <sys/param.h> @@ -256,10 +256,12 @@ break; case LINUX_SIG_UNBLOCK: SIGSETNAND(p->p_sigmask, mask); + signotify(p); break; case LINUX_SIG_SETMASK: p->p_sigmask = mask; SIG_CANTMASK(p->p_sigmask); + signotify(p); break; default: error = EINVAL; @@ -377,6 +379,7 @@ linux_to_bsd_sigset(&lset, &bset); p->p_sigmask = bset; SIG_CANTMASK(p->p_sigmask); + signotify(p); PROC_UNLOCK(p); return (0); } ==== //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/svr4/svr4_signal.c,v 1.17 2002/03/20 05:41:38 alfred Exp $ + * $FreeBSD: src/sys/compat/svr4/svr4_signal.c,v 1.18 2002/04/04 17:49:45 bde Exp $ */ #include <sys/param.h> @@ -531,11 +531,13 @@ case SVR4_SIG_UNBLOCK: SIGSETNAND(td->td_proc->p_sigmask, bss); + signotify(td->td_proc); break; case SVR4_SIG_SETMASK: td->td_proc->p_sigmask = bss; SIG_CANTMASK(td->td_proc->p_sigmask); + signotify(td->td_proc); break; default: ==== //depot/projects/smpng/sys/conf/NOTES#3 (text+ko) ==== @@ -11,15 +11,11 @@ # Please use ``make LINT'' to create an old-style LINT file if you want to # do kernel test-builds. # -# $FreeBSD: src/sys/conf/NOTES,v 1.1015 2002/04/03 10:56:53 ru Exp $ +# This file contains machine independent kernel configuration notes. For +# machine dependent notes, look in /sys/<arch>/conf/NOTES. # - +# $FreeBSD: src/sys/conf/NOTES,v 1.1017 2002/04/04 18:01:55 brian Exp $ # -# This directive is mandatory; it defines the architecture to be -# configured for; in this case, the 386 family based IBM-PC and -# compatibles. -# -machine i386 # # This is the ``identification'' of the kernel. Usually this should @@ -90,7 +86,7 @@ # Options for the VM subsystem options PQ_CACHESIZE=512 # color for 512k/16k cache -options KSTACK_PAGES=3 # number of 4k stack pages per process +options KSTACK_PAGES=3 # number of stack pages per process # Deprecated options supported for backwards compatibility #options PQ_NOOPT # No coloring #options PQ_LARGECACHE # color for 512k/16k cache @@ -120,32 +116,10 @@ # SMP OPTIONS: # # SMP enables building of a Symmetric MultiProcessor Kernel. -# APIC_IO enables the use of the IO APIC for Symmetric I/O. -# -# Notes: -# -# An SMP kernel will ONLY run on an Intel MP spec. qualified motherboard. -# -# Be sure to disable 'cpu I386_CPU' && 'cpu I486_CPU' for SMP kernels. -# -# Check the 'Rogue SMP hardware' section to see if additional options -# are required by your hardware. -# # Mandatory: options SMP # Symmetric MultiProcessor Kernel -options APIC_IO # Symmetric (APIC) I/O -# -# Rogue SMP hardware: -# - -# Bridged PCI cards: -# -# The MP tables of most of the current generation MP motherboards -# do NOT properly support bridged PCI cards. To use one of these -# cards you should refer to ??? - # SMP Debugging Options: # # MUTEX_DEBUG enables various extra assertions in the mutex code. @@ -162,140 +136,6 @@ ##################################################################### -# CPU OPTIONS - -# -# You must specify at least one CPU (the one you intend to run on); -# deleting the specification for CPUs you don't need to use may make -# parts of the system run faster. -# I386_CPU is mutually exclusive with the other CPU types. -# -#cpu I386_CPU -cpu I486_CPU -cpu I586_CPU # aka Pentium(tm) -cpu I686_CPU # aka Pentium Pro(tm) - -# -# Options for CPU features. -# -# CPU_ATHLON_SSE_HACK tries to enable SSE instructions when the BIOS has -# forgotten to enable them. -# -# CPU_BLUELIGHTNING_FPU_OP_CACHE enables FPU operand cache on IBM -# BlueLightning CPU. It works only with Cyrix FPU, and this option -# should not be used with Intel FPU. -# -# CPU_BLUELIGHTNING_3X enables triple-clock mode on IBM Blue Lightning -# CPU if CPU supports it. The default is double-clock mode on -# BlueLightning CPU box. -# -# CPU_BTB_EN enables branch target buffer on Cyrix 5x86 (NOTE 1). -# -# CPU_DIRECT_MAPPED_CACHE sets L1 cache of Cyrix 486DLC CPU in direct -# mapped mode. Default is 2-way set associative mode. -# -# CPU_CYRIX_NO_LOCK enables weak locking for the entire address space -# of Cyrix 6x86 and 6x86MX CPUs by setting the NO_LOCK bit of CCR1. -# Otherwise, the NO_LOCK bit of CCR1 is cleared. (NOTE 3) -# -# CPU_DISABLE_5X86_LSSER disables load store serialize (i.e. enables -# reorder). This option should not be used if you use memory mapped -# I/O device(s). -# -# CPU_ENABLE_SSE enables SSE/MMX2 instructions support. -# -# CPU_FASTER_5X86_FPU enables faster FPU exception handler. -# -# CPU_I486_ON_386 enables CPU cache on i486 based CPU upgrade products -# for i386 machines. -# -# CPU_IORT defines I/O clock delay time (NOTE 1). Default values of -# I/O clock delay time on Cyrix 5x86 and 6x86 are 0 and 7,respectively -# (no clock delay). -# -# CPU_L2_LATENCY specifed the L2 cache latency value. This option is used -# only when CPU_PPRO2CELERON is defined and Mendocino Celeron is detected. -# The default value is 5. -# -# CPU_LOOP_EN prevents flushing the prefetch buffer if the destination -# of a jump is already present in the prefetch buffer on Cyrix 5x86(NOTE -# 1). -# -# CPU_PPRO2CELERON enables L2 cache of Mendocino Celeron CPUs. This option -# is useful when you use Socket 8 to Socket 370 converter, because most Pentium -# Pro BIOSs do not enable L2 cache of Mendocino Celeron CPUs. -# -# CPU_RSTK_EN enables return stack on Cyrix 5x86 (NOTE 1). -# -# CPU_SUSP_HLT enables suspend on HALT. If this option is set, CPU -# enters suspend mode following execution of HALT instruction. -# -# CPU_UPGRADE_HW_CACHE eliminates unneeded cache flush instruction(s). -# -# CPU_WT_ALLOC enables write allocation on Cyrix 6x86/6x86MX and AMD -# K5/K6/K6-2 cpus. -# -# CYRIX_CACHE_WORKS enables CPU cache on Cyrix 486 CPUs with cache -# flush at hold state. -# -# CYRIX_CACHE_REALLY_WORKS enables (1) CPU cache on Cyrix 486 CPUs -# without cache flush at hold state, and (2) write-back CPU cache on -# Cyrix 6x86 whose revision < 2.7 (NOTE 2). -# -# NO_F00F_HACK disables the hack that prevents Pentiums (and ONLY -# Pentiums) from locking up when a LOCK CMPXCHG8B instruction is -# executed. This option is only needed if I586_CPU is also defined, -# and should be included for any non-Pentium CPU that defines it. -# -# NO_MEMORY_HOLE is an optimisation for systems with AMD K6 processors -# which indicates that the 15-16MB range is *definitely* not being -# occupied by an ISA memory hole. -# -# NOTE 1: The options, CPU_BTB_EN, CPU_LOOP_EN, CPU_IORT, -# CPU_LOOP_EN and CPU_RSTK_EN should not be used because of CPU bugs. -# These options may crash your system. -# -# NOTE 2: If CYRIX_CACHE_REALLY_WORKS is not set, CPU cache is enabled -# in write-through mode when revision < 2.7. If revision of Cyrix -# 6x86 >= 2.7, CPU cache is always enabled in write-back mode. -# -# NOTE 3: This option may cause failures for software that requires -# locked cycles in order to operate correctly. -# -options CPU_ATHLON_SSE_HACK -options CPU_BLUELIGHTNING_FPU_OP_CACHE -options CPU_BLUELIGHTNING_3X -options CPU_BTB_EN -options CPU_DIRECT_MAPPED_CACHE -options CPU_DISABLE_5X86_LSSER -options CPU_ENABLE_SSE -options CPU_FASTER_5X86_FPU -options CPU_I486_ON_386 -options CPU_IORT -options CPU_L2_LATENCY=5 -options CPU_LOOP_EN -options CPU_PPRO2CELERON -options CPU_RSTK_EN -options CPU_SUSP_HLT -options CPU_UPGRADE_HW_CACHE -options CPU_WT_ALLOC -options CYRIX_CACHE_WORKS -options CYRIX_CACHE_REALLY_WORKS -#options NO_F00F_HACK - -# -# A math emulator is mandatory if you wish to run on hardware which -# does not have a floating-point processor. Pick either the original, -# bogus (but freely-distributable) math emulator, or a much more -# fully-featured but GPL-licensed emulator taken from Linux. -# -options MATH_EMULATE #Support for x87 emulation -# Don't enable both of these in a real config. -options GPL_MATH_EMULATE #Support for x87 emulation via - #new math emulator - - -##################################################################### # COMPATIBILITY OPTIONS # @@ -412,13 +252,6 @@ #options RESTARTABLE_PANICS # -# PERFMON causes the driver for Pentium/Pentium Pro performance counters -# to be compiled. See perfmon(4) for more information. -# -options PERFMON - - -# # This option let some drivers co-exist that can't co-exist in a running # system. This is used to be able to compile all kernel code in one go for # quality assurance purposes (like this file, which the option takes it name @@ -693,25 +526,6 @@ device hea #Efficient ENI-155p ATM PCI device hfa #FORE PCA-200E ATM PCI -# -# DEVICE_POLLING adds support for mixed interrupt-polling handling -# of network device drivers, which has significant benefits in terms -# of robustness to overloads and responsivity, as well as permitting -# accurate scheduling of the CPU time between kernel network processing -# and other activities. The drawback is a moderate (up to 1/HZ seconds) -# potential increase in response times. -# It is strongly recommended to use HZ=1000 or 2000 with DEVICE_POLLING -# to achieve smoother behaviour. -# Additionally, you can enable/disable polling at runtime with the -# sysctl variable kern.polling.enable (defaults off), and select -# the CPU fraction reserved to userland with the sysctl variable -# kern.polling.user_frac (default 50, range 0..100). -# -# Only the "dc" "fxp" and "sis" devices support this mode of operation at -# the time of this writing. - -options DEVICE_POLLING - ##################################################################### # FILESYSTEM OPTIONS @@ -879,20 +693,6 @@ options HZ=100 -# The following options are used for debugging clock behavior only, and -# should not be used for production systems. -# -# CLK_CALIBRATION_LOOP will run the clock calibration loop at startup -# until the user presses a key. - -options CLK_CALIBRATION_LOOP - -# The following two options measure the frequency of the corresponding -# clock relative to the RTC (onboard mc146818a). - -options CLK_USE_I8254_CALIBRATION -options CLK_USE_TSC_CALIBRATION - ##################################################################### # SCSI DEVICES @@ -1060,8 +860,6 @@ device pty #Pseudo ttys device nmdm #back-to-back tty devices -device speaker #Play IBM BASIC-style noises out your speaker -device gzip #Exec gzipped a.out's device md #Memory/malloc disk device snp #Snoop device - to look at pty/vty/etc.. device ccd #Concatenated disk driver @@ -1090,46 +888,11 @@ ##################################################################### # HARDWARE BUS CONFIGURATION -# ISA, EISA, MCA and PCI bus: - # -# Mandatory ISA devices: isa, npx +# ISA bus # device isa -# -# Options for `isa': -# -# AUTO_EOI_1 enables the `automatic EOI' feature for the master 8259A -# interrupt controller. This saves about 0.7-1.25 usec for each interrupt. -# This option breaks suspend/resume on some portables. -# -# AUTO_EOI_2 enables the `automatic EOI' feature for the slave 8259A -# interrupt controller. This saves about 0.7-1.25 usec for each interrupt. -# Automatic EOI is documented not to work for for the slave with the -# original i8259A, but it works for some clones and some integrated -# versions. -# -# MAXMEM specifies the amount of RAM on the machine; if this is not -# specified, FreeBSD will first read the amount of memory from the CMOS -# RAM, so the amount of memory will initially be limited to 64MB or 16MB -# depending on the BIOS. If the BIOS reports 64MB, a memory probe will -# then attempt to detect the installed amount of RAM. If this probe -# fails to detect >64MB RAM you will have to use the MAXMEM option. -# The amount is in kilobytes, so for a machine with 128MB of RAM, it would -# be 131072 (128 * 1024). -# -# BROKEN_KEYBOARD_RESET disables the use of the keyboard controller to -# reset the CPU for reboot. This is needed on some systems with broken -# keyboard controllers. - -options COMPAT_OLDISA #Use ISA shims and glue for old drivers -options AUTO_EOI_1 -#options AUTO_EOI_2 - -options MAXMEM="(128*1024)" -#options BROKEN_KEYBOARD_RESET - # Enable support for the kernel PLL to use an external PPS signal, # under supervision of [x]ntpd(8) # More info in ntpd documentation: http://www.eecis.udel.edu/~ntp @@ -1141,35 +904,9 @@ # for too long. You can make the system more resistant to this by # choosing a high value for NTIMECOUNTER. The default is 5, there # is no upper limit but more than a couple of hundred are not productive. -# A better strategy may be to sysctl -w kern.timecounter.method=1 options NTIMECOUNTER=20 -# -# EISA bus -# -# The EISA bus device is `eisa'. It provides auto-detection and -# configuration support for all devices on the EISA bus. - -device eisa - -# By default, only 10 EISA slots are probed, since the slot numbers -# above clash with the configuration address space of the PCI subsystem, -# and the EISA probe is not very smart about this. This is sufficient -# for most machines, but in particular the HP NetServer LC series comes -# with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11, -# thus you need to bump this figure to 12 for them. -options EISA_SLOTS=12 - -# -# MCA bus: -# -# The MCA bus device is `mca'. It provides auto-detection and -# configuration support for all devices on the MCA bus. -# No hints are required for MCA. - -device mca - # # PCI bus & PCI options: # @@ -1179,21 +916,10 @@ device pci -# -# AGP GART support -device agp - -# PCI options -# -#Enable pci resources left off by a "lazy" BIOS: -options PCI_ENABLE_IO_MODES - ##################################################################### # HARDWARE DEVICE CONFIGURATION -# EISA support is available for some device, so they can be auto-probed. -# MicroChannel (MCA) support is available for some devices. # For ISA the required hints are listed. # EISA, MCA, PCI and pccard are self identifying buses, so no hints # are needed. @@ -1202,101 +928,6 @@ # Mandatory devices: # -# The keyboard controller; it controls the keyboard and the PS/2 mouse. -device atkbdc 1 -hint.atkbdc.0.at="isa" -hint.atkbdc.0.port="0x060" - -# The AT keyboard -device atkbd -hint.atkbd.0.at="atkbdc" -hint.atkbd.0.irq="1" - -# Options for atkbd: -options ATKBD_DFLT_KEYMAP # specify the built-in keymap -makeoptions ATKBD_DFLT_KEYMAP="jp.106" - -# These options are valid for other keyboard drivers as well. -options KBD_DISABLE_KEYMAP_LOAD # refuse to load a keymap -options KBD_INSTALL_CDEV # install a CDEV entry in /dev - -# `flags' for atkbd: -# 0x01 Force detection of keyboard, else we always assume a keyboard -# 0x02 Don't reset keyboard, useful for some newer ThinkPads -# 0x03 Force detection and avoid reset, might help with certain -# dockingstations -# 0x04 Old-style (XT) keyboard support, useful for older ThinkPads - -# PS/2 mouse -device psm -hint.psm.0.at="atkbdc" -hint.psm.0.irq="12" - -# Options for psm: -options PSM_HOOKRESUME #hook the system resume event, useful - #for some laptops -options PSM_RESETAFTERSUSPEND #reset the device at the resume event - -# The video card driver. -device vga -hint.vga.0.at="isa" - -# Options for vga: -# Try the following option if the mouse pointer is not drawn correctly -# or font does not seem to be loaded properly. May cause flicker on -# some systems. -options VGA_ALT_SEQACCESS - -# If you can dispense with some vga driver features, you may want to -# use the following options to save some memory. -#options VGA_NO_FONT_LOADING # don't save/load font -#options VGA_NO_MODE_CHANGE # don't change video modes - -# Older video cards may require this option for proper operation. -options VGA_SLOW_IOACCESS # do byte-wide i/o's to TS and GDC regs - -# The following option probably won't work with the LCD displays. -options VGA_WIDTH90 # support 90 column modes - -# To include support for VESA video modes -options VESA - -options FB_DEBUG # Frame buffer debugging -options FB_INSTALL_CDEV # install a CDEV entry in /dev - -# Splash screen at start up! Screen savers require this too. -device splash - -# Various screen savers. -device apm_saver # Requires APM -device blank_saver -device daemon_saver -device fade_saver -device fire_saver -device green_saver -device logo_saver -device rain_saver -device star_saver -device warp_saver - -# The pcvt console driver (vt220 compatible). -device vt -hint.vt.0.at="isa" -options XSERVER # support for running an X server on vt -options FAT_CURSOR # start with block cursor -# This PCVT option is for keyboards such as those used on really old ThinkPads -options PCVT_SCANSET=2 -# Other PCVT options are documented in pcvt(4). -options PCVT_24LINESDEF -options PCVT_CTRL_ALT_DEL -options PCVT_META_ESC -options PCVT_NSCREENS=9 -options PCVT_PRETTYSCRNS -options PCVT_SCREENSAVER -options PCVT_USEKBDSEC -options PCVT_VT220KEYB -options PCVT_GREENSAVER - # The syscons console driver (sco color console compatible). device sc 1 hint.sc.0.at="isa" @@ -1336,65 +967,6 @@ # 0x80 Put the video card in the VESA 800x600 dots, 16 color mode # 0x100 Probe for a keyboard device periodically if one is not present -# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create -# the /dev/3dfx0 device to work with glide implementations. This should get -# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as -# the tdfx DRI module from XFree86 and is completely unrelated. -# -# To enable Linuxulator support, one must also include COMPAT_LINUX in the -# config as well, or you will not have the dependencies. The other option -# is to load both as modules. - -device tdfx # Enable 3Dfx Voodoo support -options TDFX_LINUX # Enable Linuxulator support - -# -# The Numeric Processing eXtension driver. In addition to this, you -# may configure a math emulator (see above). If your machine has a -# hardware FPU and the kernel configuration includes the npx device -# *and* a math emulator compiled into the kernel, the hardware FPU -# will be used, unless it is found to be broken or unless "flags" to -# npx0 includes "0x08", which requests preference for the emulator. -device npx -hint.npx.0.at="nexus" -hint.npx.0.port="0x0F0" -hint.npx.0.flags="0x0" -hint.npx.0.irq="13" - -# -# `flags' for npx0: -# 0x01 don't use the npx registers to optimize bcopy. -# 0x02 don't use the npx registers to optimize bzero. -# 0x04 don't use the npx registers to optimize copyin or copyout. -# 0x08 use emulator even if hardware FPU is available. -# The npx registers are normally used to optimize copying and zeroing when -# all of the following conditions are satisfied: -# I586_CPU is an option -# the cpu is an i586 (perhaps not a Pentium) -# the probe for npx0 succeeds -# INT 16 exception handling works. -# Then copying and zeroing using the npx registers is normally 30-100% faster. -# The flags can be used to control cases where it doesn't work or is slower. -# Setting them at boot time using userconfig works right (the optimizations -# are not used until later in the bootstrap when npx0 is attached). -# Flag 0x08 automatically disables the i586 optimized routines. -# - -# -# ACPI support using the Intel ACPI Component Architecture reference -# implementation. -# -# ACPI_DEBUG enables the use of the debug.acpi.level and debug.acpi.layer -# kernel environment variables to select initial debugging levels for the -# Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER -# defined when it is built). -# -# Note that building ACPI into the kernel is deprecated; the module is -# normally loaded automatically by the loader. -# -device acpica -options ACPI_DEBUG - # # Optional devices: # @@ -1402,17 +974,11 @@ # # SCSI host adapters: # -# adv: All Narrow SCSI bus AdvanSys controllers. # adw: Second Generation AdvanSys controllers including the ADV940UW. -# aha: Adaptec 154x/1535/1640 -# ahb: Adaptec 174x EISA controllers # ahc: Adaptec 274x/284x/2910/293x/294x/394x/3950x/3960x/398X/4944/ # 19160x/29160x, aic7770/aic78xx -# aic: Adaptec 6260/6360, APA-1460 (PC Card), NEC PC9801-100 (C-BUS) # amd: Support for the AMD 53C974 SCSI host adapter chip as found on devices # such as the Tekram DC-390(T). -# bt: Most Buslogic controllers: including BT-445, BT-54x, BT-64x, BT-74x, -# BT-75x, BT-946, BT-948, BT-956, BT-958, SDC3211B, SDC3211F, SDC3222F # isp: Qlogic ISP 1020, 1040 and 1040B PCI SCSI host adapters, # ISP 1240 Dual Ultra SCSI, ISP 1080 and 1280 (Dual) Ultra2, # ISP 12160 Ultra3 SCSI, @@ -1426,24 +992,8 @@ # 53C810, 53C810A, 53C815, 53C825, 53C825A, 53C860, 53C875, # 53C876, 53C885, 53C895, 53C895A, 53C896, 53C897, 53C1510D, # 53C1010-33, 53C1010-66. -# stg: TMC 18C30, 18C50 based SCSI host adapters. -# wds: WD7000 -# -# Note that the order is important in order for Buslogic ISA/EISA cards to be -# probed correctly. -# -device bt -hint.bt.0.at="isa" -hint.bt.0.port="0x330" -device adv -hint.adv.0.at="isa" device adw -device aha -hint.aha.0.at="isa" -device aic -hint.aic.0.at="isa" -device ahb device ahc device amd device isp @@ -1467,15 +1017,6 @@ device ncv device nsp device sym -device stg -hint.stg.0.at="isa" -hint.stg.0.port="0x140" -hint.stg.0.port="11" -device wds -hint.wds.0.at="isa" -hint.wds.0.port="0x350" -hint.wds.0.irq="11" -hint.wds.0.drq="6" # The aic7xxx driver will attempt to use memory mapped I/O for all PCI # controllers that have it configured only if this option is set. Unfortunately, @@ -1656,22 +1197,10 @@ hint.fd.1.at="fdc0" hint.fd.1.drive="1" -# M-systems DiskOnchip products see src/sys/contrib/dev/fla/README -device fla -hint.fla.0.at="isa" - -# -# Other standard PC hardware: # -# mse: Logitech and ATI InPort bus mouse ports # sio: serial ports (see sio(4)), including support for various # PC Card devices, such as Modem and NICs (see etc/defaults/pccard.conf) -device mse -hint.mse.0.at="isa" -hint.mse.0.port="0x23c" -hint.mse.0.irq="5" - device sio hint.sio.0.at="isa" hint.sio.0.port="0x3F8" @@ -1740,21 +1269,10 @@ # individual driver. device miibus -# an: Aironet 4500/4800 802.11 wireless adapters. Supports the PCMCIA, -# PCI and ISA varieties. -# ar: Arnet SYNC/570i hdlc sync 2/4 port V.35/X.21 serial driver -# (requires sppp) -# awi: Support for IEEE 802.11 PC Card devices using the AMD Am79C930 and -# Harris (Intersil) Chipset with PCnetMobile firmware by AMD. # bge: Support for gigabit ethernet adapters based on the Broadcom # BCM570x family of controllers, including the 3Com 3c996-T, # the Netgear GA302T, the SysKonnect SK-9D21 and SK-9D41, and # the embedded gigE NICs on Dell PowerEdge 2550 servers. -# cnw: Xircom CNW/Netware Airsurfer PC Card adapter -# cm: Arcnet SMC COM90c26 / SMC COM90c56 -# (and SMC COM90c66 in '56 compatibility mode) adapters. -# cs: IBM Etherjet and other Crystal Semi CS89x0-based adapters -# cx: Cronyx/Sigma multiport sync/async (with Cisco or PPP framing) # dc: Support for PCI fast ethernet adapters based on the DEC/Intel 21143 # and various workalikes including: # the ADMtek AL981 Comet and AN985 Centaur, the ASIX Electronics @@ -1767,27 +1285,11 @@ # LinkSys LNE100TX, LNE100TX V2.0, Jaton XpressNet, Alfa Inc GFC2204, # KNE110TX. # de: Digital Equipment DC21040 -# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 -# HP PC Lan+, various PC Card devices (refer to etc/defauls/pccard.conf) -# (requires miibus) -# el: 3Com 3C501 (slow!) # em: Intel Pro/1000 Gigabit Ethernet 82542, 82543, 82544 based adapters. -# ep: 3Com 3C509, 3C529, 3C556, 3C562D, 3C563D, 3C572, 3C574X, 3C579, 3C589 -# and PC Card devices using these chipsets. -# ex: Intel EtherExpress Pro/10 and other i82595-based adapters, -# Olicom Ethernet PC Card devices. -# fe: Fujitsu MB86960A/MB86965A Ethernet -# fea: DEC DEFEA EISA FDDI adapter # fpa: Support for the Digital DEFPA PCI FDDI. `device fddi' is also needed. # fxp: Intel EtherExpress Pro/100B # (hint of prefer_iomap can be done to prefer I/O instead of Mem mapping) # gx: Intel Pro/1000 Gigabit Ethernet (82542, 82543-F, 82543-T) -# ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210; -# Intel EtherExpress -# le: Digital Equipment EtherWorks 2 and EtherWorks 3 (DEPCA, DE100, -# DE101, DE200, DE201, DE202, DE203, DE204, DE205, DE422) -# lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and -# Am79C960) # lge: Support for PCI gigabit ethernet adapters based on the Level 1 # LXT1001 NetCellerator chipset. This includes the D-Link DGE-500SX, # SMC TigerCard 1000 (SMC9462SX), and some Addtron cards. @@ -1796,12 +1298,6 @@ # SMC EZ Card 1000 (SMC9462TX), D-Link DGE-500T, Asante FriendlyNet # GigaNIX 1000TA and 1000TPC, the Addtron AEG320T, the LinkSys # EG1032 and EG1064, the Surecom EP-320G-TX and the Netgear GA622T. -# oltr: Olicom ISA token-ring adapters OC-3115, OC-3117, OC-3118 and OC-3133 -# (no hints needed). -# Olicom PCI token-ring adapters OC-3136, OC-3137, OC-3139, OC-3140, -# OC-3141, OC-3540, OC-3250 -# rdp: RealTek RTL 8002-based pocket ethernet adapters -# sbni: Granch SBNI12-xx ISA and PCI adapters # pcn: Support for PCI fast ethernet adapters based on the AMD Am79c97x # chipsets, including the PCnet/FAST, PCnet/FAST+, PCnet/PRO and # PCnet/Home. These were previously handled by the lnc driver (and @@ -1827,9 +1323,6 @@ # (also single mode and multimode). # The driver will autodetect the number of ports on the card and # attach each one as a separate network interface. -# sn: Support for ISA and PC Card Ethernet devices using the -# SMC91C90/92/94/95 chips. -# sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp) # ste: Sundance Technologies ST201 PCI fast ethernet controller, includes # the D-Link DFE-550TX. # ti: Support for PCI gigabit ethernet NICs based on the Alteon Networks @@ -1851,13 +1344,6 @@ # wb: Support for fast ethernet adapters based on the Winbond W89C840F chip. # Note: this is not the same as the Winbond W89C940F, which is a # NE2000 clone. -# wl: Lucent Wavelan (ISA card only). -# wi: Lucent WaveLAN/IEEE 802.11 PCMCIA adapters. Note: this supports both -# the PCMCIA and ISA cards: the ISA card is really a PCMCIA to ISA -# bridge with a PCMCIA adapter plugged into it. -# xe: Xircom/Intel EtherExpress Pro100/16 PC Card ethernet controller, -# Accton Fast EtherCard-16, Compaq Netelligent 10/100 PC Card, -# Toshiba 10/100 Ethernet PC Card, Xircom 16-bit Ethernet + Modem 56 # xl: Support for the 3Com 3c900, 3c905, 3c905B and 3c905C (Fast) # Etherlink XL cards and integrated controllers. This includes the # integrated 3c905B-TX chips in certain Dell Optiplex and Dell @@ -1865,94 +1351,6 @@ # in Dell Latitude laptop docking stations. # Also supported: 3Com 3c980(C)-TX, 3Com 3cSOHO100-TX, 3Com 3c450-TX -# Order for ISA/EISA devices is important here - -device ar 1 -hint.ar.0.at="isa" -hint.ar.0.port="0x300" -hint.ar.0.irq="10" -hint.ar.0.maddr="0xd0000" -device cm -hint.cm.0.at="isa" -hint.cm.0.port="0x2e0" -hint.cm.0.irq="9" -hint.cm.0.maddr="0xdc000" -device cs -hint.cs.0.at="isa" -hint.cs.0.port="0x300" -device cx 1 -hint.cx.0.at="isa" -hint.cx.0.port="0x240" -hint.cx.0.irq="15" -hint.cx.0.drq="7" -device ed -#options ED_NO_MIIBUS # Disable ed miibus support -hint.ed.0.at="isa" -hint.ed.0.port="0x280" -hint.ed.0.irq="5" -hint.ed.0.maddr="0xd8000" -device el 1 -hint.el.0.at="isa" -hint.el.0.port="0x300" -hint.el.0.irq="9" -device ep -device ex -device fe 1 -hint.fe.0.at="isa" -hint.fe.0.port="0x300" -device fea -device ie 2 -hint.ie.0.at="isa" -hint.ie.0.port="0x300" -hint.ie.0.irq="5" -hint.ie.0.maddr="0xd0000" -hint.ie.1.at="isa" >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204042012.g34KCtg37849>