PERFORCE change 61455 for review
Peter Wemm
peter at FreeBSD.org
Mon Sep 13 15:12:50 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=61455
Change 61455 by peter at peter_daintree on 2004/09/13 22:12:46
IFC @61453
Affected files ...
.. //depot/projects/hammer/MAINTAINERS#28 integrate
.. //depot/projects/hammer/etc/devd.conf#14 integrate
.. //depot/projects/hammer/etc/rc.d/ipmon#9 integrate
.. //depot/projects/hammer/etc/rc.d/tmp#2 integrate
.. //depot/projects/hammer/etc/rc.d/var#2 integrate
.. //depot/projects/hammer/gnu/lib/csu/Makefile#8 integrate
.. //depot/projects/hammer/include/resolv.h#6 integrate
.. //depot/projects/hammer/lib/libautofs/Makefile#3 integrate
.. //depot/projects/hammer/lib/libautofs/libautofs.3#2 integrate
.. //depot/projects/hammer/lib/libautofs/libautofs.c#3 integrate
.. //depot/projects/hammer/lib/libautofs/libautofs.h#2 integrate
.. //depot/projects/hammer/lib/libc/db/btree/bt_debug.c#2 integrate
.. //depot/projects/hammer/lib/libc/db/btree/bt_split.c#3 integrate
.. //depot/projects/hammer/lib/libc/db/hash/hash.c#2 integrate
.. //depot/projects/hammer/lib/libc/db/mpool/mpool.c#3 integrate
.. //depot/projects/hammer/lib/libc/gmon/gmon.c#6 integrate
.. //depot/projects/hammer/lib/libc/net/res_init.c#5 integrate
.. //depot/projects/hammer/lib/libdisk/open_disk.c#6 integrate
.. //depot/projects/hammer/release/Makefile#57 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#5 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#59 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/readme/article.sgml#12 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#76 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/Makefile#5 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/errata/Makefile#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/errata/article.sgml#1 branch
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/amd64/proc-amd64.sgml#2 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#4 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/hardware/common/intro.sgml#2 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/artheader.sgml#2 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/install.sgml#5 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/layout.sgml#4 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/trouble.sgml#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/installation/common/upgrade.sgml#3 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/readme/article.sgml#5 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/relnotes/common/new.sgml#5 integrate
.. //depot/projects/hammer/release/doc/ru_RU.KOI8-R/share/sgml/release.dsl#3 integrate
.. //depot/projects/hammer/release/doc/share/misc/dev.archlist.txt#8 integrate
.. //depot/projects/hammer/release/doc/share/misc/man2hwnotes.pl#5 integrate
.. //depot/projects/hammer/sbin/Makefile#28 integrate
.. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.8#8 integrate
.. //depot/projects/hammer/sbin/bsdlabel/bsdlabel.c#17 integrate
.. //depot/projects/hammer/sbin/gbde/gbde.c#12 integrate
.. //depot/projects/hammer/sbin/ggate/ggatec/ggatec.c#2 integrate
.. //depot/projects/hammer/sbin/ggate/ggated/ggated.c#3 integrate
.. //depot/projects/hammer/sbin/ggate/ggatel/ggatel.c#2 integrate
.. //depot/projects/hammer/sbin/ggate/shared/ggate.c#3 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw.8#27 integrate
.. //depot/projects/hammer/sbin/ipfw/ipfw2.c#30 integrate
.. //depot/projects/hammer/sbin/mdconfig/mdconfig.c#11 integrate
.. //depot/projects/hammer/sbin/mount_autofs/Makefile#2 integrate
.. //depot/projects/hammer/sbin/mount_autofs/mount_autofs.8#2 integrate
.. //depot/projects/hammer/sbin/mount_autofs/mount_autofs.c#2 integrate
.. //depot/projects/hammer/share/examples/autofs/driver/Makefile#2 integrate
.. //depot/projects/hammer/share/examples/autofs/driver/autodriver.c#2 integrate
.. //depot/projects/hammer/share/examples/autofs/driver/autotab#2 integrate
.. //depot/projects/hammer/share/man/man4/Makefile#48 integrate
.. //depot/projects/hammer/share/man/man4/cnw.4#1 branch
.. //depot/projects/hammer/share/man/man4/csa.4#2 delete
.. //depot/projects/hammer/share/man/man4/em.4#4 integrate
.. //depot/projects/hammer/share/man/man4/esp.4#4 integrate
.. //depot/projects/hammer/share/man/man4/fwohci.4#5 integrate
.. //depot/projects/hammer/share/man/man4/gusc.4#3 delete
.. //depot/projects/hammer/share/man/man4/hifn.4#5 integrate
.. //depot/projects/hammer/share/man/man4/mac_bsdextended.4#7 integrate
.. //depot/projects/hammer/share/man/man4/maestro3.4#2 delete
.. //depot/projects/hammer/share/man/man4/man4.i386/fe.4#7 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/ie.4#3 integrate
.. //depot/projects/hammer/share/man/man4/man4.i386/lnc.4#3 integrate
.. //depot/projects/hammer/share/man/man4/miibus.4#8 integrate
.. //depot/projects/hammer/share/man/man4/ng_ubt.4#7 integrate
.. //depot/projects/hammer/share/man/man4/pcm.4#10 integrate
.. //depot/projects/hammer/share/man/man4/pcn.4#4 integrate
.. //depot/projects/hammer/share/man/man4/rc.4#4 integrate
.. //depot/projects/hammer/share/man/man4/safe.4#5 integrate
.. //depot/projects/hammer/share/man/man4/sbc.4#3 delete
.. //depot/projects/hammer/share/man/man4/snd_ad1816.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_als4000.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_cmi.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_cs4281.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_csa.4#1 branch
.. //depot/projects/hammer/share/man/man4/snd_ds1.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_emu10k1.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_es137x.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_gusc.4#1 branch
.. //depot/projects/hammer/share/man/man4/snd_maestro3.4#1 branch
.. //depot/projects/hammer/share/man/man4/snd_sbc.4#1 branch
.. //depot/projects/hammer/share/man/man4/snd_solo.4#2 integrate
.. //depot/projects/hammer/share/man/man4/snd_uaudio.4#1 branch
.. //depot/projects/hammer/share/man/man4/ti.4#8 integrate
.. //depot/projects/hammer/share/man/man4/uaudio.4#5 delete
.. //depot/projects/hammer/share/man/man4/ubsa.4#4 integrate
.. //depot/projects/hammer/share/man/man4/ubsec.4#3 integrate
.. //depot/projects/hammer/share/man/man4/ubser.4#3 integrate
.. //depot/projects/hammer/share/man/man4/uftdi.4#5 integrate
.. //depot/projects/hammer/share/man/man4/uplcom.4#7 integrate
.. //depot/projects/hammer/share/man/man4/uvisor.4#4 integrate
.. //depot/projects/hammer/share/man/man4/vge.4#1 branch
.. //depot/projects/hammer/share/man/man5/resolver.5#4 integrate
.. //depot/projects/hammer/sys/alpha/alpha/busdma_machdep.c#14 integrate
.. //depot/projects/hammer/sys/alpha/conf/GENERIC#23 integrate
.. //depot/projects/hammer/sys/alpha/include/atomic.h#6 integrate
.. //depot/projects/hammer/sys/amd64/amd64/busdma_machdep.c#16 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#104 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#55 integrate
.. //depot/projects/hammer/sys/amd64/include/pmap.h#45 integrate
.. //depot/projects/hammer/sys/arm/arm/busdma_machdep.c#3 integrate
.. //depot/projects/hammer/sys/boot/sparc64/loader/main.c#12 integrate
.. //depot/projects/hammer/sys/conf/NOTES#66 integrate
.. //depot/projects/hammer/sys/conf/files#82 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#12 integrate
.. //depot/projects/hammer/sys/dev/aac/aac.c#25 integrate
.. //depot/projects/hammer/sys/dev/acpica/acpi_thermal.c#20 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#35 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#44 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-dma.c#16 integrate
.. //depot/projects/hammer/sys/dev/bktr/msp34xx.c#4 integrate
.. //depot/projects/hammer/sys/dev/esp/esp_sbus.c#5 integrate
.. //depot/projects/hammer/sys/dev/mii/ciphy.c#1 branch
.. //depot/projects/hammer/sys/dev/mii/ciphyreg.h#1 branch
.. //depot/projects/hammer/sys/dev/mii/miidevs#8 integrate
.. //depot/projects/hammer/sys/dev/pccard/pccarddevs#25 integrate
.. //depot/projects/hammer/sys/dev/sound/isa/sb16.c#11 integrate
.. //depot/projects/hammer/sys/dev/sound/pcm/sndstat.c#7 integrate
.. //depot/projects/hammer/sys/dev/sym/sym_hipd.c#12 integrate
.. //depot/projects/hammer/sys/dev/usb/ugen.c#18 integrate
.. //depot/projects/hammer/sys/dev/usb/uhub.c#11 integrate
.. //depot/projects/hammer/sys/dev/usb/usb_subr.c#15 integrate
.. //depot/projects/hammer/sys/dev/vge/if_vge.c#1 branch
.. //depot/projects/hammer/sys/dev/vge/if_vgereg.h#1 branch
.. //depot/projects/hammer/sys/dev/vge/if_vgevar.h#1 branch
.. //depot/projects/hammer/sys/fs/autofs/autofs.h#3 integrate
.. //depot/projects/hammer/sys/fs/autofs/autofs_util.c#3 integrate
.. //depot/projects/hammer/sys/fs/autofs/autofs_vfsops.c#3 integrate
.. //depot/projects/hammer/sys/fs/autofs/autofs_vnops.c#3 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/denode.h#5 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_fat.c#4 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#4 integrate
.. //depot/projects/hammer/sys/fs/specfs/spec_vnops.c#23 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde_crypt.c#11 integrate
.. //depot/projects/hammer/sys/geom/bde/g_bde_lock.c#6 integrate
.. //depot/projects/hammer/sys/geom/geom_kern.c#15 integrate
.. //depot/projects/hammer/sys/geom/mirror/g_mirror.c#6 integrate
.. //depot/projects/hammer/sys/geom/uzip/g_uzip.c#2 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#8 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum.h#4 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_drive.c#8 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_plex.c#6 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rm.c#3 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_state.c#4 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_subr.c#7 integrate
.. //depot/projects/hammer/sys/geom/vinum/geom_vinum_var.h#2 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#29 integrate
.. //depot/projects/hammer/sys/i386/i386/busdma_machdep.c#17 integrate
.. //depot/projects/hammer/sys/i386/i386/db_trace.c#11 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#53 integrate
.. //depot/projects/hammer/sys/i386/include/pmap.h#17 integrate
.. //depot/projects/hammer/sys/ia64/conf/GENERIC#19 integrate
.. //depot/projects/hammer/sys/ia64/conf/SKI#13 integrate
.. //depot/projects/hammer/sys/ia64/ia64/busdma_machdep.c#13 integrate
.. //depot/projects/hammer/sys/kern/kern_conf.c#20 integrate
.. //depot/projects/hammer/sys/kern/kern_event.c#23 integrate
.. //depot/projects/hammer/sys/kern/kern_switch.c#26 integrate
.. //depot/projects/hammer/sys/kern/kern_synch.c#40 integrate
.. //depot/projects/hammer/sys/kern/sched_4bsd.c#28 integrate
.. //depot/projects/hammer/sys/kern/sched_ule.c#48 integrate
.. //depot/projects/hammer/sys/kern/subr_witness.c#33 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#37 integrate
.. //depot/projects/hammer/sys/kern/vnode_if.src#9 integrate
.. //depot/projects/hammer/sys/modules/Makefile#54 integrate
.. //depot/projects/hammer/sys/modules/autofs/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/geom/geom_uzip/Makefile#2 integrate
.. //depot/projects/hammer/sys/modules/vge/Makefile#1 branch
.. //depot/projects/hammer/sys/net/bpf.c#22 integrate
.. //depot/projects/hammer/sys/net/bpfdesc.h#9 integrate
.. //depot/projects/hammer/sys/net/if.c#30 integrate
.. //depot/projects/hammer/sys/net/if.h#15 integrate
.. //depot/projects/hammer/sys/netgraph/ng_eiface.c#12 integrate
.. //depot/projects/hammer/sys/netinet/if_ether.c#14 integrate
.. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#12 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#40 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#4 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#39 integrate
.. //depot/projects/hammer/sys/pc98/conf/GENERIC#26 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#43 integrate
.. //depot/projects/hammer/sys/pci/ncr.c#13 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/busdma_machdep.c#11 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#30 integrate
.. //depot/projects/hammer/sys/security/mac_bsdextended/mac_bsdextended.c#12 integrate
.. //depot/projects/hammer/sys/sparc64/conf/GENERIC#29 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/bus_machdep.c#17 integrate
.. //depot/projects/hammer/sys/sys/conf.h#16 integrate
.. //depot/projects/hammer/sys/sys/param.h#46 integrate
.. //depot/projects/hammer/sys/sys/proc.h#64 integrate
.. //depot/projects/hammer/sys/sys/rman.h#6 integrate
.. //depot/projects/hammer/sys/sys/sched.h#14 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_alloc.c#14 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#24 integrate
.. //depot/projects/hammer/sys/vm/vm_fault.c#25 integrate
.. //depot/projects/hammer/tools/regression/netinet/tcpstream/Makefile#1 branch
.. //depot/projects/hammer/tools/regression/netinet/tcpstream/README#1 branch
.. //depot/projects/hammer/tools/regression/netinet/tcpstream/tcpstream.c#1 branch
.. //depot/projects/hammer/tools/tools/netrate/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/netrate/README#1 branch
.. //depot/projects/hammer/tools/tools/netrate/netreceive/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/netrate/netreceive/netreceive.c#1 branch
.. //depot/projects/hammer/tools/tools/netrate/netsend/Makefile#1 branch
.. //depot/projects/hammer/tools/tools/netrate/netsend/netsend.c#1 branch
.. //depot/projects/hammer/tools/tools/tinderbox/www/index.cgi#10 integrate
.. //depot/projects/hammer/usr.bin/Makefile#34 integrate
.. //depot/projects/hammer/usr.bin/compress/Makefile#2 integrate
.. //depot/projects/hammer/usr.bin/mkuzip/Makefile#1 branch
.. //depot/projects/hammer/usr.bin/mkuzip/mkuzip.8#1 branch
.. //depot/projects/hammer/usr.bin/mkuzip/mkuzip.c#1 branch
.. //depot/projects/hammer/usr.sbin/cron/crontab/crontab.c#3 integrate
.. //depot/projects/hammer/usr.sbin/ifmcstat/Makefile#3 integrate
.. //depot/projects/hammer/usr.sbin/ifmcstat/ifmcstat.c#5 integrate
.. //depot/projects/hammer/usr.sbin/ppp/tty.c#4 integrate
.. //depot/projects/hammer/usr.sbin/sysinstall/devices.c#12 integrate
Differences ...
==== //depot/projects/hammer/MAINTAINERS#28 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.99 2004/08/16 10:43:41 pjd Exp $
+$FreeBSD: src/MAINTAINERS,v 1.100 2004/09/08 02:08:33 grog Exp $
subsystem login notes
-----------------------------
@@ -66,7 +66,6 @@
lpd/recvjob.c and lpd/printjob.c.
newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it.
patch gad I have a WIP which will change the src a lot.
-vinum grog Recommends pre-commit review.
cvs peter Heads-up appreciated, try not to break it.
ncurses peter Heads-up appreciated, try not to break it.
nvi peter Try not to break it.
==== //depot/projects/hammer/etc/devd.conf#14 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd.conf,v 1.16 2004/09/06 20:09:00 glebius Exp $
+# $FreeBSD: src/etc/devd.conf,v 1.17 2004/09/10 20:57:44 wpaul Exp $
#
# Refer to devd.conf(5) and devd(8) man pages for the details on how to
# run and configure devd.
@@ -20,7 +20,8 @@
set ethernet-nic-regex
"(an|ar|ath|aue|awi|axe|bfe|bge|cm|cnw|cs|cue|dc|de|ed|el|em|\
ep|ex|fe|fxp|gem|gx|hme|ie|kue|lge|lnc|my|nge|pcn|ray|re|rl|\
- rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vr|vx|wb|wi|xe|xl)[0-9]+";
+ rue|sf|sis|sk|sn|snc|ste|ti|tl|tx|txp|vge|vr|vx|wb|wi|xe|\
+ xl)[0-9]+";
set scsi-controller-regex
"(adv|advw|aic|aha|ahb|ahc|ahd|bt|ct|iir|isp|mly|mpt|ncv|nsp|\
stg|sym|wds)[0-9]+";
==== //depot/projects/hammer/etc/rc.d/ipmon#9 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
-# $NetBSD: ipmon,v 2002/04/18 05:02:01 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ipmon,v 1.11 2004/04/23 15:43:13 darrenr Exp $
+# $NetBSD: ipmon,v 1.9 2002/04/18 05:02:01 lukem Exp $
+# $FreeBSD: src/etc/rc.d/ipmon,v 1.12 2004/09/09 16:41:55 obrien Exp $
#
# PROVIDE: ipmon
==== //depot/projects/hammer/etc/rc.d/tmp#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.d/tmp,v 1.32 2004/03/23 23:22:35 brooks Exp $
+# $FreeBSD: src/etc/rc.d/tmp,v 1.33 2004/09/13 17:40:14 ru Exp $
#
# PROVIDE: tmp
@@ -49,7 +49,7 @@
[Nn][Oo])
;;
*)
- if (/bin/mkdir /tmp/.diskless 2> /dev/null); then
+ if (/bin/mkdir -p /tmp/.diskless 2> /dev/null); then
rmdir /tmp/.diskless
else
if [ -h /tmp ]; then
==== //depot/projects/hammer/etc/rc.d/var#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.d/var,v 1.32 2004/03/23 23:22:35 brooks Exp $
+# $FreeBSD: src/etc/rc.d/var,v 1.33 2004/09/13 17:40:14 ru Exp $
#
# PROVIDE: var
@@ -67,7 +67,7 @@
[Nn][Oo])
;;
*)
- if (/bin/mkdir /var/.diskless 2> /dev/null); then
+ if (/bin/mkdir -p /var/.diskless 2> /dev/null); then
rmdir /var/.diskless
else
mount_md ${varsize} /var
==== //depot/projects/hammer/gnu/lib/csu/Makefile#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.22 2004/07/28 05:27:18 kan Exp $
+# $FreeBSD: src/gnu/lib/csu/Makefile,v 1.24 2004/09/10 06:48:04 ru Exp $
GCCDIR= ${.CURDIR}/../../../contrib/gcc
CCDIR= ${.CURDIR}/../../usr.bin/cc
@@ -38,7 +38,7 @@
ENDSRC?= crtstuff.c
all: ${OBJS} ${SOBJS} ${TGTOBJS}
-${OBJS} ${SOBJS}: tm.h
+${OBJS} ${SOBJS}: ${SRCS:M*.h}
CLEANFILES= ${OBJS} ${SOBJS} ${TGTOBJS}
==== //depot/projects/hammer/include/resolv.h#6 (text+ko) ====
@@ -51,7 +51,7 @@
/*
* @(#)resolv.h 8.1 (Berkeley) 6/2/93
* From Id: resolv.h,v 8.12 1998/04/28 19:36:46 halley Exp $
- * $FreeBSD: src/include/resolv.h,v 1.25 2004/03/15 17:08:28 des Exp $
+ * $FreeBSD: src/include/resolv.h,v 1.26 2004/09/09 17:39:47 yar Exp $
*/
#ifndef _RESOLV_H_
@@ -92,6 +92,7 @@
#define LOCALDOMAINPARTS 2 /* min levels in name that is "local" */
#define RES_TIMEOUT 5 /* min. seconds between retries */
+#define RES_DFLRETRY 4 /* retries per each name server */
#define MAXRESOLVSORT 10 /* number of net to sort on */
#define RES_MAXNDOTS 15 /* should reflect bit field size */
#define RES_MAXRETRANS 30 /* only for resolv.conf/RES_OPTIONS */
==== //depot/projects/hammer/lib/libautofs/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
-# $Id: Makefile,v 1.4 2004/08/31 16:26:24 bright Exp $
-# $FreeBSD: src/lib/libautofs/Makefile,v 1.3 2004/09/03 18:01:34 alfred Exp $
+# $Id: Makefile,v 1.5 2004/09/08 08:12:21 bright Exp $
+# $FreeBSD: src/lib/libautofs/Makefile,v 1.4 2004/09/08 08:44:14 alfred Exp $
LIB= autofs
SHLIB_MAJOR= 1
==== //depot/projects/hammer/lib/libautofs/libautofs.3#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $Id: libautofs.3,v 1.3 2004/08/31 15:58:40 bright Exp $
-.\" $FreeBSD: src/lib/libautofs/libautofs.3,v 1.1 2004/08/31 16:26:00 alfred Exp $
-.Dd August 30, 2004
+.\" $Id: libautofs.3,v 1.4 2004/09/08 08:12:21 bright Exp $
+.\" $FreeBSD: src/lib/libautofs/libautofs.3,v 1.5 2004/09/09 10:54:08 alfred Exp $
+.Dd September 9, 2004
.Dt LIBAUTOFS 3
.Os
.Sh NAME
@@ -63,6 +63,8 @@
.Ft void
.Fn autoreq_getoffset "autoreq_t req" "off_t *offp"
.Ft void
+.Fn autoreq_getxid "autoreq_t req" "int *xidp"
+.Ft void
.Fn autoreq_setino "autoreq_t req" "autoino_t ino"
.Ft void
.Fn autoreq_seterrno "autoreq_t req" "int errno"
@@ -96,7 +98,7 @@
function returns a handle to an
.Xr autofs 9
filesystem based on the
-.Fn path
+.Fa path
parameter.
The handle returned should be freed via the
.Fn autoh_free
@@ -114,10 +116,23 @@
.Pp
The
.Fn autoh_fd
-function returns a file descriptor that can selected or polled on
-for "excecption" data to detect an
+function returns a file descriptor that can be used with
+.Xr select 2
+or
+.Xr poll 2
+to check for "exceptional" data to detect an
.Xr autofs 9
event.
+Users of
+.Xr select 2
+should set the fd in the
+.Fa exceptfds
+fd_set.
+Users of
+.Xr poll 2
+should set POLLPRI in the pollfd
+.Fa fds
+argument.
.Pp
The
.Fn autoh_mp
@@ -163,6 +178,10 @@
return the offset request associated with the request
.Fa req .
(used for readdir request)
+.It Fn autoreq_getxid
+return the transaction id associated with an autofs request, these
+are unique per mount point, but not system wide. They can be used
+for debugging to ensure requests are being accepted by the kernel.
.El
.Pp
The following functions allow one to set the response sent to
==== //depot/projects/hammer/lib/libautofs/libautofs.c#3 (text+ko) ====
@@ -23,8 +23,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libautofs/libautofs.c,v 1.2 2004/09/02 20:44:55 alfred Exp $
- * $Id: libautofs.c,v 1.3 2004/08/31 08:49:56 bright Exp $
+ * $FreeBSD: src/lib/libautofs/libautofs.c,v 1.5 2004/09/09 01:23:27 alfred Exp $
+ * $Id: libautofs.c,v 1.5 2004/09/08 08:44:12 bright Exp $
*/
#include <err.h>
#include <ctype.h>
@@ -43,7 +43,11 @@
#include <sys/stat.h>
#include <sys/sysctl.h>
+#ifdef AUTOFSSTANDALONE
+#include "../autofs/autofs.h"
+#else
#include <fs/autofs/autofs.h>
+#endif
#include "libautofs.h"
@@ -76,7 +80,7 @@
*sfsp = NULL;
cnt = getfsstat(NULL, 0, MNT_NOWAIT);
bufsize = cnt * sizeof(**sfsp);
- fprintf(stderr, "getmntlst bufsize %ld, cnt %d\n", bufsize, cnt);
+ /*fprintf(stderr, "getmntlst bufsize %ld, cnt %d\n", bufsize, cnt);*/
*sfsp = malloc(bufsize);
if (sfsp == NULL)
goto err;
@@ -84,12 +88,12 @@
if (cnt == -1)
goto err;
*cntp = cnt;
- fprintf(stderr, "getmntlst ok, cnt %d\n", cnt);
+ /*fprintf(stderr, "getmntlst ok, cnt %d\n", cnt);*/
return (0);
err:
safe_free(sfsp);
*sfsp = NULL;
- fprintf(stderr, "getmntlst bad\n");
+ /*fprintf(stderr, "getmntlst bad\n");*/
return (-1);
}
@@ -113,7 +117,7 @@
break;
}
if (i == cnt) {
- fprintf(stderr, "autoh_get bad %d %d\n", i, cnt);
+ /*fprintf(stderr, "autoh_get bad %d %d\n", i, cnt);*/
errno = ENOENT;
goto err;
}
@@ -202,10 +206,13 @@
void
autoh_freeall(autoh_t *ah)
{
+ autoh_t *ahp;
+
+ ahp = ah;
- while (*ah != NULL) {
- autoh_free(*ah);
- ah++;
+ while (*ahp != NULL) {
+ autoh_free(*ahp);
+ ahp++;
}
safe_free(ah);
}
@@ -392,6 +399,13 @@
*offp = req->au_offset - AUTOFS_USEROFF;
}
+void
+autoreq_getxid(autoreq_t req, int *xid)
+{
+
+ *xid = req->au_xid;
+}
+
/* toggle by path. args = handle, AUTO_?, pid (-1 to disable), path. */
int
autoh_togglepath(autoh_t ah, int op, pid_t pid, const char *path)
==== //depot/projects/hammer/lib/libautofs/libautofs.h#2 (text+ko) ====
@@ -23,8 +23,8 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libautofs/libautofs.h,v 1.1 2004/08/31 16:26:00 alfred Exp $
- * $Id: libautofs.h,v 1.3 2004/08/31 08:49:56 bright Exp $
+ * $FreeBSD: src/lib/libautofs/libautofs.h,v 1.3 2004/09/09 01:23:27 alfred Exp $
+ * $Id: libautofs.h,v 1.4 2004/09/08 08:12:21 bright Exp $
*/
#ifndef _LIBAUTOFS_H
#define _LIBAUTOFS_H
@@ -92,8 +92,9 @@
void autoreq_seterrno(autoreq_t, int);
void autoreq_setaux(autoreq_t, void *, size_t);
void autoreq_getaux(autoreq_t, void **, size_t *);
-void autoreq_seteof(autoreq_t req, int eof);
-void autoreq_getoffset(autoreq_t req, off_t *offp);
+void autoreq_seteof(autoreq_t, int);
+void autoreq_getoffset(autoreq_t, off_t *);
+void autoreq_getxid(autoreq_t, int *);
/* toggle by path. args = handle, AUTO_?, pid (-1 to disable), path. */
int autoh_togglepath(autoh_t, int, pid_t, const char *);
==== //depot/projects/hammer/lib/libc/db/btree/bt_debug.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)bt_debug.c 8.5 (Berkeley) 8/17/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_debug.c,v 1.2 2002/03/22 21:52:01 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_debug.c,v 1.3 2004/09/10 05:41:41 kuriyama Exp $");
#include <sys/param.h>
@@ -69,7 +69,7 @@
(void)fprintf(stderr, "%s: pgsz %d",
F_ISSET(t, B_INMEM) ? "memory" : "disk", t->bt_psize);
if (F_ISSET(t, R_RECNO))
- (void)fprintf(stderr, " keys %lu", t->bt_nrecs);
+ (void)fprintf(stderr, " keys %u", t->bt_nrecs);
#undef X
#define X(flag, name) \
if (F_ISSET(t, flag)) { \
@@ -108,12 +108,12 @@
char *sep;
m = (BTMETA *)h;
- (void)fprintf(stderr, "magic %lx\n", m->magic);
- (void)fprintf(stderr, "version %lu\n", m->version);
- (void)fprintf(stderr, "psize %lu\n", m->psize);
- (void)fprintf(stderr, "free %lu\n", m->free);
- (void)fprintf(stderr, "nrecs %lu\n", m->nrecs);
- (void)fprintf(stderr, "flags %lu", m->flags);
+ (void)fprintf(stderr, "magic %x\n", m->magic);
+ (void)fprintf(stderr, "version %u\n", m->version);
+ (void)fprintf(stderr, "psize %u\n", m->psize);
+ (void)fprintf(stderr, "free %u\n", m->free);
+ (void)fprintf(stderr, "nrecs %u\n", m->nrecs);
+ (void)fprintf(stderr, "flags %u", m->flags);
#undef X
#define X(flag, name) \
if (m->flags & flag) { \
@@ -212,14 +212,15 @@
bl = GETBLEAF(h, cur);
if (bl->flags & P_BIGKEY)
(void)fprintf(stderr,
- "big key page %lu size %u/",
+ "big key page %u size %u/",
*(pgno_t *)bl->bytes,
*(u_int32_t *)(bl->bytes + sizeof(pgno_t)));
else if (bl->ksize)
- (void)fprintf(stderr, "%s/", bl->bytes);
+ (void)fprintf(stderr, "%.*s/",
+ bl->ksize, bl->bytes);
if (bl->flags & P_BIGDATA)
(void)fprintf(stderr,
- "big data page %lu size %u",
+ "big data page %u size %u",
*(pgno_t *)(bl->bytes + bl->ksize),
*(u_int32_t *)(bl->bytes + bl->ksize +
sizeof(pgno_t)));
@@ -231,7 +232,7 @@
rl = GETRLEAF(h, cur);
if (rl->flags & P_BIGDATA)
(void)fprintf(stderr,
- "big data page %lu size %u",
+ "big data page %u size %u",
*(pgno_t *)rl->bytes,
*(u_int32_t *)(rl->bytes + sizeof(pgno_t)));
else if (rl->dsize)
@@ -304,13 +305,13 @@
(void)fprintf(stderr, "%d level%s with %ld keys",
levels, levels == 1 ? "" : "s", nkeys);
if (F_ISSET(t, R_RECNO))
- (void)fprintf(stderr, " (%ld header count)", t->bt_nrecs);
+ (void)fprintf(stderr, " (%d header count)", t->bt_nrecs);
(void)fprintf(stderr,
- "\n%lu pages (leaf %ld, internal %ld, overflow %ld)\n",
+ "\n%u pages (leaf %d, internal %d, overflow %d)\n",
pinternal + pleaf + pcont, pleaf, pinternal, pcont);
(void)fprintf(stderr, "%ld cache hits, %ld cache misses\n",
bt_cache_hit, bt_cache_miss);
- (void)fprintf(stderr, "%ld splits (%ld root splits, %ld sort splits)\n",
+ (void)fprintf(stderr, "%lu splits (%lu root splits, %lu sort splits)\n",
bt_split, bt_rootsplit, bt_sortsplit);
pleaf *= t->bt_psize - BTDATAOFF;
if (pleaf)
==== //depot/projects/hammer/lib/libc/db/btree/bt_split.c#3 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)bt_split.c 8.9 (Berkeley) 7/26/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.5 2003/02/16 17:29:09 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_split.c,v 1.6 2004/09/10 14:45:00 kuriyama Exp $");
#include <sys/types.h>
@@ -361,6 +361,8 @@
r->nextpg = h->nextpg;
r->prevpg = h->pgno;
r->flags = h->flags & P_TYPE;
+ /* XXX: Workaround for broken page data access. */
+ r->linp[0] = 0xffff;
/*
* If we're splitting the last page on a level because we're appending
==== //depot/projects/hammer/lib/libc/db/hash/hash.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)hash.c 8.9 (Berkeley) 6/16/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash.c,v 1.11 2002/03/21 22:46:26 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/hash/hash.c,v 1.12 2004/09/10 05:41:41 kuriyama Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -220,7 +220,7 @@
#ifdef DEBUG
(void)fprintf(stderr,
-"%s\n%s%x\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%x\n%s%x\n%s%d\n%s%d\n",
+"%s\n%s%p\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%d\n%s%x\n%s%x\n%s%d\n%s%d\n",
"init_htab:",
"TABLE POINTER ", hashp,
"BUCKET SIZE ", hashp->BSIZE,
==== //depot/projects/hammer/lib/libc/db/mpool/mpool.c#3 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)mpool.c 8.5 (Berkeley) 7/26/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.11 2004/01/20 00:40:35 das Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/mpool/mpool.c,v 1.12 2004/09/10 05:41:41 kuriyama Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -426,9 +426,9 @@
int cnt;
char *sep;
- (void)fprintf(stderr, "%lu pages in the file\n", mp->npages);
+ (void)fprintf(stderr, "%u pages in the file\n", mp->npages);
(void)fprintf(stderr,
- "page size %lu, cacheing %lu pages of %lu page max cache\n",
+ "page size %lu, cacheing %u pages of %u page max cache\n",
mp->pagesize, mp->curcache, mp->maxcache);
(void)fprintf(stderr, "%lu page puts, %lu page gets, %lu page new\n",
mp->pageput, mp->pageget, mp->pagenew);
==== //depot/projects/hammer/lib/libc/gmon/gmon.c#6 (text+ko) ====
@@ -35,7 +35,7 @@
static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.18 2003/06/02 02:32:22 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.19 2004/09/10 05:44:17 kuriyama Exp $");
#include "namespace.h"
#include <sys/param.h>
@@ -186,7 +186,7 @@
_warn("_mcleanup: gmon.log");
return;
}
- len = sprintf(buf, "[mcleanup1] kcount 0x%x ssiz %d\n",
+ len = sprintf(buf, "[mcleanup1] kcount 0x%p ssiz %lu\n",
p->kcount, p->kcountsize);
_write(log, buf, len);
#endif
@@ -210,7 +210,7 @@
toindex = p->tos[toindex].link) {
#ifdef DEBUG
len = sprintf(buf,
- "[mcleanup2] frompc 0x%x selfpc 0x%x count %d\n" ,
+ "[mcleanup2] frompc 0x%lx selfpc 0x%lx count %lu\n" ,
frompc, p->tos[toindex].selfpc,
p->tos[toindex].count);
_write(log, buf, len);
==== //depot/projects/hammer/lib/libc/net/res_init.c#5 (text+ko) ====
@@ -73,7 +73,7 @@
static char orig_rcsid[] = "From: Id: res_init.c,v 8.7 1996/11/18 09:10:04 vixie Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/net/res_init.c,v 1.32 2004/02/25 21:03:45 green Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/net/res_init.c,v 1.33 2004/09/09 17:42:18 yar Exp $");
#include <sys/types.h>
#include <sys/param.h>
@@ -197,7 +197,7 @@
if (!_res.retrans)
_res.retrans = RES_TIMEOUT;
if (!_res.retry)
- _res.retry = 4;
+ _res.retry = RES_DFLRETRY;
if (!(_res.options & RES_INIT))
_res.options = RES_DEFAULT;
==== //depot/projects/hammer/lib/libdisk/open_disk.c#6 (text+ko) ====
@@ -8,7 +8,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libdisk/open_disk.c,v 1.6 2004/08/02 19:57:37 le Exp $");
+__FBSDID("$FreeBSD: src/lib/libdisk/open_disk.c,v 1.8 2004/09/13 16:06:14 pjd Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -257,18 +257,10 @@
}
} else if (!strcmp(t, "GPT"))
i = Add_Chunk(d, off, len, n, ty, 0, 0, 0);
- else if (!strcmp(t, "BDE"))
- ; /* nothing */
- else if (!strcmp(t, "CCD"))
- ; /* nothing */
else if (!strcmp(t, "APPLE"))
i = Add_Chunk(d, off, len, n, apple, 0, 0, sn);
- else if (strstr(t, "VINUM") != NULL)
- ; /* nothing */
- else {
- printf("BARF %d\n", __LINE__);
- exit(0);
- }
+ else
+ ; /* Ignore unknown classes. */
}
/* PLATFORM POLICY BEGIN ------------------------------------- */
/* We have a chance to do things on a blank disk here */
==== //depot/projects/hammer/release/Makefile#57 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/Makefile,v 1.858 2004/09/07 14:26:02 ru Exp $
+# $FreeBSD: src/release/Makefile,v 1.859 2004/09/08 06:05:19 ru Exp $
#
# make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \
# [RELEASETAG=tag]
@@ -341,7 +341,7 @@
.if exists(${CHROOTDIR})
# The first command will fail on a handful of files that have their schg
# flags set. But it greatly speeds up the next two commands.
- # NB: clear any vestigal devfs mount, just in case
+ # NB: clear any vestigial devfs mount, just in case
-umount ${CHROOTDIR}/dev > /dev/null 2>&1
-rm -rf ${CHROOTDIR} 2>/dev/null
-chflags -R noschg ${CHROOTDIR}/.
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml#5 (text+ko) ====
@@ -1,17 +1,57 @@
<!--
- $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml,v 1.4 2004/09/05 14:53:33 hrs Exp $
+ $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/amd64/proc-amd64.sgml,v 1.5 2004/09/12 18:36:22 hrs Exp $
-->
<sect1 id="proc">
<title>Supported Processors and Motherboards</title>
- <para>&os;/&arch; has supported the &arch.print;
- (<quote>Hammer</quote>) architecture since mid-2003. It made its
- first debut as an experimental release based on &os;
- 5.1-RELEASE.</para>
+ <para>Since mid-2003 &os;/&arch; has supported the &arch.print;
+ (<quote>Hammer</quote>) and Intel EM64T architecture,
+ and is now one of the Tier-1 platforms (fully
+ supported architecture), which are expected to be Production
+ Quality with respects to all aspects of the &os; operating system,
+ including installation and development environments.</para>
+
+ <para>Note that there are two names for this architecture,
+ AMD64 (AMD) and Intel EM64T (Extended Memory 64-bit Technology).
+ 64-bit mode of the two architectures are almost compatible
+ with each other, and &os;/&arch; should support the both.</para>
+
+ <para>As of this writing, the following processors are
+ supported:</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>AMD Athlon64 (<quote>Clawhammer</quote>).</para>
+ </listitem>
+
+ <listitem>
+ <para>AMD Opteron (<quote>Sledgehammer</quote>).</para>
+ </listitem>
+
+ <listitem>
+ <para>Intel 64-bit Xeon (<quote>Nacona</quote>).
+ This processor is fabricated on 90nm process technology, and operates
+ with 2.80 to 3.60 GHz (FSB 800MHz) and Intel E7520/E7525/E7320 chipsets.</para>
+ </listitem>
+
+ <listitem>
+ <para>Intel Pentium 4 Processor supporting Intel EM64T
+ (<quote>Prescott</quote>).
+ This is fabricated on 90nm process technology,
+ uses FC-LGA775 package, and operates with 3.20F/3.40F/3.60F GHz
+ and Intel 925X Express chipsets.
+ The corresponding S-Spec numbers are SL7L9, SL7L8, SL7LA, SL7NZ, SL7PZ,
+ and SL7PX. Note that processors marked as 5xx numbers do not support
+ EM64T.</para>
+ </listitem>
+ </itemizedlist>
+
+ <para>Intel EM64T is an extended version of IA-32 (x86) and
+ different from Intel IA-64 (Itanium) architecture, which &os;/ia64
+ supports. Some Intel's old documentation refers to Intel EM64T as
+ <quote>64-bit extension technology</quote> or <quote>IA-32e</quote>.</para>
- <para>As of this writing, this port supports the Athlon64
- (<quote>Clawhammer</quote>) and Opteron
- (<quote>Sledgehammer</quote>) machines. The largest tested
+ <para>The largest tested
memory configuration to date is 8GB. SMP support has been
recently completed and is reasonably robust.</para>
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#59 (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.247 2004/09/07 20:14:35 simon Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.255 2004/09/13 10:48:34 brueffer Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -254,49 +254,9 @@
&hwlist.ti;
- <para arch="i386,pc98,alpha,amd64">AMD PCnet NICs (&man.lnc.4; and &man.pcn.4; drivers)
- <itemizedlist>
- <listitem arch="i386,alpha,amd64">
- <para>AMD PCnet/PCI (79c970 & 53c974 or 79c974)</para>
- </listitem>
- <listitem arch="i386,alpha,amd64">
- <para>AMD PCnet/FAST</para>
- </listitem>
- <listitem arch="i386,alpha,amd64">
- <para>Isolan AT 4141-0 (16 bit)</para>
- </listitem>
- <listitem arch="i386,alpha,amd64">
- <para>Isolink 4110 (8 bit)</para>
- </listitem>
- <listitem arch="i386,alpha,amd64">
- <para>PCnet/FAST+</para>
- </listitem>
- <listitem arch="i386,alpha,amd64">
- <para>PCnet/FAST III</para>
- </listitem>
- <listitem arch="i386,alpha,amd64">
- <para>PCnet/PRO</para>
- </listitem>
- <listitem arch="i386,alpha,amd64">
- <para>PCnet/Home</para>
- </listitem>
- <listitem arch="i386,alpha,amd64">
- <para>HomePNA</para>
- </listitem>
- <listitem arch="pc98">
- <para>Contec C-NET(98)S</para>
- </listitem>
- <listitem arch="pc98">
- <para>PCI NIC using AMD AM79C97x (PCnet-PCI/Fast)</para>
- </listitem>
- <listitem arch="pc98">
- <para>NEC SV-98/2-B05, B06 (PCI)</para>
- </listitem>
- <listitem arch="pc98">
- <para>Allied-Telesis LA-PCI (PCI)</para>
- </listitem>
- </itemizedlist>
- </para>
+ &hwlist.pcn;
+
+ &hwlist.lnc;
<para arch="i386,pc98,amd64">SMC 83c17x (EPIC)-based Ethernet NICs (&man.tx.4; driver)
</para>
@@ -596,12 +556,9 @@
&hwlist.bge;
- <para arch="i386,pc98,alpha,ia64,amd64">Gigabit Ethernet NICs based on the
- Intel 82542 and 82543 controller chips (&man.gx.4; and &man.em.4;
- drivers), plus NICs supported by the Intel 82540EM, 82544,
- 82545EM, and 82546EB
- controller chips (&man.em.4; driver only)
- </para>
+ &hwlist.em;
+
+ &hwlist.gx;
&hwlist.hme;
@@ -616,6 +573,8 @@
&hwlist.ixgb;
+ &hwlist.vge;
+
</sect2>
<sect2 id="fddi">
@@ -998,16 +957,7 @@
&hwlist.snd.cmi;
- <para arch="i386,amd64">Crystal Semiconductor (&man.csa.4; driver)
- <itemizedlist>
- <listitem>
- <para>CS461x/462x Audio Accelerator</para>
- </listitem>
- <listitem>
- <para>CS428x Audio Controller</para>
- </listitem>
- </itemizedlist>
- </para>
+ &hwlist.snd.csa;
&hwlist.snd.es137x;
@@ -1035,16 +985,7 @@
<para arch="i386,amd64">ForteMedia fm801</para>
- <para arch="i386,amd64">Gravis (&man.gusc.4; driver)
- <itemizedlist>
- <listitem>
- <para>UltraSound MAX</para>
- </listitem>
- <listitem>
- <para>UltraSound PnP</para>
- </listitem>
- </itemizedlist>
- </para>
+ &hwlist.snd.gusc;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list