PERFORCE change 48106 for review
Peter Wemm
peter at FreeBSD.org
Wed Mar 3 21:56:59 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=48106
Change 48106 by peter at peter_daintree on 2004/03/03 21:56:39
IFC @48104
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#38 integrate
.. //depot/projects/hammer/UPDATING#33 integrate
.. //depot/projects/hammer/UPDATING.64BTT#1 branch
.. //depot/projects/hammer/etc/defaults/rc.conf#21 integrate
.. //depot/projects/hammer/etc/rc.d/virecover#6 integrate
.. //depot/projects/hammer/etc/rc.subr#13 integrate
.. //depot/projects/hammer/gnu/usr.bin/tar/Makefile#4 integrate
.. //depot/projects/hammer/installworld_newk#1 branch
.. //depot/projects/hammer/installworld_oldk#1 branch
.. //depot/projects/hammer/lib/libc/stdlib/getopt_long.3#4 integrate
.. //depot/projects/hammer/lib/libc/stdlib/getopt_long.c#5 integrate
.. //depot/projects/hammer/lib/libc/sys/select.2#6 integrate
.. //depot/projects/hammer/sbin/ip6fw/Makefile#3 integrate
.. //depot/projects/hammer/sbin/ip6fw/ip6fw.c#8 integrate
.. //depot/projects/hammer/sbin/mount/mount.8#9 integrate
.. //depot/projects/hammer/sbin/umount/umount.8#6 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#35 integrate
.. //depot/projects/hammer/share/man/man4/acpi.4#20 integrate
.. //depot/projects/hammer/share/man/man4/acpi_video.4#1 branch
.. //depot/projects/hammer/share/man/man4/man4.i386/Makefile#15 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ct.4#1 branch
.. //depot/projects/hammer/share/misc/bsd-family-tree#13 integrate
.. //depot/projects/hammer/sys/amd64/conf/NOTES#5 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#7 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#6 integrate
.. //depot/projects/hammer/sys/conf/files#47 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#39 integrate
.. //depot/projects/hammer/sys/conf/kern.mk#16 integrate
.. //depot/projects/hammer/sys/conf/options.amd64#20 integrate
.. //depot/projects/hammer/sys/dev/acpica/Osd/OsdHardware.c#9 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi.c#24 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_acad.c#8 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_cpu.c#13 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_ec.c#14 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_lid.c#5 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pci.c#6 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_powerres.c#7 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#11 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_video.c#2 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpivar.h#20 integrate
.. //depot/projects/hammer/sys/dev/lnc/if_lnc.c#12 integrate
.. //depot/projects/hammer/sys/dev/lnc/if_lncvar.h#3 integrate
.. //depot/projects/hammer/sys/geom/concat/g_concat.c#2 integrate
.. //depot/projects/hammer/sys/geom/concat/g_concat.h#2 integrate
.. //depot/projects/hammer/sys/i386/conf/NOTES#32 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#34 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#17 integrate
.. //depot/projects/hammer/sys/modules/ndis/Makefile#3 integrate
.. //depot/projects/hammer/sys/netinet6/in6.c#9 integrate
.. //depot/projects/hammer/sys/vm/vm_page.h#12 integrate
.. //depot/projects/hammer/tools/regression/geom_concat/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/geom_concat/runtests.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_concat/test-1.sh#1 branch
.. //depot/projects/hammer/tools/regression/geom_concat/test-2.sh#1 branch
.. //depot/projects/hammer/usr.bin/chpass/chpass.1#3 integrate
.. //depot/projects/hammer/usr.sbin/mountd/mountd.8#4 integrate
.. //depot/projects/hammer/usr.sbin/mountd/mountd.c#8 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#38 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.405 2004/02/13 21:52:08 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.407 2004/03/03 22:56:41 gad Exp $
#
# Make command line options:
# -DNO_DYNAMICROOT do not link /bin and /sbin dynamically
@@ -343,11 +343,70 @@
.ORDER: ${WMAKE_TGTS}
#
+# Use this to add checks to installworld/installkernel targets.
+#
+SPECIAL_INSTALLCHECKS=
+
+#
+# The following install-time check will see if the installation will
+# change the type used for time_t, and if it will, the target makes
+# sure that the user is expecting to make that change.
+#
+.if ${TARGET_ARCH} == "sparc64"
+SPECIAL_INSTALLCHECKS+=sparc64_installcheck
+
+CUR_TIMETYPE!= grep __time_t /usr/include/machine/_types.h | awk '{print $$2}'
+SRC_TIMETYPE!= grep __time_t ${.CURDIR}/sys/sparc64/include/_types.h | awk '{print $$2}'
+NEWSPARC_TIMETYPE?=${CUR_TIMETYPE}
+THISHOST!= hostname -s
+.if ${THISHOST} == ""
+THISHOST="name not set yet"
+.endif
+
+sparc64_installcheck:
+.if ${CUR_TIMETYPE} != ${SRC_TIMETYPE}
+ @echo ""
+.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE}
+ @echo "*** ERROR: This target would change the type used for time_t! ***"
+.else
+ @echo "* Note: This installation changes the type used for time_t"
+.endif
+ @echo "* "
+ @echo "* This host (${THISHOST}) presently has a time_t of type ${CUR_TIMETYPE},"
+ @echo "* and this installation will switch time_t to be type ${SRC_TIMETYPE}."
+.if ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE}
+ @echo "* "
+ @echo "* If that is *NOT* what you wanted, then you need to change the"
+ @echo "* typedef for __time_t in: ${.CURDIR}/sys/sparc64/include/_types.h"
+ @echo "* from '${SRC_TIMETYPE}' to '${CUR_TIMETYPE}'. After that you *MUST* do a"
+ @echo "* complete cleanworld, buildworld, buildkernel before you retry"
+ @echo "* your 'make' command. Also read /usr/src/UPDATING.64BTT."
+ @echo "* "
+ @echo "* If that *is* what you want, then enter the commands:"
+ @echo " NEWSPARC_TIMETYPE=${SRC_TIMETYPE}"
+ @echo " export NEWSPARC_TIMETYPE"
+ @echo "* and repeat your 'make' command."
+ @echo ""
+ @false
+.endif
+ @echo ""
+.elif ${NEWSPARC_TIMETYPE} != ${SRC_TIMETYPE}
+ @echo ""
+ @echo "*** ERROR: The variable NEWSPARC_TIMETYPE is set to '${NEWSPARC_TIMETYPE}'"
+ @echo "*** but ${.CURDIR}/sys/sparc64/include/_types.h"
+ @echo "*** has __time_t defined as: '${SRC_TIMETYPE}'"
+ @false
+.else
+ @# in sparc64_installcheck, all TIMETYPEs == '${NEWSPARC_TIMETYPE}'
+.endif
+.endif
+
+#
# installcheck
#
# Checks to be sure system is ready for installworld
#
-installcheck:
+installcheck: ${SPECIAL_INSTALLCHECKS}
.if !defined(NO_SENDMAIL)
@if ! `id -u smmsp > /dev/null`; then \
echo "ERROR: Required smmsp user is missing, see /usr/src/UPDATING."; \
@@ -386,7 +445,7 @@
# and do a 'make reinstall' on the *client* to install new binaries from the
# most recent server build.
#
-reinstall:
+reinstall: ${SPECIAL_INSTALLCHECKS}
@echo "--------------------------------------------------------------"
@echo ">>> Making hierarchy"
@echo "--------------------------------------------------------------"
@@ -503,7 +562,8 @@
#
# Install the kernel defined by INSTALLKERNEL
#
-installkernel reinstallkernel installkernel.debug reinstallkernel.debug:
+installkernel installkernel.debug \
+reinstallkernel reinstallkernel.debug: ${SPECIAL_INSTALLCHECKS}
.if empty(INSTALLKERNEL)
@echo "ERROR: No kernel \"${KERNCONF}\" to install."
@false
==== //depot/projects/hammer/UPDATING#33 (text+ko) ====
@@ -17,7 +17,18 @@
developers choose to disable these features on build machines
to maximize performance.
-20040226:
+20040303:
+ If you are having trouble with the libc_r -> libpthread transition
+ (see the 20040130 entry), place the following lines at the top of
+ /etc/libmap.conf:
+
+ libc_r.so.5 libpthread.so.1
+ libc_r.so libpthread.so
+
+ This will cause all programs and libraries linked against libc_r
+ to use libpthread instead.
+
+20040226:
Some sshd configuration defaults have changed: protocol version 1
is no longer enabled by default, and password authentication is
disabled by default if PAM is enabled (which it is by default).
@@ -1519,4 +1530,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.296 2004/02/26 16:44:31 green Exp $
+$FreeBSD: src/UPDATING,v 1.297 2004/03/03 09:17:06 des Exp $
==== //depot/projects/hammer/etc/defaults/rc.conf#21 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.198 2004/02/03 11:26:08 des Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.199 2004/03/03 15:21:01 mtm Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -448,6 +448,7 @@
performance_throttle_state="HIGH" # Online throttling state
economy_cx_lowest="LOW" # Offline CPU idle state
economy_throttle_state="HIGH" # Offline throttling state
+virecover_enable="YES" # Perform housekeeping for the vi(1) editor
##############################################################
### Jail Configuration #######################################
==== //depot/projects/hammer/etc/rc.d/virecover#6 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: virecover,v 1.6 2002/03/22 04:34:00 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/virecover,v 1.7 2004/01/17 10:59:43 mtm Exp $
+# $FreeBSD: src/etc/rc.d/virecover,v 1.8 2004/03/03 15:21:01 mtm Exp $
#
# PROVIDE: virecover
@@ -14,6 +14,7 @@
. /etc/rc.subr
name="virecover"
+rcvar="`set_rcvar`"
stop_cmd=":"
start_cmd="virecover_start"
==== //depot/projects/hammer/etc/rc.subr#13 (text+ko) ====
@@ -1,5 +1,5 @@
# $NetBSD: rc.subr,v 1.60 2003/07/26 05:13:47 lukem Exp $
-# $FreeBSD: src/etc/rc.subr,v 1.24 2004/02/27 09:58:50 mtm Exp $
+# $FreeBSD: src/etc/rc.subr,v 1.25 2004/03/03 15:28:44 mtm Exp $
#
# Copyright (c) 1997-2002 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -267,7 +267,7 @@
fi
_proccheck='
- ps -o "pid,command" '"$_psargs"' |
+ ps 2>/dev/null -o "pid,command" '"$_psargs"' |
while read _npid '"$_fp_args"'; do
case "$_npid" in
PID)
==== //depot/projects/hammer/gnu/usr.bin/tar/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.21 2004/02/17 01:19:54 ache Exp $
+# $FreeBSD: src/gnu/usr.bin/tar/Makefile,v 1.22 2004/03/03 17:04:49 ru Exp $
TARDIR= ${.CURDIR}/../../../contrib/tar
.PATH: ${TARDIR}/lib ${TARDIR}/src
@@ -25,6 +25,7 @@
# "Rename" tar.1 to gtar.1 so that we can install gtar.1 with
# tar.1 as an optional link (rather than vice versa)
+CLEANFILES= gtar.1
gtar.1: tar.1
cat ${.CURDIR}/tar.1 > ${.TARGET}
==== //depot/projects/hammer/lib/libc/stdlib/getopt_long.3#4 (text+ko) ====
@@ -29,7 +29,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)getopt.3 8.5 (Berkeley) 4/27/95
-.\" $FreeBSD: src/lib/libc/stdlib/getopt_long.3,v 1.8 2004/03/01 17:57:05 ache Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/getopt_long.3,v 1.9 2004/03/03 08:29:00 ache Exp $
.\"
.Dd April 1, 2000
.Dt GETOPT_LONG 3
@@ -311,26 +311,26 @@
.\" to
.\" mean the preceding option takes an optional argument.
.\" .El
-.It
-Return value in case of missing argument if first character
-(after
-.Ql +
-or
-.Ql - )
-in option string is not
-.Ql \&: :
-.Bl -tag -width ".Bx"
-.It Tn GNU
-returns
-.Ql \&?
-.It Bx
-returns
-.Ql \&:
-(since
-.Bx Ns 's
-.Fn getopt
-does).
-.El
+.\" .It
+.\" Return value in case of missing argument if first character
+.\" (after
+.\" .Ql +
+.\" or
+.\" .Ql - )
+.\" in option string is not
+.\" .Ql \&: :
+.\" .Bl -tag -width ".Bx"
+.\" .It Tn GNU
+.\" returns
+.\" .Ql \&?
+.\" .It Bx
+.\" returns
+.\" .Ql \&:
+.\" (since
+.\" .Bx Ns 's
+.\" .Fn getopt
+.\" does).
+.\" .El
.\" .It
.\" Handling of
.\" .Ql --a
==== //depot/projects/hammer/lib/libc/stdlib/getopt_long.c#5 (text+ko) ====
@@ -62,7 +62,7 @@
#endif /* LIBC_SCCS and not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt_long.c,v 1.7 2004/03/03 03:05:21 ache Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/getopt_long.c,v 1.8 2004/03/03 08:29:00 ache Exp $");
#include <err.h>
#include <errno.h>
@@ -284,7 +284,11 @@
optopt = long_options[match].val;
else
optopt = 0;
+#ifdef GNU_COMPATIBLE
+ return (BADCH);
+#else
return (BADARG);
+#endif
}
if (long_options[match].has_arg == required_argument ||
long_options[match].has_arg == optional_argument) {
==== //depot/projects/hammer/lib/libc/sys/select.2#6 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)select.2 8.2 (Berkeley) 3/25/94
-.\" $FreeBSD: src/lib/libc/sys/select.2,v 1.26 2004/01/26 15:20:16 eivind Exp $
+.\" $FreeBSD: src/lib/libc/sys/select.2,v 1.27 2004/03/03 14:51:11 dds Exp $
.\"
.Dd November 17, 2002
.Dt SELECT 2
@@ -148,6 +148,14 @@
.Bl -tag -width Er
.It Bq Er EBADF
One of the descriptor sets specified an invalid descriptor.
+.It Bq Er EFAULT
+One of the arguments
+.Fa readfds ,
+.Fa writefds ,
+.Fa exceptfds ,
+or
+.Fa timeout
+points to an invalid address.
.It Bq Er EINTR
A signal was delivered before the time limit expired and
before any of the selected events occurred.
==== //depot/projects/hammer/sbin/ip6fw/Makefile#3 (text+ko) ====
@@ -1,7 +1,7 @@
-# $FreeBSD: src/sbin/ip6fw/Makefile,v 1.5 2004/02/23 20:13:52 johan Exp $
+# $FreeBSD: src/sbin/ip6fw/Makefile,v 1.6 2004/03/03 20:21:15 johan Exp $
PROG= ip6fw
-WARNS?= 0
+WARNS?= 2
MAN= ip6fw.8
.include <bsd.prog.mk>
==== //depot/projects/hammer/sbin/ip6fw/ip6fw.c#8 (text+ko) ====
@@ -48,7 +48,7 @@
* NEW command line interface for IP firewall facility
*
* $Id: ip6fw.c,v 1.1.2.2.2.2 1999/05/14 05:13:50 shin Exp $
- * $FreeBSD: src/sbin/ip6fw/ip6fw.c,v 1.16 2004/02/18 15:56:53 dwmalone Exp $
+ * $FreeBSD: src/sbin/ip6fw/ip6fw.c,v 1.17 2004/03/03 20:21:15 johan Exp $
*/
#include <sys/types.h>
@@ -68,6 +68,7 @@
#include <stdarg.h>
#include <string.h>
#include <time.h>
+#include <timeconv.h>
#include <unistd.h>
#include <errno.h>
#include <signal.h>
@@ -839,8 +840,6 @@
ifu->fu_via_ip6 = in6addr_any;
*byname = 0;
} else if (!isdigit(*arg)) {
- char *q;
-
*byname = 1;
strlcpy(ifu->fu_via_if.name, arg, sizeof(ifu->fu_via_if.name));
/*
==== //depot/projects/hammer/sbin/mount/mount.8#9 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mount.8 8.8 (Berkeley) 6/16/94
-.\" $FreeBSD: src/sbin/mount/mount.8,v 1.64 2004/02/10 06:44:41 trhodes Exp $
+.\" $FreeBSD: src/sbin/mount/mount.8,v 1.65 2004/03/04 00:52:16 brueffer Exp $
.\"
.Dd April 7, 2003
.Dt MOUNT 8
@@ -435,7 +435,7 @@
is set, all operations are performed against the specified file.
.Ev PATH_FSTAB
will not be honored if the process environment or memory address space is
-considred
+considered
.Dq tainted .
(See
.Xr issetugid 2
==== //depot/projects/hammer/sbin/umount/umount.8#6 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)umount.8 8.2 (Berkeley) 5/8/95
-.\" $FreeBSD: src/sbin/umount/umount.8,v 1.18 2003/07/18 17:43:13 iedowse Exp $
+.\" $FreeBSD: src/sbin/umount/umount.8,v 1.19 2004/03/04 00:52:16 brueffer Exp $
.\"
.Dd July 18, 2003
.Dt UMOUNT 8
@@ -126,7 +126,7 @@
is set, all operations are performed against the specified file.
.Ev PATH_FSTAB
will not be honored if the process environment or memory address space is
-considred
+considered
.Dq tainted .
(See
.Xr issetugid 2
==== //depot/projects/hammer/share/man/man4/Makefile#35 (text+ko) ====
@@ -1,9 +1,10 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.259 2004/03/01 17:26:39 ru Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.260 2004/03/03 16:34:03 njl Exp $
MAN= aac.4 \
acpi.4 \
acpi_thermal.4 \
+ acpi_video.4 \
adv.4 \
adw.4 \
agp.4 \
==== //depot/projects/hammer/share/man/man4/acpi.4#20 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.31 2004/03/03 03:02:17 njl Exp $
+.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.32 2004/03/04 04:42:59 njl Exp $
.\"
.Dd July 2, 2001
.Dt ACPI 4
@@ -266,6 +266,11 @@
.Pq Vt device
Supports an ACPI laptop lid switch, which typically puts a
system to sleep.
+.It Li quirks
+.Pq Vt feature
+Don't honor quirks.
+Quirks automatically disable ACPI functionality based on the XSDT table's
+OEM vendor name and revision date.
.It Li pci
.Pq Vt device
Supports Host to PCI bridges.
==== //depot/projects/hammer/share/man/man4/man4.i386/Makefile#15 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.157 2004/02/19 19:35:27 philip Exp $
+# $FreeBSD: src/share/man/man4/man4.i386/Makefile,v 1.158 2004/03/03 13:26:18 rik Exp $
MAN= acpi_toshiba.4 \
aic.4 \
@@ -9,6 +9,7 @@
asc.4 \
CPU_ELAN.4 \
cs.4 \
+ ct.4 \
cx.4 \
cy.4 \
el.4 \
@@ -48,6 +49,7 @@
wt.4
MLINKS= CPU_ELAN.4 CPU_SOEKRIS.4
+MLINKS+=ct.4 ctau.4
MLINKS+=ndis.4 if_ndis.4
MLINKS+=pae.4 PAE.4
MLINKS+=sbni.4 if_sbni.4
==== //depot/projects/hammer/share/misc/bsd-family-tree#13 (text+ko) ====
@@ -162,7 +162,8 @@
| | | | | | |
| FreeBSD 4.9 | | | OpenBSD 3.4 |
| | | | | | |
- | v | | | | |
+ | v | | NetBSD 1.6.2 | |
+ | | | | | |
| | | v | |
FreeBSD 5.0 | | | |
| | | | BSD/OS 5.0
@@ -393,6 +394,7 @@
OpenBSD 3.4 2003-11-01 [OBD]
FreeBSD 5.2 2004-01-12 [FBD]
FreeBSD 5.2.1 2004-02-22 [FBD] (patch release)
+NetBSD 1.6.2 2004-03-01 [NBD]
Bibliography
------------------------
@@ -449,4 +451,4 @@
Copyright (c) 1997-2004 Wolfram Schneider <wosch at FreeBSD.ORG>
URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree
-$FreeBSD: src/share/misc/bsd-family-tree,v 1.77 2004/02/25 15:58:14 wosch Exp $
+$FreeBSD: src/share/misc/bsd-family-tree,v 1.78 2004/03/04 05:34:29 maxim Exp $
==== //depot/projects/hammer/sys/amd64/conf/NOTES#5 (text+ko) ====
@@ -6,6 +6,8 @@
# (XXX from i386:NOTES,v 1.1106; merge in updates)
# $FreeBSD: src/sys/amd64/conf/NOTES.fixed,v 1.1 2004/02/29 19:32:02 peter Exp $
#
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.5 2004/03/03 09:26:40 obrien Exp $
+#
# We don't have modules on amd64.
makeoptions NO_MODULES=not_yet
@@ -17,9 +19,9 @@
#
machine amd64
-#
+#
# We want LINT to cover profiling as well
-#X#profile 2
+#XXX#profile 2
#####################################################################
@@ -78,7 +80,7 @@
# 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)
+# 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.
@@ -87,8 +89,8 @@
# 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.
+# Not all device drivers support this mode of operation at the time of
+# this writing. See polling(4) for more details.
options DEVICE_POLLING
@@ -98,10 +100,11 @@
# 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.
+# CLK_CALIBRATION_LOOP causes clock calibration to be run in a loop at
+# startup until the user presses a key. (The i8254 clock is always
+# calibrated relative to the RTC (mc146818a) and this option causes the
+# calibration to be repeated.)
options CLK_CALIBRATION_LOOP
# The following two options measure the frequency of the corresponding
@@ -113,7 +116,7 @@
#####################################################################
# MISCELLANEOUS DEVICES AND OPTIONS
-device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT!
+device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT!
#####################################################################
@@ -169,13 +172,27 @@
#####################################################################
# HARDWARE DEVICE CONFIGURATION
+# To include support for VGA VESA video modes
+options VESA
+
+# Turn on extra debugging checks and output for VESA support.
+options VESA_DEBUG
+
#
-# Mandatory devices:
+# Optional devices:
#
+# 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.
#
-# Optional devices:
-#
+# 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
+#XXX#options TDFX_LINUX # Enable Linuxulator support
# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create
# the /dev/3dfx0 device to work with glide implementations. This should get
@@ -208,7 +225,7 @@
#
# Note that building ACPI into the kernel is deprecated; the module is
# normally loaded automatically by the loader.
-#
+
device acpi
options ACPI_DEBUG
options ACPI_MAX_THREADS=1
@@ -238,8 +255,16 @@
# Network interfaces:
#
+# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
+# HP PC Lan+, various PC Card devices (refer to etc/defaults/pccard.conf)
+# lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and
+# Am79C960)
+
+#XXX# Needs to be busdma'ed.
+#XXX#device ed
+#XXX#device lnc
+
# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan)
-
#X#device ath
#X#device ath_hal # Atheros HAL (includes binary component)
device wlan # 802.11 layer
@@ -250,10 +275,18 @@
#XXX this stores pointers in a 32bit field that is defined by the hardware
#device pst
+#
+# SCSI host adapters:
#
-# SCSI host adapters:
+# ncv: NCR 53C500 based SCSI host adapters.
+# nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters.
+# stg: TMC 18C30, 18C50 based SCSI host adapters.
#
+device ncv
+device nsp
+device stg
+
#
# Adaptec FSA RAID controllers, including integrated DELL controllers,
# the Dell PERC 2/QC and the HP NetRAID-4M
@@ -277,7 +310,10 @@
#
# Miscellaneous hardware:
#
+# cy: Cyclades serial driver
# digi: Digiboard driver
+# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based)
+# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent)
# Notes on the Specialix SI/XIO driver:
# The host card is memory, not IO mapped.
@@ -297,6 +333,8 @@
device digi_Xe
device digi_Xem
device digi_Xr
+#XXX# PCI versions exist, but driver needs to be moved and split up.
+#XXX#device stl
# HOT1 Xilinx 6200 card (http://www.vcc.com/)
device xrpu
@@ -310,10 +348,114 @@
#
#---------------------------------------------------------------------------
+# ISDN4BSD
+#
+# See /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd.
+#
+# i4b passive ISDN cards support contains the following hardware drivers:
+#
+# isic - Siemens/Infineon ISDN ISAC/HSCX/IPAC chipset driver
+# iwic - Winbond W6692 PCI bus ISDN S/T interface controller
+# ifpi - AVM Fritz!Card PCI driver
+# ifpi2 - AVM Fritz!Card PCI version 2 driver
+# itjc - Siemens ISAC / TJNet Tiger300/320 chipset
+#
+# i4b active ISDN cards support contains the following hardware drivers:
+#
+# iavc - AVM B1 PCI, AVM B1 ISA, AVM T1
+#
+# Note that the ``options'' (if given) and ``device'' lines must BOTH
+# be uncommented to enable support for a given card !
+#
+# In addition to a hardware driver (and probably an option) the mandatory
+# ISDN protocol stack devices and the mandatory support device must be
+# enabled as well as one or more devices from the optional devices section.
+#
+#---------------------------------------------------------------------------
+# isic driver (Siemens/Infineon chipsets)
+#
+#XXX#device isic
+#
+# PCI bus Cards:
+# --------------
+#
+#
+# ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI)
+options ELSA_QS1PCI
+#
+#---------------------------------------------------------------------------
+# ifpi2 driver for AVM Fritz!Card PCI version 2
+#
+# AVM Fritz!Card PCI version 2
+#XXX#device "ifpi2"
+#
+#---------------------------------------------------------------------------
+# iwic driver for Winbond W6692 chipset
+#
+# ASUSCOM P-IN100-ST-D (and other Winbond W6692 based cards)
+#XXX#device iwic
+#
+#---------------------------------------------------------------------------
+# itjc driver for Siemens ISAC / TJNet Tiger300/320 chipset
+#
+# Traverse Technologies NETjet-S
+# Teles PCI-TJ
+#XXX#device itjc
+#
+#---------------------------------------------------------------------------
+# iavc driver (AVM active cards, needs i4bcapi driver!)
+#
+#XXX#device iavc
+#
+#---------------------------------------------------------------------------
+# ISDN Protocol Stack - mandatory for all hardware drivers
+#
+# Q.921 / layer 2 - i4b passive cards D channel handling
+#XXX#device "i4bq921"
+#
+# Q.931 / layer 3 - i4b passive cards D channel handling
+#XXX#device "i4bq931"
+#
+# layer 4 - i4b common passive and active card handling
+#XXX#device "i4b"
+#
+#---------------------------------------------------------------------------
+# ISDN devices - mandatory for all hardware drivers
+#
+# userland driver to do ISDN tracing (for passive cards only)
+#XXX#device "i4btrc" 4
+#
+# userland driver to control the whole thing
+#XXX#device "i4bctl"
+#
+#---------------------------------------------------------------------------
+# ISDN devices - optional
+#
+# userland driver for access to raw B channel
+#XXX#device "i4brbch" 4
+#
+# userland driver for telephony
+#XXX#device "i4btel" 2
+#
+# network driver for IP over raw HDLC ISDN
+#XXX#device "i4bipr" 4
+# enable VJ header compression detection for ipr i/f
+options IPR_VJ
+# enable logging of the first n IP packets to isdnd (n=32 here)
+options IPR_LOG=32
+#
+# network driver for sync PPP over ISDN; requires an equivalent
+# number of sppp device to be configured
+#XXX#device "i4bisppp" 4
+#
+# B-channel interface to the netgraph subsystem
+#XXX#device "i4bing" 2
+#
+#---------------------------------------------------------------------------
#
# Set the number of PV entries per process. Increasing this can
-# stop panics related to heavy use of shared memory. However, that can
+# stop panics related to heavy use of shared memory. However, that can
# (combined with large amounts of physical memory) cause panics at
# boot time due the kernel running out of VM space.
#
==== //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#7 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.48 2004/02/16 02:50:03 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ndis.c,v 1.49 2004/03/04 00:17:14 wpaul Exp $");
/*
* This file implements a translation layer between the BSD networking
@@ -1559,6 +1559,7 @@
cur = (ndis_packet *)*pool;
cur->np_private.npp_flags = 0x1; /* mark the head of the list */
+ cur->np_private.npp_totlen = 0; /* init deletetion flag */
for (i = 0; i < (descnum + NDIS_POOL_EXTRA); i++) {
cur->np_private.npp_head = (ndis_handle)(cur + 1);
cur++;
@@ -1595,7 +1596,21 @@
ndis_free_packetpool(pool)
ndis_handle pool;
{
- free(pool, M_DEVBUF);
+ ndis_packet *head;
+
+ head = pool;
+
+ /* Mark this pool as 'going away.' */
+
+ head->np_private.npp_totlen = 1;
+
+ /* If there are no buffers loaned out, destroy the pool. */
+
+ if (head->np_private.npp_count == 0)
+ free(pool, M_DEVBUF);
+ else
+ printf("NDIS: buggy driver deleting active packet pool!\n");
+
return;
}
@@ -1614,6 +1629,16 @@
return;
}
+ /*
+ * If this pool is marked as 'going away' don't allocate any
+ * more packets out of it.
+ */
+
+ if (head->np_private.npp_totlen) {
+ *status = NDIS_STATUS_FAILURE;
+ return;
+ }
+
pkt = (ndis_packet *)head->np_private.npp_head;
if (pkt == NULL) {
@@ -1662,6 +1687,14 @@
head->np_private.npp_head = (ndis_buffer *)packet;
head->np_private.npp_count--;
+ /*
+ * If the pool has been marked for deletion and there are
+ * no more packets outstanding, nuke the pool.
+ */
+
+ if (head->np_private.npp_totlen && head->np_private.npp_count == 0)
+ free(head, M_DEVBUF);
+
return;
}
@@ -1749,6 +1782,8 @@
cur = (ndis_buffer *)*pool;
cur->nb_flags = 0x1; /* mark the head of the list */
+ cur->nb_bytecount = 0; /* init usage count */
+ cur->nb_byteoffset = 0; /* init deletetion flag */
for (i = 0; i < (descnum + NDIS_POOL_EXTRA); i++) {
cur->nb_next = cur + 1;
cur++;
@@ -1762,7 +1797,20 @@
ndis_free_bufpool(pool)
ndis_handle pool;
{
- free(pool, M_DEVBUF);
+ ndis_buffer *head;
+
+ head = pool;
+
+ /* Mark this pool as 'going away.' */
+
+ head->nb_byteoffset = 1;
+
+ /* If there are no buffers loaned out, destroy the pool. */
+ if (head->nb_bytecount == 0)
+ free(pool, M_DEVBUF);
+ else
+ printf("NDIS: buggy driver deleting active buffer pool!\n");
+
return;
}
@@ -1785,6 +1833,16 @@
return;
}
+ /*
+ * If this pool is marked as 'going away' don't allocate any
+ * more buffers out of it.
+ */
+
+ if (head->nb_byteoffset) {
+ *status = NDIS_STATUS_FAILURE;
+ return;
+ }
+
buf = head->nb_next;
if (buf == NULL) {
@@ -1801,6 +1859,10 @@
*buffer = buf;
+ /* Increment count of busy buffers. */
+
+ head->nb_bytecount++;
+
*status = NDIS_STATUS_SUCCESS;
return;
}
@@ -1822,6 +1884,18 @@
buf->nb_next = head->nb_next;
head->nb_next = buf;
+ /* Decrement count of busy buffers. */
+
+ head->nb_bytecount--;
+
+ /*
+ * If the pool has been marked for deletion and there are
+ * no more buffers outstanding, nuke the pool.
+ */
+
+ if (head->nb_byteoffset && head->nb_bytecount == 0)
+ free(head, M_DEVBUF);
+
return;
}
==== //depot/projects/hammer/sys/compat/ndis/subr_ntoskrnl.c#6 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ndis/subr_ntoskrnl.c,v 1.23 2004/02/17 21:50:39 wpaul Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list