PERFORCE change 144809 for review
John Birrell
jb at FreeBSD.org
Mon Jul 7 08:44:59 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=144809
Change 144809 by jb at freebsd3 on 2008/07/07 08:44:49
IF7
Affected files ...
.. //depot/projects/dtrace7/src/contrib/gdtoa/gethex.c#2 integrate
.. //depot/projects/dtrace7/src/etc/devd.conf#2 integrate
.. //depot/projects/dtrace7/src/etc/periodic/security/800.loginfail#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/stdlib/system.3#2 integrate
.. //depot/projects/dtrace7/src/lib/libc/sys/mkdir.2#3 integrate
.. //depot/projects/dtrace7/src/sbin/devfs/devfs.8#2 integrate
.. //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.8#3 integrate
.. //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.c#3 integrate
.. //depot/projects/dtrace7/src/share/man/man4/Makefile#8 integrate
.. //depot/projects/dtrace7/src/share/man/man4/auditpipe.4#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/k8temp.4#1 branch
.. //depot/projects/dtrace7/src/share/man/man4/snd_emu10kx.4#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#8 integrate
.. //depot/projects/dtrace7/src/sys/amd64/conf/NOTES#5 integrate
.. //depot/projects/dtrace7/src/sys/amd64/include/vmparam.h#2 integrate
.. //depot/projects/dtrace7/src/sys/conf/NOTES#7 integrate
.. //depot/projects/dtrace7/src/sys/conf/files#14 integrate
.. //depot/projects/dtrace7/src/sys/conf/files.amd64#6 integrate
.. //depot/projects/dtrace7/src/sys/ddb/db_capture.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/aac/aac.c#6 integrate
.. //depot/projects/dtrace7/src/sys/dev/aac/aac_disk.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/acpi_support/acpi_asus.c#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/et/if_et.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/et/if_etreg.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/et/if_etvar.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/k8temp/k8temp.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mii/miidevs#5 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/truephy.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/mii/truephyreg.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/usb/usbdevs#9 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/uscanner.c#3 integrate
.. //depot/projects/dtrace7/src/sys/fs/fdescfs/fdesc.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/fdescfs/fdesc_vfsops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/fdescfs/fdesc_vnops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/nwfs/nwfs_node.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs.h#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs_node.c#2 integrate
.. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs_vfsops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/i386/conf/GENERIC#7 integrate
.. //depot/projects/dtrace7/src/sys/kern/uipc_syscalls.c#4 integrate
.. //depot/projects/dtrace7/src/sys/modules/Makefile#15 integrate
.. //depot/projects/dtrace7/src/sys/modules/et/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/k8temp/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/mii/Makefile#4 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_dummynet.c#4 integrate
.. //depot/projects/dtrace7/src/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netipx/spx_usrreq.c#2 integrate
.. //depot/projects/dtrace7/src/sys/pci/viapm.c#2 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit.h#3 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_worker.c#5 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/include/in_cksum.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sun4v/include/in_cksum.h#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ufs/extattr.h#2 integrate
.. //depot/projects/dtrace7/src/sys/ufs/ufs/ufs_extattr.c#3 integrate
.. //depot/projects/dtrace7/src/usr.bin/su/su.1#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/mountd/exports.5#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/wpa/wpa_supplicant/Makefile#5 integrate
.. //depot/projects/dtrace7/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#2 integrate
Differences ...
==== //depot/projects/dtrace7/src/contrib/gdtoa/gethex.c#2 (text+ko) ====
@@ -113,8 +113,11 @@
e += e1;
}
*sp = (char*)s;
- if (zret)
- return havedig ? STRTOG_Zero : STRTOG_NoNumber;
+ if (zret) {
+ if (!havedig)
+ *sp = s0 - 1;
+ return STRTOG_Zero;
+ }
n = s1 - s0 - 1;
for(k = 0; n > 7; n >>= 1)
k++;
==== //depot/projects/dtrace7/src/etc/devd.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.38 2007/06/21 22:50:36 njl Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.38.2.1 2008/07/01 21:36:03 rpaulo Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -252,6 +252,28 @@
action "/etc/rc.resume acpi $notify";
};
+# The next blocks enable volume hotkeys that can be found on the Asus EeePC
+notify 0 {
+ match "system" "ACPI";
+ match "subsystem" "ASUS-Eee";
+ match "notify" "0x13";
+ action "mixer 0";
+};
+
+notify 0 {
+ match "system" "ACPI";
+ match "subsystem" "ASUS-Eee";
+ match "notify" "0x14";
+ action "mixer vol -10";
+};
+
+notify 0 {
+ match "system" "ACPI";
+ match "subsystem" "ASUS-Eee";
+ match "notify" "0x15";
+ action "mixer vol +10";
+};
+
/* EXAMPLES TO END OF FILE
# The following might be an example of something that a vendor might
==== //depot/projects/dtrace7/src/etc/periodic/security/800.loginfail#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/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $
+# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8.2.1 2008/07/06 10:21:12 mtm Exp $
#
# Show login failures
@@ -59,7 +59,7 @@
[Yy][Ee][Ss])
echo ""
echo "${host} login failures:"
- n=$(catmsgs | egrep -ia "^$yesterday.*: .* (fail|invalid|bad|illegal)" |
+ n=$(catmsgs | egrep -ia "^$yesterday.*: .*(fail|invalid|bad|illegal)" |
tee /dev/stderr | wc -l)
[ $n -gt 0 ] && rc=1 || rc=0;;
*) rc=0;;
==== //depot/projects/dtrace7/src/lib/libc/stdlib/system.3#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)system.3 8.1 (Berkeley) 6/4/93
-.\" $FreeBSD: src/lib/libc/stdlib/system.3,v 1.12 2007/01/09 00:28:10 imp Exp $
+.\" $FreeBSD: src/lib/libc/stdlib/system.3,v 1.12.2.1 2008/06/30 09:16:22 danger Exp $
.\"
.Dd June 4, 1993
.Dt SYSTEM 3
@@ -70,7 +70,7 @@
will return non-zero if the command interpreter
.Xr sh 1
is available, and zero if it is not.
-.Pp
+.Sh RETURN VALUES
The
.Fn system
function
==== //depot/projects/dtrace7/src/lib/libc/sys/mkdir.2#3 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)mkdir.2 8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.24.2.1 2008/04/30 23:32:12 scf Exp $
+.\" $FreeBSD: src/lib/libc/sys/mkdir.2,v 1.24.2.2 2008/06/30 09:06:19 danger Exp $
.\"
-.Dd December 9, 2006
+.Dd June 26, 2008
.Dt MKDIR 2
.Os
.Sh NAME
@@ -80,6 +80,9 @@
manual page for more information.
.It Bq Er EROFS
The named directory would reside on a read-only file system.
+.It Bq Er EMLINK
+The new directory cannot be created because the parent directory contains
+too many subdirectories.
.It Bq Er EEXIST
The named file exists.
.It Bq Er ENOSPC
==== //depot/projects/dtrace7/src/sbin/devfs/devfs.8#2 (text+ko) ====
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.18 2006/12/29 22:45:12 danger Exp $
+.\" $FreeBSD: src/sbin/devfs/devfs.8,v 1.18.2.1 2008/07/02 13:03:08 mtm Exp $
.\"
-.Dd November 5, 2006
+.Dd July 1, 2008
.Dt DEVFS 8
.Os
.Sh NAME
@@ -312,7 +312,7 @@
.Xr snp 4
devices.
.Pp
-.Dl "devfs rule -s 20 add major 53 group games"
+.Dl "devfs rule -s 20 add type disk group wheel"
.Pp
Add a rule to ruleset number 20.
Since this ruleset is not the current ruleset for any mount-points,
==== //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.8#3 (text+ko) ====
@@ -39,9 +39,9 @@
.\" @(#)vnconfig.8 8.1 (Berkeley) 6/5/93
.\" from: src/usr.sbin/vnconfig/vnconfig.8,v 1.19 2000/12/27 15:30:29
.\"
-.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.37.2.1 2007/12/02 08:47:28 remko Exp $
+.\" $FreeBSD: src/sbin/mdconfig/mdconfig.8,v 1.37.2.2 2008/07/05 08:14:04 marck Exp $
.\"
-.Dd November 28, 2007
+.Dd July 5, 2008
.Dt MDCONFIG 8
.Os
.Sh NAME
@@ -65,6 +65,7 @@
.Nm
.Fl l
.Op Fl n
+.Op Fl v
.Op Fl u Ar unit
.Sh DESCRIPTION
The
@@ -119,6 +120,9 @@
If given with
.Fl u ,
display details about that particular device.
+If
+.Fl v
+option specified, show all details.
.It Fl n
When printing md device names, print only the unit number without the
md prefix.
==== //depot/projects/dtrace7/src/sbin/mdconfig/mdconfig.c#3 (text+ko) ====
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.54.2.1 2007/12/06 11:54:36 flz Exp $
+ * $FreeBSD: src/sbin/mdconfig/mdconfig.c,v 1.54.2.2 2008/07/05 08:14:04 marck Exp $
*
*/
#include <sys/param.h>
@@ -59,7 +59,7 @@
" [-s size] [-S sectorsize] [-u unit]\n"
" [-x sectors/track] [-y heads/cyl]\n"
" mdconfig -d -u unit\n"
-" mdconfig -l [-n] [-u unit]\n");
+" mdconfig -l [-v] [-n] [-u unit]\n");
fprintf(stderr, "\t\ttype = {malloc, preload, vnode, swap}\n");
fprintf(stderr, "\t\toption = {cluster, compress, reserve}\n");
fprintf(stderr, "\t\tsize = %%d (512 byte blocks), %%db (B),\n");
@@ -71,7 +71,7 @@
int
main(int argc, char **argv)
{
- int ch, fd, i;
+ int ch, fd, i, vflag;
char *p;
int cmdline = 0;
char *mdunit;
@@ -80,9 +80,10 @@
mdio.md_file = malloc(PATH_MAX);
if (mdio.md_file == NULL)
err(1, "could not allocate memory");
+ vflag = 0;
bzero(mdio.md_file, PATH_MAX);
for (;;) {
- ch = getopt(argc, argv, "ab:df:lno:s:S:t:u:x:y:");
+ ch = getopt(argc, argv, "ab:df:lno:s:S:t:u:vx:y:");
if (ch == -1)
break;
switch (ch) {
@@ -237,6 +238,11 @@
mdunit = optarg;
mdio.md_options &= ~MD_AUTOUNIT;
break;
+ case 'v':
+ if (cmdline != 3)
+ usage();
+ vflag = OPT_VERBOSE;
+ break;
case 'x':
if (cmdline != 2)
usage();
@@ -282,7 +288,7 @@
* Listing all devices. This is why we pass NULL
* together with OPT_LIST.
*/
- md_list(NULL, OPT_LIST);
+ md_list(NULL, OPT_LIST | vflag);
} else {
return (md_query(mdunit));
}
@@ -373,13 +379,13 @@
}
}
opt |= OPT_DONE;
- if (opt & OPT_LIST)
+ if ((opt & OPT_LIST) && !(opt & OPT_VERBOSE))
printf(" ");
else
printf("\n");
}
}
- if ((opt & OPT_LIST) && (opt & OPT_DONE))
+ if ((opt & OPT_LIST) && (opt & OPT_DONE) && !(opt & OPT_VERBOSE))
printf("\n");
/* XXX: Check if it's enough to clean everything. */
geom_stats_snapshot_free(sq);
==== //depot/projects/dtrace7/src/share/man/man4/Makefile#8 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: src/share/man/man4/Makefile,v 1.393.2.11 2008/05/09 02:23:11 weongyo Exp $
+# $FreeBSD: src/share/man/man4/Makefile,v 1.393.2.12 2008/07/06 16:24:50 rpaulo Exp $
MAN= aac.4 \
acpi.4 \
@@ -138,6 +138,7 @@
iwi.4 \
ixgb.4 \
joy.4 \
+ k8temp.4 \
kbdmux.4 \
keyboard.4 \
kld.4 \
==== //depot/projects/dtrace7/src/share/man/man4/auditpipe.4#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/auditpipe.4,v 1.5 2006/12/14 16:40:57 mpp Exp $
+.\" $FreeBSD: src/share/man/man4/auditpipe.4,v 1.5.2.1 2008/06/30 18:35:11 rwatson Exp $
.\"
.Dd May 5, 2006
.Os
@@ -185,7 +185,7 @@
.It Dv AUDITPIPE_GET_PRESELECT_AUID
Query the current preselection masks for a specific auid on the pipe.
The ioctl argument should be of type
-.Vt "struct auditpipe_preselect" .
+.Vt "struct auditpipe_ioctl_preselect" .
The auid to query is specified via the
.Va ap_auid
field of type
==== //depot/projects/dtrace7/src/share/man/man4/snd_emu10kx.4#2 (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/snd_emu10kx.4,v 1.5 2007/09/12 07:43:43 ariff Exp $
+.\" $FreeBSD: src/share/man/man4/snd_emu10kx.4,v 1.5.2.1 2008/07/06 11:08:50 danger Exp $
.\"
-.Dd July 15, 2007
+.Dd May 28, 2008
.Dt SND_EMU10KX 4
.Os
.Sh NAME
@@ -61,7 +61,7 @@
.Sx MULTICHANNEL PLAYBACK
for details), and MPU401-compatible MIDI I/O controller, which is accessible
through the midi device.
-Wave table synthesizer is not supported.
+Wave table synthesizer support is not available.
.Sh HARDWARE
The
.Nm
@@ -90,7 +90,7 @@
.Nm
driver does
.Em not
-support the following sound cards (although they are named
+support the following sound cards (although they have names
similar to some supported ones):
.Pp
.Bl -bullet -compact
@@ -110,25 +110,29 @@
All Creative X-Fi series sound cards.
.El
.Sh MULTICHANNEL PLAYBACK
-By default driver is loaded with multichannel playback capabilities enabled.
+By default the
+.Nm
+driver is loaded with multichannel playback capabilities enabled.
If you do not set the
.Dv hint.emu10kx.0.multichannel_disabled
option in your
.Xr loader.conf 5
-configuration file you will get up to
-five DSP devices, one for each sound card output.
+configuration file you will get up to five DSP devices, one for each
+sound card output.
You can use additional software (like
.Em audio/pulseaudio
from
-.Em The Ports Collection
-) to do sound stream demultiplexing.
+.Em The Ports Collection )
+to do sound stream demultiplexing.
Only
.Dq FRONT
output can play and record sound from external
sources (like line or S/PDIF inputs).
.Sh MULTICHANNEL RECORDING
By default multichannel recording capabilities are not enabled when you load
-this driver.
+the
+.Nm
+driver.
If you enable the
.Dv hint.emu10kx.0.multichannel_recording
option in
@@ -136,14 +140,14 @@
you will get one more DSP device that is rate-locked to 48kHz/16bit/mono.
This is actually 48kHz/16bit/32 channels on SB Live! cards and
48kHz/16bit/64channels on Audigy cards, but the current implementation of
-sound subsystem does not support such an amount of PCM channels.
+the sound subsystem does not support such an amount of PCM channels.
This device can not be opened for read, thus confusing many applications.
.Pp
-Within multichannel stream first half (0-15 or 0-31) is a copy of all DSP
-outputs, second half (15-30 or 32-63) is a copy of some DSP inputs.
-On Live! cards the last substream (31) is used as a sync stream and always
+Within a multichannel stream, the first half (0-15 or 0-31) is a copy of all DSP
+outputs, the second half (15-30 or 32-63) is a copy of some DSP inputs.
+On Live! cards the last substream (31) is used as a sync stream and is always
set to 0xc0de.
-Audigy cards do not need such sync data, because stream always start with
+Audigy cards do not need such sync data, because a stream always starts with
substream 0.
.Ss SB Live! substream map (in byte offsets, each substream is 2 bytes LE)
.Bl -tag -width ".Dv +0x00..+0x1E"
@@ -183,19 +187,20 @@
some DSP-based mixer controls.
.Bl -inset
.It Qq vol
-mixer control is overall sound volume.
+mixer control for the overall sound volume.
.It Qq pcm
-mixer control is PCM playback volume.
+mixer control for the PCM playback volume.
It controls only front output
volume in multichannel mode and all output volume in single channel mode.
.It Qq rec
-mixer control acts very different on EMU10K1 and other cards.
+mixer control acts very differently on EMU10K1 and other cards.
On EMU10K1 cards it controls the AC97 codec recording level.
-On non-EMU10K1 cards it controls the amount of AC97 "stereo mix" entering
-the DSP.
+On non-EMU10K1 cards it controls the amount of AC97
+.Dq stereo mix
+ entering the DSP.
AC97 recording level and AC97 recording source are fixed on CA0100, CA0101,
CA0102 and CA0108 cards.
-AC97 recording level are always set to maximum and recording source is always
+The AC97 recording levels are always set to maximum and recording source is always
.Dq Li "stereo mix" .
.It Qq dig1
is a CD S/PDIF (on-card) volume control
@@ -210,26 +215,27 @@
is AudigyDrive "AUX In 2" volume control
.El
.Pp
-Other OSS mixer controls control inputs of AC97 codec.
+Other OSS mixer controls control the inputs of the AC97 codec.
.Sh PRIVATE DEVICE CONTROLS
-You can control some of EMU10Kx operation and configuration parameters through
+You can control some of EMU10Kx's operation and configuration parameters through
.Va dev.emu10kx. Ns Aq Ar X
sysctls.
These
.Xr sysctl 8
-values are temporary and should not be relied
-upon.
+values are temporary and should not be relied upon.
.Sh DRIVER CONFIGURATION
Loader tunables are used to set driver configuration.
Tunables can be set at the
.Xr loader 8
prompt before booting the kernel or they can be stored in
.Pa /boot/loader.conf .
-These tunables can't be changed from a maching
+These tunables cannot be changed from a machine
.Xr sysctl 8
entry after boot, but you can change them using
.Xr kenv 1
-while the driver is not loaded.
+before loading the
+.Nm
+driver.
.Bl -tag -width indent
.It Va hint.emu10kx. Ns Ao Ar X Ac Ns Va .disabled
Disables loading a driver instance.
@@ -285,7 +291,7 @@
S/PDIF is not connected and S/PDIF volume is not zero.
.Pp
The PCM driver cannot detect the presence of Live!Drive or AudigyDrive
-breakout boxes and tries to use them (and list their connectors in the
+breakout boxes and tries to use them (and list their connectors in the
mixer).
.Pp
The MIDI driver cannot detect the presence of Live!Drive or AudigyDrive
==== //depot/projects/dtrace7/src/sys/amd64/conf/GENERIC#8 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.7 2008/04/10 22:09:21 rwatson Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484.2.8 2008/07/04 01:29:12 delphij Exp $
cpu HAMMER
ident GENERIC
@@ -197,6 +197,7 @@
device bfe # Broadcom BCM440x 10/100 Ethernet
device bge # Broadcom BCM570xx Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
+device et # Agere ET1310 10/100/Gigabit Ethernet
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
device lge # Level 1 LXT1001 gigabit Ethernet
device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet
==== //depot/projects/dtrace7/src/sys/amd64/conf/NOTES#5 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69.2.4 2008/02/03 07:28:37 scottl Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.69.2.5 2008/07/06 16:24:50 rpaulo Exp $
#
#
@@ -455,8 +455,10 @@
# Temperature sensors:
#
# coretemp: on-die sensor on Intel Core and newer CPUs
+# k8temp: on-die sensor on AMD K8 CPUs
#
device coretemp
+device k8temp
#---------------------------------------------------------------------------
# ISDN4BSD
==== //depot/projects/dtrace7/src/sys/amd64/include/vmparam.h#2 (text+ko) ====
@@ -38,7 +38,7 @@
* SUCH DAMAGE.
*
* from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.49 2007/09/25 06:25:04 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.49.2.1 2008/07/01 16:42:51 obrien Exp $
*/
@@ -134,8 +134,17 @@
/*
* Virtual addresses of things. Derived from the page directory and
* page table indexes from pmap.h for precision.
- * Because of the page that is both a PD and PT, it looks a little
- * messy at times, but hey, we'll do anything to save a page :-)
+ *
+ * 0x0000000000000000 - 0x00007fffffffffff user map
+ * 0x0000800000000000 - 0xffff7fffffffffff does not exist (hole)
+ * 0xffff800000000000 - 0xffff804020100fff recursive page table (512GB slot)
+ * 0xffff804020101000 - 0xfffffeffffffffff unused
+ * 0xffffff0000000000 - 0xffffff7fffffffff 512GB direct map mappings
+ * 0xffffff8000000000 - 0xffffffff7fffffff unused (510GB)
+ * 0xffffffff80000000 - 0xffffffffffffffff 2GB kernel map
+ *
+ * Within the kernel map:
+ * 0xffffffff80000000 KERNBASE
*/
#define VM_MAX_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-1, NKPDE-1, NPTEPG-1)
==== //depot/projects/dtrace7/src/sys/conf/NOTES#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1454.2.9 2008/05/19 04:42:40 grog Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1454.2.11 2008/07/04 01:29:12 delphij Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -1740,7 +1740,7 @@
# MII bus support is required for some PCI 10/100 ethernet NICs,
# namely those which use MII-compliant transceivers or implement
# transceiver control interfaces that operate like an MII. Adding
-# "device miibus0" to the kernel config pulls in support for
+# "device miibus" to the kernel config pulls in support for
# the generic miibus API and all of the PHY drivers, including a
# generic one for PHYs that aren't specifically handled by an
# individual driver.
@@ -1895,6 +1895,7 @@
device bge # Broadcom BCM570xx Gigabit Ethernet
device cxgb # Chelsio T3 10 Gigabit Ethernet
device dc # DEC/Intel 21143 and various workalikes
+device et # Agere ET1310 10/100/Gigabit Ethernet
device fxp # Intel EtherExpress PRO/100B (82557, 82558)
hint.fxp.0.prefer_iomap="0"
device gem # Apple GMAC/Sun ERI/Sun GEM
==== //depot/projects/dtrace7/src/sys/conf/files#14 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1243.2.24 2008/06/27 04:42:19 jhb Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1243.2.26 2008/07/04 01:29:12 delphij Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -636,6 +636,7 @@
compile-with "${NORMAL_C} -I$S/dev/em"
dev/em/e1000_osdep.c optional em | igb \
compile-with "${NORMAL_C} -I$S/dev/em"
+dev/et/if_et.c optional et
dev/en/if_en_pci.c optional en pci
dev/en/midway.c optional en
dev/ep/if_ep.c optional ep
@@ -814,6 +815,7 @@
dev/mii/ruephy.c optional miibus | ruephy
dev/mii/tdkphy.c optional miibus | tdkphy
dev/mii/tlphy.c optional miibus | tlphy
+dev/mii/truephy.c optional miibus | truephy
dev/mii/ukphy.c optional miibus | mii
dev/mii/ukphy_subr.c optional miibus | mii
dev/mii/xmphy.c optional miibus | xmphy
@@ -1693,7 +1695,7 @@
netatalk/aarp.c optional netatalk
netatalk/at_control.c optional netatalk
netatalk/at_proto.c optional netatalk
-netatalk/at_rmx.c optional netatalkdebug
+netatalk/at_rmx.c optional netatalk
netatalk/ddp_input.c optional netatalk
netatalk/ddp_output.c optional netatalk
netatalk/ddp_pcb.c optional netatalk
==== //depot/projects/dtrace7/src/sys/conf/files.amd64#6 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.amd64,v 1.107.2.6 2008/04/10 22:09:22 rwatson Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.107.2.7 2008/07/06 16:24:50 rpaulo Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -187,6 +187,7 @@
dev/hwpmc/hwpmc_amd.c optional hwpmc
dev/hwpmc/hwpmc_piv.c optional hwpmc
dev/hwpmc/hwpmc_x86.c optional hwpmc
+dev/k8temp/k8temp.c optional k8temp
dev/kbd/kbd.c optional atkbd | sc | ukbd
dev/mem/memutil.c optional mem
dev/nfe/if_nfe.c optional nfe pci
==== //depot/projects/dtrace7/src/sys/ddb/db_capture.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.5.2.5 2008/04/01 11:31:18 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.5.2.6 2008/07/01 12:15:55 rwatson Exp $");
#include "opt_ddb.h"
@@ -83,13 +83,16 @@
static SYSCTL_NODE(_debug_ddb, OID_AUTO, capture, CTLFLAG_RW, 0,
"DDB capture options");
-SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bytes, CTLFLAG_RD,
+SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bufoff, CTLFLAG_RD,
&db_capture_bufoff, 0, "Bytes of data in DDB capture buffer");
SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, maxbufsize, CTLFLAG_RD,
&db_capture_maxbufsize, 0,
"Maximum value for debug.ddb.capture.bufsize");
+SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD,
+ &db_capture_inprogress, 0, "DDB output capture in progress");
+
/*
* Boot-time allocation of the DDB capture buffer, if any. Force all buffer
* sizes, including the maximum size, to be rounded to block sizes.
==== //depot/projects/dtrace7/src/sys/dev/aac/aac.c#6 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.120.2.11 2008/04/07 14:19:57 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac.c,v 1.120.2.12 2008/07/01 22:16:33 emaste Exp $");
/*
* Driver for the Adaptec 'FSA' family of PCI/SCSI RAID adapters.
@@ -2998,6 +2998,7 @@
aac_poll(struct cdev *dev, int poll_events, d_thread_t *td)
{
struct aac_softc *sc;
+ struct aac_fib_context *ctx;
int revents;
sc = dev->si_drv1;
@@ -3005,8 +3006,12 @@
mtx_lock(&sc->aac_aifq_lock);
if ((poll_events & (POLLRDNORM | POLLIN)) != 0) {
- if (sc->aifq_idx != 0 || sc->aifq_filled)
- revents |= poll_events & (POLLIN | POLLRDNORM);
+ for (ctx = sc->fibctx; ctx; ctx = ctx->next) {
+ if (ctx->ctx_idx != sc->aifq_idx || ctx->ctx_wrap) {
+ revents |= poll_events & (POLLIN | POLLRDNORM);
+ break;
+ }
+ }
}
mtx_unlock(&sc->aac_aifq_lock);
==== //depot/projects/dtrace7/src/sys/dev/aac/aac_disk.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.43.10.2 2008/03/31 19:21:49 emaste Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aac/aac_disk.c,v 1.43.10.3 2008/07/02 14:17:49 emaste Exp $");
#include "opt_aac.h"
@@ -183,9 +183,6 @@
/*
* Map the S/G elements for doing a dump.
- *
- * XXX This does not handle >4GB of RAM. Fixing it is possible except on
- * adapters that cannot do 64bit s/g lists.
*/
static void
aac_dump_map_sg(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
@@ -212,6 +209,31 @@
}
/*
+ * Map the S/G elements for doing a dump on 64-bit capable devices.
+ */
+static void
+aac_dump_map_sg64(void *arg, bus_dma_segment_t *segs, int nsegs, int error)
+{
+ struct aac_fib *fib;
+ struct aac_blockwrite64 *bw;
+ struct aac_sg_table64 *sg;
+ int i;
+
+ fib = (struct aac_fib *)arg;
+ bw = (struct aac_blockwrite64 *)&fib->data[0];
+ sg = &bw->SgMap64;
+
+ if (sg != NULL) {
+ sg->SgCount = nsegs;
+ for (i = 0; i < nsegs; i++) {
+ sg->SgEntry64[i].SgAddress = segs[i].ds_addr;
+ sg->SgEntry64[i].SgByteCount = segs[i].ds_len;
+ }
+ fib->Header.Size = nsegs * sizeof(struct aac_sg_entry64);
+ }
+}
+
+/*
* Dump memory out to an array
*
* Send out one command at a time with up to AAC_MAXIO of data.
@@ -222,12 +244,13 @@
struct aac_disk *ad;
struct aac_softc *sc;
struct aac_fib *fib;
- struct aac_blockwrite *bw;
size_t len;
int size;
static bus_dmamap_t dump_datamap;
static int first = 0;
struct disk *dp;
+ bus_dmamap_callback_t *callback;
+ u_int32_t command;
dp = arg;
ad = dp->d_drv1;
@@ -247,15 +270,33 @@
/* Skip aac_alloc_sync_fib(). We don't want to mess with sleep locks */
fib = &sc->aac_common->ac_sync_fib;
- bw = (struct aac_blockwrite *)&fib->data[0];
while (length > 0) {
len = (length > AAC_MAXIO) ? AAC_MAXIO : length;
- bw->Command = VM_CtBlockWrite;
- bw->ContainerId = ad->ad_container->co_mntobj.ObjectId;
- bw->BlockNumber = offset / AAC_BLOCK_SIZE;
- bw->ByteCount = len;
- bw->Stable = CUNSTABLE;
+ if ((sc->flags & AAC_FLAGS_SG_64BIT) == 0) {
+ struct aac_blockwrite *bw;
+ bw = (struct aac_blockwrite *)&fib->data[0];
+ bw->Command = VM_CtBlockWrite;
+ bw->ContainerId = ad->ad_container->co_mntobj.ObjectId;
+ bw->BlockNumber = offset / AAC_BLOCK_SIZE;
+ bw->ByteCount = len;
+ bw->Stable = CUNSTABLE;
+ command = ContainerCommand;
+ callback = aac_dump_map_sg;
+ size = sizeof(struct aac_blockwrite);
+ } else {
+ struct aac_blockwrite64 *bw;
+ bw = (struct aac_blockwrite64 *)&fib->data[0];
+ bw->Command = VM_CtHostWrite64;
+ bw->ContainerId = ad->ad_container->co_mntobj.ObjectId;
+ bw->BlockNumber = offset / AAC_BLOCK_SIZE;
+ bw->SectorCount = len / AAC_BLOCK_SIZE;
+ bw->Pad = 0;
+ bw->Flags = 0;
+ command = ContainerCommand64;
+ callback = aac_dump_map_sg64;
+ size = sizeof(struct aac_blockwrite64);
+ }
/*
* There really isn't any way to recover from errors or
@@ -264,16 +305,16 @@
* is too much required context.
*/
if (bus_dmamap_load(sc->aac_buffer_dmat, dump_datamap, virtual,
- len, aac_dump_map_sg, fib, BUS_DMA_NOWAIT) != 0)
+ len, callback, fib, BUS_DMA_NOWAIT) != 0)
return (ENOMEM);
bus_dmamap_sync(sc->aac_buffer_dmat, dump_datamap,
BUS_DMASYNC_PREWRITE);
/* fib->Header.Size is set in aac_dump_map_sg */
- size = fib->Header.Size + sizeof(struct aac_blockwrite);
+ size += fib->Header.Size;
- if (aac_sync_fib(sc, ContainerCommand, 0, fib, size)) {
+ if (aac_sync_fib(sc, command, 0, fib, size)) {
printf("Error dumping block 0x%jx\n",
(uintmax_t)physical);
return (EIO);
==== //depot/projects/dtrace7/src/sys/dev/acpi_support/acpi_asus.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.30.2.2 2008/04/22 12:44:39 rpaulo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.30.2.3 2008/07/01 21:36:03 rpaulo Exp $");
/*
* Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on
@@ -55,6 +55,8 @@
#define ACPI_ASUS_METHOD_BRN 1
#define ACPI_ASUS_METHOD_DISP 2
#define ACPI_ASUS_METHOD_LCD 3
+#define ACPI_ASUS_METHOD_CAMERA 4
+#define ACPI_ASUS_METHOD_CARDRD 5
#define _COMPONENT ACPI_OEM
ACPI_MODULE_NAME("ASUS")
@@ -79,6 +81,14 @@
char *disp_get;
char *disp_set;
+
+ char *cam_get;
+ char *cam_set;
+
+ char *crd_get;
+ char *crd_set;
+
+ void (*n_func)(ACPI_HANDLE, UINT32, void *);
};
struct acpi_asus_led {
@@ -114,6 +124,8 @@
int s_brn;
int s_disp;
int s_lcd;
+ int s_cam;
+ int s_crd;
};
/*
@@ -375,6 +387,8 @@
{ .name = NULL }
};
+static void acpi_asus_eeepc_notify(ACPI_HANDLE h, UINT32 notify, void *context);
+
/*
* EeePC have an Asus ASUS010 gadget interface,
* but they can't be probed quite the same way as Asus laptops.
@@ -383,7 +397,12 @@
{
.name = "EEE",
.brn_get = "\\_SB.ATKD.PBLG",
- .brn_set = "\\_SB.ATKD.PBLS"
+ .brn_set = "\\_SB.ATKD.PBLS",
+ .cam_get = "\\_SB.ATKD.CAMG",
+ .cam_set = "\\_SB.ATKD.CAMS",
+ .crd_set = "\\_SB.ATKD.CRDS",
+ .crd_get = "\\_SB.ATKD.CRDG",
+ .n_func = acpi_asus_eeepc_notify
},
{ .name = NULL }
@@ -393,21 +412,37 @@
char *name;
char *description;
int method;
+ int flags;
} acpi_asus_sysctls[] = {
{
.name = "lcd_backlight",
.method = ACPI_ASUS_METHOD_LCD,
- .description = "state of the lcd backlight"
+ .description = "state of the lcd backlight",
+ .flags = CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY
},
{
.name = "lcd_brightness",
.method = ACPI_ASUS_METHOD_BRN,
- .description = "brightness of the lcd panel"
+ .description = "brightness of the lcd panel",
+ .flags = CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY
},
{
.name = "video_output",
.method = ACPI_ASUS_METHOD_DISP,
- .description = "display output state"
+ .description = "display output state",
+ .flags = CTLTYPE_INT | CTLFLAG_RW
+ },
+ {
+ .name = "camera",
+ .method = ACPI_ASUS_METHOD_CAMERA,
+ .description = "internal camera state",
+ .flags = CTLTYPE_INT | CTLFLAG_RW
+ },
+ {
+ .name = "cardreader",
+ .method = ACPI_ASUS_METHOD_CARDRD,
+ .description = "internal card reader state",
+ .flags = CTLTYPE_INT | CTLFLAG_RW
},
{ .name = NULL }
@@ -647,7 +682,7 @@
SYSCTL_ADD_PROC(&sc->sysctl_ctx,
SYSCTL_CHILDREN(sc->sysctl_tree), OID_AUTO,
acpi_asus_sysctls[i].name,
- CTLTYPE_INT | CTLFLAG_RW | CTLFLAG_ANYBODY,
+ acpi_asus_sysctls[i].flags,
sc, i, acpi_asus_sysctl, "I",
acpi_asus_sysctls[i].description);
}
@@ -708,8 +743,11 @@
AcpiEvaluateObject(sc->handle, "BSTS", NULL, NULL);
/* Handle notifies */
+ if (sc->model->n_func == NULL)
+ sc->model->n_func = acpi_asus_notify;
+
AcpiInstallNotifyHandler(sc->handle, ACPI_SYSTEM_NOTIFY,
- acpi_asus_notify, dev);
+ sc->model->n_func, dev);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list