PERFORCE change 67139 for review
Sam Leffler
sam at FreeBSD.org
Wed Dec 15 11:27:11 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=67139
Change 67139 by sam at sam_ebb on 2004/12/15 19:26:48
IFC @ 67138
Affected files ...
.. //depot/projects/wifi/UPDATING#7 integrate
.. //depot/projects/wifi/etc/defaults/rc.conf#7 integrate
.. //depot/projects/wifi/etc/mtree/BSD.include.dist#2 integrate
.. //depot/projects/wifi/etc/rc.d/jail#3 integrate
.. //depot/projects/wifi/etc/rc.d/ppp-user#2 integrate
.. //depot/projects/wifi/etc/rc.shutdown#2 integrate
.. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 integrate
.. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#5 integrate
.. //depot/projects/wifi/release/doc/share/misc/man2hwnotes.pl#2 integrate
.. //depot/projects/wifi/share/examples/etc/make.conf#5 integrate
.. //depot/projects/wifi/share/examples/ppp/ppp.conf.isdn#2 integrate
.. //depot/projects/wifi/share/examples/ppp/ppp.conf.sample#3 integrate
.. //depot/projects/wifi/share/examples/ppp/ppp.conf.span-isp#3 integrate
.. //depot/projects/wifi/share/examples/ppp/ppp.conf.span-isp.working#2 integrate
.. //depot/projects/wifi/share/man/man4/Makefile#9 integrate
.. //depot/projects/wifi/share/man/man4/aac.4#2 integrate
.. //depot/projects/wifi/share/man/man4/acpi.4#3 integrate
.. //depot/projects/wifi/share/man/man4/firewire.4#2 integrate
.. //depot/projects/wifi/share/man/man4/fwe.4#2 integrate
.. //depot/projects/wifi/share/man/man4/fwip.4#2 integrate
.. //depot/projects/wifi/share/man/man4/fwohci.4#2 integrate
.. //depot/projects/wifi/share/man/man4/man4.sparc64/Makefile#2 integrate
.. //depot/projects/wifi/share/man/man4/man4.sparc64/snd_audiocs.4#1 branch
.. //depot/projects/wifi/share/man/man4/polling.4#3 integrate
.. //depot/projects/wifi/share/man/man4/pst.4#2 integrate
.. //depot/projects/wifi/share/man/man4/snd_maestro.4#1 branch
.. //depot/projects/wifi/share/man/man4/snd_maestro3.4#2 integrate
.. //depot/projects/wifi/share/man/man4/txp.4#2 integrate
.. //depot/projects/wifi/share/man/man4/vpo.4#2 integrate
.. //depot/projects/wifi/share/man/man5/make.conf.5#5 integrate
.. //depot/projects/wifi/share/man/man9/Makefile#5 integrate
.. //depot/projects/wifi/share/man/man9/kernel_mount.9#1 branch
.. //depot/projects/wifi/share/misc/bsd-family-tree#5 integrate
.. //depot/projects/wifi/sys/arm/arm/intr.c#4 integrate
.. //depot/projects/wifi/sys/arm/arm/swtch.S#6 integrate
.. //depot/projects/wifi/sys/conf/files.amd64#3 integrate
.. //depot/projects/wifi/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/wifi/sys/dev/acpi_support/acpi_asus.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpi_support/acpi_ibm.c#3 integrate
.. //depot/projects/wifi/sys/dev/acpi_support/acpi_panasonic.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpi_support/acpi_sony.c#3 integrate
.. //depot/projects/wifi/sys/dev/acpi_support/acpi_toshiba.c#2 integrate
.. //depot/projects/wifi/sys/dev/acpica/acpivar.h#3 integrate
.. //depot/projects/wifi/sys/dev/ath/ath_rate/amrr/amrr.c#5 integrate
.. //depot/projects/wifi/sys/dev/ath/ath_rate/onoe/onoe.c#5 integrate
.. //depot/projects/wifi/sys/dev/ath/if_ath.c#44 integrate
.. //depot/projects/wifi/sys/dev/cp/if_cp.c#4 integrate
.. //depot/projects/wifi/sys/dev/ctau/if_ct.c#4 integrate
.. //depot/projects/wifi/sys/dev/cx/if_cx.c#4 integrate
.. //depot/projects/wifi/sys/dev/drm/drm_sysctl.h#2 integrate
.. //depot/projects/wifi/sys/dev/fb/vga.c#2 integrate
.. //depot/projects/wifi/sys/dev/ida/ida.c#2 integrate
.. //depot/projects/wifi/sys/dev/ida/ida_pci.c#2 integrate
.. //depot/projects/wifi/sys/dev/ida/idavar.h#2 integrate
.. //depot/projects/wifi/sys/dev/usb/ehci.c#5 integrate
.. //depot/projects/wifi/sys/dev/usb/ohci.c#3 integrate
.. //depot/projects/wifi/sys/fs/devfs/devfs_vnops.c#10 integrate
.. //depot/projects/wifi/sys/geom/bde/g_bde_lock.c#2 integrate
.. //depot/projects/wifi/sys/gnu/ext2fs/ext2_vnops.c#7 integrate
.. //depot/projects/wifi/sys/kern/kern_descrip.c#8 integrate
.. //depot/projects/wifi/sys/kern/kern_exec.c#5 integrate
.. //depot/projects/wifi/sys/kern/kern_fork.c#6 integrate
.. //depot/projects/wifi/sys/kern/kern_switch.c#4 integrate
.. //depot/projects/wifi/sys/kern/kern_thread.c#4 integrate
.. //depot/projects/wifi/sys/kern/sched_4bsd.c#3 integrate
.. //depot/projects/wifi/sys/kern/sched_ule.c#5 integrate
.. //depot/projects/wifi/sys/kern/uipc_mbuf.c#4 integrate
.. //depot/projects/wifi/sys/kern/vfs_mount.c#9 integrate
.. //depot/projects/wifi/sys/modules/wlan_ccmp/Makefile#4 integrate
.. //depot/projects/wifi/sys/net/if_spppsubr.c#3 integrate
.. //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#4 integrate
.. //depot/projects/wifi/sys/netgraph/ng_bridge.c#2 integrate
.. //depot/projects/wifi/sys/sys/filedesc.h#6 integrate
.. //depot/projects/wifi/sys/sys/proc.h#3 integrate
.. //depot/projects/wifi/sys/ufs/ffs/ffs_vnops.c#6 integrate
.. //depot/projects/wifi/sys/ufs/ufs/ufs_vnops.c#8 integrate
.. //depot/projects/wifi/tools/tools/kttcp/kttcp.c#2 integrate
.. //depot/projects/wifi/tools/tools/kttcp/sys/kttcp.c#2 integrate
.. //depot/projects/wifi/usr.bin/rev/rev.c#2 integrate
.. //depot/projects/wifi/usr.sbin/fwcontrol/fwcontrol.8#2 integrate
Differences ...
==== //depot/projects/wifi/UPDATING#7 (text+ko) ====
@@ -23,6 +23,13 @@
developers choose to disable these features on build machines
to maximize performance.
+20041213:
+ The behaviour of ppp(8) has changed slightly. If lqr is enabled
+ (``enable lqr''), older versions would revert to LCP ECHO mode on
+ negotiation failure. Now, ``enable echo'' is required for this
+ behaviour. The ppp version number has been bumped to 3.4.2 to
+ reflect the change.
+
20041201:
The wlan support has been updated to split the crypto support
into separate modules. For static WEP you must configure the
@@ -1977,4 +1984,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.382 2004/12/12 07:22:16 obrien Exp $
+$FreeBSD: src/UPDATING,v 1.383 2004/12/13 17:52:10 brian Exp $
==== //depot/projects/wifi/etc/defaults/rc.conf#7 (text+ko) ====
@@ -13,7 +13,7 @@
#
# All arguments must be in double or single quotes.
#
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.233 2004/12/01 22:05:50 rees Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.235 2004/12/15 12:39:28 brian Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -146,6 +146,7 @@
# User ppp configuration.
ppp_enable="NO" # Start user-ppp (or NO).
+ppp_program="/usr/sbin/ppp" # Path to user-ppp program.
ppp_mode="auto" # Choice of "auto", "ddial", "direct" or "dedicated".
# For details see man page for ppp(8). Default is auto.
ppp_nat="YES" # Use PPP's internal network address translation or NO.
@@ -493,7 +494,8 @@
#jail_example_rootdir="/usr/jail/default" # Jail's root directory
#jail_example_hostname="default.domain.com" # Jail's hostname
#jail_example_ip="192.168.0.10" # Jail's IP number
-#jail_example_exec="/bin/sh /etc/rc" # command to execute in jail
+#jail_example_exec_start="/bin/sh /etc/rc" # command to execute in jail for starting
+#jail_example_exec_stop="/bin/sh /etc/rc.shutdown" # command to execute in jail for stopping
#jail_example_devfs_enable="NO" # mount devfs in the jail
#jail_example_fdescfs_enable="NO" # mount fdescfs in the jail
#jail_example_procfs_enable="NO" # mount procfs in jail
==== //depot/projects/wifi/etc/mtree/BSD.include.dist#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.93 2004/09/27 08:18:43 dougb Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.94 2004/12/15 13:58:28 pjd Exp $
#
# Please see the file src/etc/mtree/README before making changes to this file.
#
@@ -54,8 +54,6 @@
..
..
fs
- autofs
- ..
devfs
..
fdescfs
==== //depot/projects/wifi/etc/rc.d/jail#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/jail,v 1.19 2004/11/24 10:44:39 mux Exp $
+# $FreeBSD: src/etc/rc.d/jail,v 1.20 2004/12/14 14:36:35 rse Exp $
#
# PROVIDE: jail
@@ -34,7 +34,21 @@
eval jail_hostname=\"\$jail_${_j}_hostname\"
eval jail_ip=\"\$jail_${_j}_ip\"
eval jail_exec=\"\$jail_${_j}_exec\"
- [ -z "${jail_exec}" ] && jail_exec="/bin/sh /etc/rc"
+ eval jail_exec_start=\"\$jail_${_j}_exec_start\"
+ eval jail_exec_stop=\"\$jail_${_j}_exec_stop\"
+ if [ -n "${jail_exec}" ]; then
+ # simple/backward-compatible execution
+ jail_exec_start="${jail_exec}"
+ jail_exec_stop=""
+ else
+ # flexible execution
+ if [ -z "${jail_exec_start}" ]; then
+ jail_exec_start="/bin/sh /etc/rc"
+ if [ -z "${jail_exec_stop}" ]; then
+ jail_exec_stop="/bin/sh /etc/rc.shutdown"
+ fi
+ fi
+ fi
# The default jail ruleset will be used by rc.subr if none is specified.
eval jail_ruleset=\"\$jail_${_j}_devfs_ruleset\"
@@ -65,6 +79,8 @@
debug "$_j procdir: $jail_procdir"
debug "$_j ruleset: $jail_ruleset"
debug "$_j fstab: $jail_fstab"
+ debug "$_j exec start: $jail_exec_start"
+ debug "$_j exec stop: $jail_exec_stop"
}
# set_sysctl rc_knob mib msg
@@ -177,8 +193,8 @@
fi
fi
_tmp_jail=${_tmp_dir}/jail.$$
- jail -i ${jail_rootdir} ${jail_hostname} \
- ${jail_ip} ${jail_exec} > ${_tmp_jail} 2>&1
+ eval jail -l -U root -i ${jail_rootdir} ${jail_hostname} \
+ ${jail_ip} ${jail_exec_start} > ${_tmp_jail} 2>&1
[ "$?" -eq 0 ] && echo -n " $jail_hostname"
_jail_id=$(head -1 ${_tmp_jail})
tail +2 ${_tmp_jail} >${jail_rootdir}/var/log/console.log
@@ -198,7 +214,13 @@
_jail_id=$(cat /var/run/jail_${_jail}.id)
if [ ! -z "${_jail_id}" ]; then
init_variables $_jail
+ if [ -n "${jail_exec_stop}" ]; then
+ eval env -i /usr/sbin/jexec ${_jail_id} ${jail_exec_stop} \
+ >> ${jail_rootdir}/var/log/console.log 2>&1
+ fi
killall -j ${_jail_id} -TERM > /dev/null 2>&1
+ sleep 1
+ killall -j ${_jail_id} -KILL > /dev/null 2>&1
jail_umount_fs
echo -n " $jail_hostname"
fi
==== //depot/projects/wifi/etc/rc.d/ppp-user#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ppp-user,v 1.6 2004/10/07 13:55:26 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ppp-user,v 1.7 2004/12/15 12:39:28 brian Exp $
#
# PROVIDE: ppp-user
@@ -10,11 +10,11 @@
. /etc/rc.subr
name="ppp"
-rcvar="ppp_enable"
-start_cmd="ppp_start"
-stop_cmd=":"
+rcvar=`set_rcvar`
+start_precmd="ppp_precmd"
+start_postcmd="ppp_postcmd"
-ppp_start()
+ppp_precmd()
{
# Establish ppp mode.
#
@@ -24,21 +24,21 @@
ppp_mode="auto"
fi
- ppp_command="/usr/sbin/ppp -quiet -${ppp_mode}"
+ rc_flags="$rc_flags -quiet -${ppp_mode}"
# Switch on NAT mode?
#
case ${ppp_nat} in
[Yy][Ee][Ss])
- ppp_command="${ppp_command} -nat"
+ rc_flags="$rc_flags -nat"
;;
esac
- ppp_command="${ppp_command} ${ppp_profile}"
+ rc_flags="$rc_flags ${ppp_profile}"
+}
- echo "Starting ppp as \"${ppp_user}\""
- su -m ${ppp_user} -c "exec ${ppp_command}"
-
+ppp_postcmd()
+{
# Re-Sync ipfilter so it picks up any new network interfaces
#
/etc/rc.d/ipfilter resync
==== //depot/projects/wifi/etc/rc.shutdown#2 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.shutdown,v 1.29 2004/10/17 13:39:42 schweikh Exp $
+# $FreeBSD: src/etc/rc.shutdown,v 1.30 2004/12/14 14:36:35 rse Exp $
#
# Site-specific closing actions for daemons run by init on shutdown,
@@ -80,7 +80,9 @@
# Determine the shutdown order of the /etc/rc.d scripts,
# and perform the operation
#
-files=`rcorder -k shutdown /etc/rc.d/* 2>/dev/null`
+rcorder_opts="-k shutdown"
+[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && rcorder_opts="$rcorder_opts -s nojail"
+files=`rcorder ${rcorder_opts} /etc/rc.d/* 2>/dev/null`
for _rc_elem in `reverse_list $files`; do
debug "run_rc_script $_rc_elem faststop"
==== //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 (text+ko) ====
@@ -29,7 +29,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.263 2004/11/27 13:57:22 simon Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.266 2004/12/14 22:21:51 simon Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -182,8 +182,7 @@
&hwlist.nsp;
- <para arch="i386">Adaptec AIC-7110 Parallel to SCSI interfaces (&man.vpo.4; driver)
- </para>
+ &hwlist.vpo;
&hwlist.ida;
@@ -191,9 +190,7 @@
&hwlist.iir;
- <para arch="i386">Promise SuperTrak ATA RAID controllers (&man.pst.4;
- driver)
- </para>
+ &hwlist.pst;
&hwlist.hptmv;
@@ -741,23 +738,13 @@
<listitem>
<para>ES1868, ES1869, ES1879 and ES1888 (&man.sbc.4; driver)</para>
</listitem>
- <listitem>
- <para>Maestro-1, Maestro-2, and Maestro-2E</para>
- </listitem>
- <listitem>
- <para>Maestro-3/Allegro</para>
- <note>
- <para>The Maestro-3/Allegro cannot be compiled into the
- &os; kernel due to licensing restrictions. To use this
- driver, add the following line to
- <filename>/boot/loader.conf</filename>:</para>
-
- <screen><userinput>snd_maestro3_load="YES"</userinput></screen>
- </note>
- </listitem>
</itemizedlist>
</para>
+ &hwlist.snd.maestro;
+
+ &hwlist.snd.maestro3;
+
<para arch="i386,amd64">ForteMedia fm801</para>
&hwlist.snd.gusc;
@@ -806,6 +793,8 @@
&hwlist.snd.ich;
+ &hwlist.snd.audiocs;
+
<para arch="pc98">NEC PC-9801-73, 86 and compatibles (nss driver)
<itemizedlist>
<listitem>
==== //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#5 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.46 2004/11/27 13:57:22 simon Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.49 2004/12/14 22:21:51 simon Exp $
#
#
@@ -93,10 +93,12 @@
sbp i386,sparc64,ia64,amd64
sf i386,pc98,alpha,ia64,amd64
sis i386,pc98,alpha,ia64,amd64
+pst i386
sk i386,pc98,alpha,amd64
sn i386,amd64
snc pc98
snd_ad1816 i386,amd64
+snd_audiocs sparc64
snd_cmi i386,amd64
snd_cs4281 i386,amd64
snd_csa i386,amd64
@@ -106,6 +108,8 @@
snd_ess i386,amd64
snd_gusc i386,amd64
snd_ich i386,amd64
+snd_maestro i386,alpha,amd64
+snd_maestro3 i386,alpha,amd64
snd_solo i386,amd64
ste i386,pc98,alpha,amd64
stg i386,pc98
@@ -130,6 +134,7 @@
uvisor i386,pc98,amd64
uvscom i386,pc98,amd64
vge i386,pc98,amd64
+vpo i386
vr i386,pc98,alpha,amd64
vx i386,pc98,ia64,amd64
wb i386,pc98,alpha,amd64
==== //depot/projects/wifi/release/doc/share/misc/man2hwnotes.pl#2 (text+ko) ====
@@ -25,7 +25,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.10 2004/09/11 15:14:13 simon Exp $
+# $FreeBSD: src/release/doc/share/misc/man2hwnotes.pl,v 1.11 2004/12/14 13:07:58 simon Exp $
#
# Parse the list of supported hardware out of section 4 manual pages
@@ -40,7 +40,8 @@
# arguments to the .It command, only the argument will be printed.
# Usage:
-# mdoc2sgml [-l] [-d 0-6] [-a <archlist file>] [-o <outputfile>] <manualpage> [<manualpage> ...]
+# man2hwnotes.pl [-l] [-d 0-6] [-a <archlist file>] [-o <outputfile>]
+# <manualpage> [<manualpage> ...]
use strict;
use Getopt::Std;
@@ -172,11 +173,12 @@
dlog(3, "Setting Nm to $1");
$mdocvars{Nm} = $1;
# "_" cannot be used for an entity name.
- $mdocvars{Nm} =~ s,_,.,g;
+ $mdocvars{EntNm} = $1;
+ $mdocvars{EntNm} =~ s,_,.,g;
} elsif (/^Nm$/) {
if (defined($mdocvars{Nm}) && $mdocvars{Nm} ne "") {
- parabuf_addline(\%mdocvars, "&man.".$mdocvars{Nm}.".$cur_mansection;");
+ parabuf_addline(\%mdocvars, "&man.".$mdocvars{EntNm}.".$cur_mansection;");
} else {
dlog(2, "Warning: Bad Nm call in $manpage");
}
@@ -194,7 +196,7 @@
add_sgmltag(\%mdocvars, "<!ENTITY hwlist.".$mdocvars{cur_manname}." '");
if ($only_list_out) {
add_sgmltag("<para>&hwlist.preamble.pre; " .
- "&man.".$mdocvars{Nm}.".$cur_mansection; " .
+ "&man.".$mdocvars{EntNm}.".$cur_mansection; " .
"&hwlist.preamble.post;</para>");
}
} elsif ($mdocvars{isin_hwlist}) {
==== //depot/projects/wifi/share/examples/etc/make.conf#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/etc/make.conf,v 1.240 2004/11/13 20:40:29 bz Exp $
+# $FreeBSD: src/share/examples/etc/make.conf,v 1.241 2004/12/15 02:10:50 trhodes Exp $
#
# NOTE: Please would any committer updating this file also update the
# make.conf(5) manual page, if necessary, which is located in
@@ -108,38 +108,44 @@
#ENABLE_SUID_NEWGRP=
#
# To avoid building various parts of the base system:
+#NOALIAS= # do not build ppp(8) with NAT support (see make.conf(5))
+#NOATM= # do not build ATM related programs and libraries
+#NOCRYPT= # do not build any crypto code
+#NOGAMES= # do not build games (games/ subdir)
+#NOINET6= # do not build IPv6 related programs and libraries
+#NOINFO= # do not make or install info files
+#NOIPSEC= # do not build traceroute(8) with IPSEC support
+#NOLIBC_R= # do not build libc_r (re-entrant version of libc)
+#NOLIBPTHREAD= # do not build libpthread (M:N threading library)
+#NOLIBTHR= # do not build libthr (1:1 threading library)
+#NOMAN= # do not build manual pages
+#NONAT= # do not build ppp(8) with NAT support (see make.conf(5))
+#NONETGRAPH= # do not build ppp(8) with NETGRAPH support
+#NOPROFILE= # Avoid compiling profiled libraries
+#NORADUIS= # do not build ppp(8) with RADUIS support
+#NOSHARE= # do not go into the share subdir
+#NOSHARED= # build /bin and /sbin dynamically linked (bad idea
#NO_ACPI= # do not build acpiconf(8) and related programs
-#NOATM= # do not build ATM related programs and libraries
#NO_AUTHPF= # do not build and install authpf (setuid/gid)
#NO_BLUETOOTH= # do not build Bluetooth related stuff
#NO_BOOT= # do not build boot blocks and loader
-#NOCRYPT= # do not build any crypto code
#NO_CVS= # do not build CVS
#NO_CXX= # do not build C++ and friends
#NO_DYNAMICROOT= # do not link /bin and /sbin dynamically
#NO_FORTRAN= # do not build g77 and related libraries
-#NOGAMES= # do not build games (games/ subdir)
#NO_GDB= # do not build GDB
#NO_I4B= # do not build isdn4bsd package
-#NOINET6= # do not build IPv6 related programs and libraries
-#NOINFO= # do not make or install info files
#NO_IPFILTER= # do not build IP Filter package
#NO_KERBEROS= # do not build and install Kerberos 5 (KTH Heimdal)
-#NOLIBC_R= # do not build libc_r (re-entrant version of libc)
-#NOLIBPTHREAD= # do not build libpthread (M:N threading library)
-#NOLIBTHR= # do not build libthr (1:1 threading library)
#NO_LPR= # do not build lpr and related programs
#NO_MAILWRAPPER= # do not build the mailwrapper(8) MTA selector
-#NOMAN= # do not build manual pages
#NO_MODULES= # do not build modules with the kernel
#NO_NIS= # do not build NIS support and related programs
#NO_OBJC= # do not build Objective C support
#NO_OPENSSH= # do not build OpenSSH
#NO_OPENSSL= # do not build OpenSSL (implies NO_KERBEROS/NO_OPENSSH)
#NO_PF= # do not build PF firewall package
-#NOPROFILE= # Avoid compiling profiled libraries
#NO_SENDMAIL= # do not build sendmail and related programs
-#NOSHARE= # do not go into the share subdir
#NO_SHAREDOCS= # do not build the 4.4BSD legacy docs
#NO_TCSH= # do not build and install /bin/csh (which is tcsh)
#NO_TOOLCHAIN= # do not build programs for program development
==== //depot/projects/wifi/share/examples/ppp/ppp.conf.isdn#2 (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/examples/ppp/ppp.conf.isdn,v 1.11 2003/04/10 21:33:02 keramida Exp $
+# $FreeBSD: src/share/examples/ppp/ppp.conf.isdn,v 1.12 2004/12/13 17:54:30 brian Exp $
# This is an example ppp profile for bringing up a multilink ppp connection
# over ISDN. It needs at least version 0.83.0 of the i4b code. An example
@@ -41,7 +41,7 @@
set enddisc mac # Assuming you have a LAN
- enable lqr
+ enable lqr echo
set reconnect 3 5
set redial 3 10
set lqrperiod 45
==== //depot/projects/wifi/share/examples/ppp/ppp.conf.sample#3 (text+ko) ====
@@ -4,7 +4,7 @@
#
# Originally written by Toshiharu OHNO
#
-# $FreeBSD: src/share/examples/ppp/ppp.conf.sample,v 1.34 2004/11/19 03:48:17 obrien Exp $
+# $FreeBSD: src/share/examples/ppp/ppp.conf.sample,v 1.35 2004/12/13 17:54:30 brian Exp $
#
#################################################################
@@ -129,7 +129,7 @@
set authname "somename" # Replace these with your login name & password.
set authkey "somepasswd" # This profile assumes you're using PAP or CHAP.
- enable lqr
+ enable lqr echo
set reconnect 3 5
set redial 3 10
set lqrperiod 45
@@ -479,7 +479,7 @@
set log Phase Chat LQM
set login "ABORT NO\\sCARRIER TIMEOUT 5 ogin:--ogin: ppp word: ppp HELLO"
set ifaddr 10.0.4.2 10.0.4.1
- enable lqr
+ enable lqr echo
accept lqr
direct-server:
@@ -487,7 +487,7 @@
set lqrperiod 10
set log Phase LQM
set ifaddr 10.0.4.1 10.0.4.2
- enable lqr
+ enable lqr echo
accept lqr
@@ -733,7 +733,7 @@
#
pppoe:
set device PPPoE:de0:pppoe-in
- enable lqr
+ enable lqr echo
set cd 5
set dial
set login
@@ -747,7 +747,7 @@
#
pppoe-in:
allow mode direct # Only for use on server-side
- enable lqr proxy # Enable LQR and proxy-arp
+ enable lqr echo proxy # Enable LQR and proxy-arp
enable chap pap passwdauth # Force client authentication
set ifaddr 10.0.0.1 10.0.0.100-10.0.0.199 # Hand out up to 100 IP numbers
accept dns # Allow DNS negotiation
==== //depot/projects/wifi/share/examples/ppp/ppp.conf.span-isp#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp,v 1.6 2004/11/19 03:48:17 obrien Exp $
+# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp,v 1.7 2004/12/13 17:54:30 brian Exp $
# This advanced ppp configuration file explains how to implement
# the following:
@@ -110,7 +110,7 @@
set login
set redial 3 5
set timeout 0
- enable lqr
+ enable lqr echo
set lqrperiod 15
isp1:
==== //depot/projects/wifi/share/examples/ppp/ppp.conf.span-isp.working#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp.working,v 1.6 2003/04/10 21:33:02 keramida Exp $
+# $FreeBSD: src/share/examples/ppp/ppp.conf.span-isp.working,v 1.7 2004/12/13 17:54:30 brian Exp $
# This is a working example of ppp.conf.span-isp that uses ppp connections
# to the same machine through 3 null-modem serial cables.
@@ -46,7 +46,7 @@
set login
set redial 3 5
set timeout 0
- enable lqr
+ enable lqr echo
set lqrperiod 15
isp1:
==== //depot/projects/wifi/share/man/man4/Makefile#9 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.297 2004/12/08 17:47:32 sam Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.298 2004/12/14 16:11:14 simon Exp $
MAN= aac.4 \
acpi.4 \
@@ -268,6 +268,7 @@
snd_ess.4 \
snd_gusc.4 \
snd_ich.4 \
+ snd_maestro.4 \
snd_maestro3.4 \
snd_sbc.4 \
snd_solo.4 \
==== //depot/projects/wifi/share/man/man4/aac.4#2 (text+ko) ====
@@ -22,8 +22,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/aac.4,v 1.26 2004/10/22 04:17:28 scottl Exp $
-.Dd Augyst 12, 2004
+.\" $FreeBSD: src/share/man/man4/aac.4,v 1.28 2004/12/15 09:32:12 brueffer Exp $
+.Dd December 15, 2004
.Dt AAC 4
.Os
.Sh NAME
@@ -105,6 +105,8 @@
.It
Adaptec SCSI RAID 2200S
.It
+Adaptec SCSI RAID 2230SLP
+.It
Adaptec SCSI RAID 2410SA
.It
Adaptec SCSI RAID 2810SA
==== //depot/projects/wifi/share/man/man4/acpi.4#3 (text+ko) ====
@@ -23,9 +23,9 @@
.\" 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.41 2004/12/04 23:26:46 marks Exp $
+.\" $FreeBSD: src/share/man/man4/acpi.4,v 1.45 2004/12/14 19:55:54 njl Exp $
.\"
-.Dd June 30, 2004
+.Dd December 14, 2004
.Dt ACPI 4
.Os
.Sh NAME
@@ -48,166 +48,99 @@
.Pp
Note that the
.Nm
-driver is automatically loaded by the bootloader, and should not normally
-be compiled into the kernel.
-.Sh ENVIRONMENT
-This support is still experimental, and thus there are many debugging
-and tuning options which are managed via the kernel environment.
+driver is automatically loaded by the
+.Xr loader 8 ,
+and should only be
+compiled into the kernel on platforms where ACPI is mandatory.
+.Sh SYSCTLS
+The
+.Nm
+driver is intended to provide power management without user intervention.
+Thus, some of these sysctls are controlled automatically by the
+.Pa power_profile
+.Xr rc 8
+script, which can be configured via
+.Xr rc.conf 5 .
+If values are specified manually, they may be overridden.
+.Bl -tag -width indent
+.It Va hw.acpi.cpu.throttle_max
+Maximum value for CPU throttling, equal to 100% of the clock rate.
+.It Va hw.acpi.cpu.throttle_state
+Get or set the current throttling state, from 1 to
+.Va hw.acpi.cpu.throttle_max .
+This scales back the CPU clock rate and the corresponding power consumption.
+.It Va hw.acpi.cpu.cx_usage
+Debugging information listing the percent of total usage for each sleep state.
+The values are reset when
+.Va hw.acpi.cpu.cx_lowest
+is modified.
+.It Va hw.acpi.cpu.cx_lowest
+Lowest Cx state to use for idling the CPU.
+A scheduling algorithm will select states between C1 and this setting
+as system load dictates.
+To enable ACPI CPU idling control,
+.Va machdep.cpu_idle_hlt
+must be set to 1.
+.It Va hw.acpi.cpu.cx_supported
+List of supported CPU idle states and their transition latency
+in microseconds.
+Each state has a type (e.g., C2).
+C1 is equivalent to the ia32 HLT instruction, C2 provides a deeper
+sleep with the same semantics, and C3 provides the deepest sleep
+but additionally requires bus mastering to be disabled.
+States greater than C3 provide even more power savings with the same
+semantics as the C3 state.
+Deeper sleeps provide more power savings but increased transition
+latency when an interrupt occurs.
+.El
+.Sh TUNABLES
Tunables can be set at the
.Xr loader 8
prompt before booting the kernel or stored in
.Pa /boot/loader.conf .
-.Pp
-Debugging is separated between layers and levels, where a layer is
-a portion of the ACPI subsystem, and a level is a particular kind
-of debugging output.
-.Pp
-Both layers and levels are specified as a whitespace-separated list of
-tokens, with layers listed in
-.Va debug.acpi.layer
-and levels in
-.Va debug.acpi.level .
-The supported layers are:
-.Pp
-.Bl -item -offset indent -compact
-.It
-.Li ACPI_UTILITIES
-.It
-.Li ACPI_HARDWARE
-.It
-.Li ACPI_EVENTS
-.It
-.Li ACPI_TABLES
-.It
-.Li ACPI_NAMESPACE
-.It
-.Li ACPI_PARSER
-.It
-.Li ACPI_DISPATCHER
-.It
-.Li ACPI_EXECUTER
-.It
-.Li ACPI_RESOURCES
-.It
-.Li ACPI_CA_DEBUGGER
-.It
-.Li ACPI_OS_SERVICES
-.It
-.Li ACPI_CA_DISASSEMBLER
-.It
-.Li ACPI_ALL_COMPONENTS
-.It
-.Li ACPI_AC_ADAPTER
-.It
-.Li ACPI_BATTERY
-.It
-.Li ACPI_BUS
-.It
-.Li ACPI_BUTTON
-.It
-.Li ACPI_EC
-.It
-.Li ACPI_FAN
-.It
-.Li ACPI_POWER
-.It
-.Li ACPI_PROCESSOR
-.It
-.Li ACPI_THERMAL
-.It
-.Li ACPI_TIMER
-.It
-.Li ACPI_ALL_DRIVERS
+.Bl -tag -width indent
+.It Va acpi_dsdt_load
+Enables loading of a custom ACPI DSDT.
+.It Va acpi_dsdt_name
+Name of the DSDT table to load, if loading is enabled.
+.It Va debug.acpi.disabled
+Selectively disables portions of ACPI for debugging purposes.
+.It Va hint.acpi.0.disabled
+Set this to 1 to disable all of ACPI.
+If ACPI has been disabled on your system due to a blacklist entry for your
+BIOS, you can set this to 0 to re-enable ACPI for testing.
+.It Va hw.acpi.ec.poll_timeout
+Delay in milliseconds to wait for the EC to respond.
+Try increasing this number if you get the error
+.Qq Li AE_NO_HARDWARE_RESPONSE .
+.It Va hw.acpi.osname
+Some systems' ASL may have problems because they look for names
+of Microsoft operating systems.
+This tunable overrides the value of the
+.Qq Li \e_OS
+object from its default of
+.Qq Li FreeBSD .
+.It Va hw.acpi.pci.link.%d.%d.%d.irq
+Override the interrupt to use.
+.It Va hw.acpi.reset_video
+Enables calling the VESA reset BIOS vector on the resume path.
+Some graphic chips have problems such as LCD white-out after resume.
+Try setting this to 0 if this causes problems for you.
+.It Va hw.acpi.serialize_methods
+Allow override of whether methods execute in parallel or not.
+Enable this for serial behavior, which fixes
+.Qq Li AE_ALREADY_EXISTS
+errors for
+AML that really cannot handle parallel method execution.
+It is off by default since this breaks recursive methods and some IBMs use
+such code.
+.It Va hw.acpi.verbose
+Turn on verbose debugging information about what ACPI is doing.
.El
-.Pp
-The supported levels are:
-.Pp
-.Bl -item -offset indent -compact
-.It
-.Li ACPI_LV_ERROR
-.It
-.Li ACPI_LV_WARN
-.It
-.Li ACPI_LV_INIT
-.It
-.Li ACPI_LV_DEBUG_OBJECT
-.It
-.Li ACPI_LV_INFO
-.It
-.Li ACPI_LV_ALL_EXCEPTIONS
-.It
-.Li ACPI_LV_INIT_NAMES
-.It
-.Li ACPI_LV_PARSE
-.It
-.Li ACPI_LV_LOAD
-.It
-.Li ACPI_LV_DISPATCH
-.It
-.Li ACPI_LV_EXEC
-.It
-.Li ACPI_LV_NAMES
-.It
-.Li ACPI_LV_OPREGION
-.It
-.Li ACPI_LV_BFIELD
-.It
-.Li ACPI_LV_TABLES
-.It
-.Li ACPI_LV_VALUES
-.It
-.Li ACPI_LV_OBJECTS
-.It
-.Li ACPI_LV_RESOURCES
-.It
-.Li ACPI_LV_USER_REQUESTS
-.It
-.Li ACPI_LV_PACKAGE
-.It
-.Li ACPI_LV_VERBOSITY1
-.It
-.Li ACPI_LV_ALLOCATIONS
-.It
-.Li ACPI_LV_FUNCTIONS
-.It
-.Li ACPI_LV_OPTIMIZATIONS
-.It
-.Li ACPI_LV_VERBOSITY2
-.It
-.Li ACPI_LV_ALL
-.It
-.Li ACPI_LV_MUTEX
-.It
-.Li ACPI_LV_THREADS
-.It
-.Li ACPI_LV_IO
-.It
-.Li ACPI_LV_INTERRUPTS
-.It
-.Li ACPI_LV_VERBOSITY3
-.It
-.Li ACPI_LV_AML_DISASSEMBLE
-.It
-.Li ACPI_LV_VERBOSE_INFO
-.It
-.Li ACPI_LV_FULL_TABLES
-.It
-.Li ACPI_LV_EVENTS
-.It
-.Li ACPI_LV_VERBOSE
-.El
-.Pp
-Selection of the appropriate layer and level values is important
-to avoid massive amounts of debugging output.
-Check the code to see which you need.
+.Sh DISABLING ACPI
+Since ACPI support on different platforms varies greatly, there are many
+debugging and tuning options available.
.Pp
-Debugging output by the ACPI CA subsystem is prefixed with the
-module name in lowercase, followed by a source line number.
-Output from the
-.Fx Ns -local
-code follows the same format, but
-the module name is uppercased.
-.Pp
For machines known not to work with
.Nm
enabled, there is a BIOS blacklist.
@@ -234,9 +167,8 @@
.Pp
Some i386 machines totally fail to operate with some or all of ACPI disabled.
Other i386 machines fail with ACPI enabled.
-Non-i386 platforms do not support operating systems which do not use ACPI.
-Disabling all or part of ACPI on non-i386 platforms may result in a
-non-functional system.
+Disabling all or part of ACPI on non-i386 platforms (i.e., platforms where
+ACPI support is mandatory) may result in a non-functional system.
.Pp
The
.Nm
@@ -248,7 +180,7 @@
Multiple entries can be listed, separated by a space.
.Pp
ACPI sub-devices and features that can be disabled:
-.Bl -tag -width sysresource
+.Bl -tag -width ".Li sysresource"
.It Li all
Disable all ACPI features and devices.
.It Li acad
@@ -315,8 +247,153 @@
.Va debug.acpi.avoid .
The object and all of its children will be ignored during the
bus/children scan of the namespace.
-The ACPI CA code will still
-know about the avoided region.
+The ACPI CA code will still know about the avoided region.
+.Sh DEBUGGING OUTPUT
+To enable debugging output,
+.Nm
+must be compiled with
+.Cd "options ACPI_DEBUG" .
+Debugging output is separated between layers and levels, where a layer is
+a component of the ACPI subsystem, and a level is a particular kind
+of debugging output.
+.Pp
+Both layers and levels are specified as a whitespace-separated list of
+tokens, with layers listed in
+.Va debug.acpi.layer
+and levels in
+.Va debug.acpi.level .
+.Pp
+The first set of layers is for ACPI-CA components, and the second is for
+.Fx
+drivers.
+The ACPI-CA layer descriptions include the prefix for the files they
+refer to.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list