From owner-p4-projects@FreeBSD.ORG  Sun Sep 30 00:25:33 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8682F16A418; Sun, 30 Sep 2007 00:25:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 37CC416A41A
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 00:25:33 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2AE0413C45A
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 00:25:33 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8U0PWAf059011
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 00:25:32 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8U0PKJZ059008
	for perforce@freebsd.org; Sun, 30 Sep 2007 00:25:20 GMT
	(envelope-from kmacy@freebsd.org)
Date: Sun, 30 Sep 2007 00:25:20 GMT
Message-Id: <200709300025.l8U0PKJZ059008@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 126999 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Sep 2007 00:25:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=126999

Change 126999 by kmacy@kmacy_home:ethng on 2007/09/30 00:25:19

	IFC	#126997

Affected files ...

.. //depot/projects/ethng/src/ObsoleteFiles.inc#4 integrate
.. //depot/projects/ethng/src/UPDATING#2 integrate
.. //depot/projects/ethng/src/bin/getfacl/getfacl.c#2 integrate
.. //depot/projects/ethng/src/bin/ps/print.c#2 integrate
.. //depot/projects/ethng/src/bin/ps/ps.c#2 integrate
.. //depot/projects/ethng/src/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/ethng/src/etc/defaults/rc.conf#3 integrate
.. //depot/projects/ethng/src/etc/mtree/BSD.include.dist#2 integrate
.. //depot/projects/ethng/src/etc/rc.d/Makefile#4 integrate
.. //depot/projects/ethng/src/etc/rc.d/nscd#3 integrate
.. //depot/projects/ethng/src/etc/services#3 integrate
.. //depot/projects/ethng/src/gnu/usr.bin/binutils/ld/Makefile#2 integrate
.. //depot/projects/ethng/src/gnu/usr.bin/binutils/ld/genscripts.sh#2 integrate
.. //depot/projects/ethng/src/gnu/usr.bin/cc/cc_int/Makefile#2 integrate
.. //depot/projects/ethng/src/gnu/usr.bin/man/man/man.c#2 integrate
.. //depot/projects/ethng/src/gnu/usr.bin/texinfo/info/Makefile#2 integrate
.. //depot/projects/ethng/src/include/Makefile#2 integrate
.. //depot/projects/ethng/src/lib/libarchive/archive_read.3#2 integrate
.. //depot/projects/ethng/src/lib/libarchive/archive_write_disk.c#3 integrate
.. //depot/projects/ethng/src/lib/libarchive/test/test_write_disk.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/gen/Makefile.inc#2 integrate
.. //depot/projects/ethng/src/lib/libc/net/sctp_connectx.3#2 integrate
.. //depot/projects/ethng/src/lib/libc/net/sctp_opt_info.3#2 integrate
.. //depot/projects/ethng/src/lib/libc/net/sctp_recvmsg.3#2 integrate
.. //depot/projects/ethng/src/lib/libc/net/sctp_send.3#2 integrate
.. //depot/projects/ethng/src/lib/libc/net/sctp_sendmsg.3#2 integrate
.. //depot/projects/ethng/src/lib/libc/rpc/auth_time.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/rpc/getnetconfig.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/rpc/getnetpath.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/rpc/rpc_generic.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/rpc/rpcb_clnt.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/stdlib/getenv.c#2 integrate
.. //depot/projects/ethng/src/lib/libc/sys/Makefile.inc#2 integrate
.. //depot/projects/ethng/src/lib/libc/sys/minherit.2#2 integrate
.. //depot/projects/ethng/src/lib/libc/sys/ntp_adjtime.2#2 integrate
.. //depot/projects/ethng/src/lib/libc/sys/ntp_gettime.2#2 delete
.. //depot/projects/ethng/src/lib/libdisk/open_disk.c#2 integrate
.. //depot/projects/ethng/src/lib/libdisk/open_ia64_disk.c#2 integrate
.. //depot/projects/ethng/src/lib/libkvm/kvm_proc.c#2 integrate
.. //depot/projects/ethng/src/lib/libutil/expand_number.3#3 integrate
.. //depot/projects/ethng/src/lib/libutil/flopen.3#2 integrate
.. //depot/projects/ethng/src/lib/libutil/humanize_number.3#3 integrate
.. //depot/projects/ethng/src/lib/libutil/kld.3#2 integrate
.. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate
.. //depot/projects/ethng/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate
.. //depot/projects/ethng/src/release/doc/share/misc/dev.archlist.txt#6 integrate
.. //depot/projects/ethng/src/sbin/dhclient/dhclient.8#2 integrate
.. //depot/projects/ethng/src/sbin/fsck_ffs/Makefile#2 integrate
.. //depot/projects/ethng/src/sbin/fsck_ffs/main.c#3 integrate
.. //depot/projects/ethng/src/sbin/geom/class/Makefile#2 integrate
.. //depot/projects/ethng/src/sbin/geom/class/virstor/Makefile#1 branch
.. //depot/projects/ethng/src/sbin/geom/class/virstor/geom_virstor.c#1 branch
.. //depot/projects/ethng/src/sbin/geom/class/virstor/gvirstor.8#1 branch
.. //depot/projects/ethng/src/sbin/geom/core/geom.8#2 integrate
.. //depot/projects/ethng/src/sbin/geom/core/geom.c#2 integrate
.. //depot/projects/ethng/src/sbin/ipfw/ipfw2.c#3 integrate
.. //depot/projects/ethng/src/sbin/quotacheck/preen.c#2 integrate
.. //depot/projects/ethng/src/sbin/quotacheck/quotacheck.c#2 integrate
.. //depot/projects/ethng/src/sbin/tunefs/tunefs.8#3 integrate
.. //depot/projects/ethng/src/share/man/man4/cxgb.4#2 integrate
.. //depot/projects/ethng/src/share/man/man4/gem.4#2 integrate
.. //depot/projects/ethng/src/share/man/man4/if_bridge.4#2 integrate
.. //depot/projects/ethng/src/share/man/man4/sctp.4#2 integrate
.. //depot/projects/ethng/src/share/man/man4/snd_emu10kx.4#2 integrate
.. //depot/projects/ethng/src/share/man/man9/DECLARE_GEOM_CLASS.9#2 integrate
.. //depot/projects/ethng/src/share/man/man9/crypto.9#2 integrate
.. //depot/projects/ethng/src/share/man/man9/sleepqueue.9#2 integrate
.. //depot/projects/ethng/src/share/misc/committers-ports.dot#2 integrate
.. //depot/projects/ethng/src/share/misc/committers-src.dot#2 integrate
.. //depot/projects/ethng/src/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/ethng/src/sys/amd64/amd64/uma_machdep.c#2 integrate
.. //depot/projects/ethng/src/sys/amd64/include/smp.h#2 integrate
.. //depot/projects/ethng/src/sys/amd64/include/vmparam.h#3 integrate
.. //depot/projects/ethng/src/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/ethng/src/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/ethng/src/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/ethng/src/sys/amd64/linux32/linux32_syscall.h#3 integrate
.. //depot/projects/ethng/src/sys/amd64/linux32/linux32_sysent.c#3 integrate
.. //depot/projects/ethng/src/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/ethng/src/sys/amd64/linux32/syscalls.master#3 integrate
.. //depot/projects/ethng/src/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/ethng/src/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/ethng/src/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/ethng/src/sys/arm/at91/at91_mci.c#2 integrate
.. //depot/projects/ethng/src/sys/arm/at91/at91_pmc.c#2 integrate
.. //depot/projects/ethng/src/sys/arm/conf/AVILA#2 integrate
.. //depot/projects/ethng/src/sys/arm/conf/CRB#2 integrate
.. //depot/projects/ethng/src/sys/arm/include/asmacros.h#2 integrate
.. //depot/projects/ethng/src/sys/arm/include/vmparam.h#2 integrate
.. //depot/projects/ethng/src/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate
.. //depot/projects/ethng/src/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/ethng/src/sys/arm/xscale/i8134x/files.crb#2 integrate
.. //depot/projects/ethng/src/sys/arm/xscale/i8134x/i81342.c#2 integrate
.. //depot/projects/ethng/src/sys/arm/xscale/i8134x/i81342reg.h#2 integrate
.. //depot/projects/ethng/src/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch
.. //depot/projects/ethng/src/sys/arm/xscale/i8134x/iq81342reg.h#1 branch
.. //depot/projects/ethng/src/sys/arm/xscale/i8134x/iq81342var.h#1 branch
.. //depot/projects/ethng/src/sys/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/ethng/src/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate
.. //depot/projects/ethng/src/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate
.. //depot/projects/ethng/src/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/ethng/src/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/ethng/src/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/ethng/src/sys/conf/files#4 integrate
.. //depot/projects/ethng/src/sys/conf/options#5 integrate
.. //depot/projects/ethng/src/sys/contrib/dev/acpica/evmisc.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/dev/acpica/evxface.c#2 integrate
.. //depot/projects/ethng/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch
.. //depot/projects/ethng/src/sys/contrib/dev/npe/LICENSE#1 branch
.. //depot/projects/ethng/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/ethng/src/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ath/ath_rate/sample/sample.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/gem/if_gemreg.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/gem/if_gemvar.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/mxge/if_mxge.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/mxge/if_mxge_var.h#3 integrate
.. //depot/projects/ethng/src/sys/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/pci/pcireg.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/ral/rt2560.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/ral/rt2661.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/sound/pci/emu10kx-midi.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/sound/pci/emu10kx.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/sound/pci/emu10kx.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/syscons/syscons.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/usb/ehci_pci.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/usb/if_axe.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/usb/if_axereg.h#3 integrate
.. //depot/projects/ethng/src/sys/dev/usb/if_rum.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/usb/if_ural.c#3 integrate
.. //depot/projects/ethng/src/sys/dev/usb/if_zyd.c#4 integrate
.. //depot/projects/ethng/src/sys/dev/wi/if_wi.c#4 integrate
.. //depot/projects/ethng/src/sys/fs/msdosfs/msdosfs_fat.c#3 integrate
.. //depot/projects/ethng/src/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/ethng/src/sys/fs/procfs/procfs_status.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/geom_event.c#2 integrate
.. //depot/projects/ethng/src/sys/geom/virstor/binstream.c#1 branch
.. //depot/projects/ethng/src/sys/geom/virstor/binstream.h#1 branch
.. //depot/projects/ethng/src/sys/geom/virstor/g_virstor.c#1 branch
.. //depot/projects/ethng/src/sys/geom/virstor/g_virstor.h#1 branch
.. //depot/projects/ethng/src/sys/geom/virstor/g_virstor_md.c#1 branch
.. //depot/projects/ethng/src/sys/geom/virstor/g_virstor_md.h#1 branch
.. //depot/projects/ethng/src/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/ethng/src/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/ethng/src/sys/i386/i386/geode.c#2 integrate
.. //depot/projects/ethng/src/sys/i386/include/smp.h#2 integrate
.. //depot/projects/ethng/src/sys/i386/include/vmparam.h#2 integrate
.. //depot/projects/ethng/src/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/ethng/src/sys/i386/linux/linux_proto.h#3 integrate
.. //depot/projects/ethng/src/sys/i386/linux/linux_ptrace.c#2 integrate
.. //depot/projects/ethng/src/sys/i386/linux/linux_syscall.h#3 integrate
.. //depot/projects/ethng/src/sys/i386/linux/linux_sysent.c#3 integrate
.. //depot/projects/ethng/src/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/ethng/src/sys/i386/linux/syscalls.master#3 integrate
.. //depot/projects/ethng/src/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/ethng/src/sys/ia64/ia64/uma_machdep.c#2 integrate
.. //depot/projects/ethng/src/sys/ia64/include/vmparam.h#2 integrate
.. //depot/projects/ethng/src/sys/kern/init_main.c#3 integrate
.. //depot/projects/ethng/src/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_kse.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_switch.c#4 integrate
.. //depot/projects/ethng/src/sys/kern/kern_synch.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_timeout.c#4 edit
.. //depot/projects/ethng/src/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/ethng/src/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/subr_lock.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/subr_trap.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/ethng/src/sys/kern/sys_process.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/vfs_cache.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/ethng/src/sys/kern/vfs_subr.c#3 integrate
.. //depot/projects/ethng/src/sys/modules/Makefile#3 integrate
.. //depot/projects/ethng/src/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/ethng/src/sys/modules/geom/geom_virstor/Makefile#1 branch
.. //depot/projects/ethng/src/sys/modules/sound/driver/emu10kx/Makefile#2 integrate
.. //depot/projects/ethng/src/sys/net/bpf_filter.c#2 integrate
.. //depot/projects/ethng/src/sys/net/if_bridge.c#2 integrate
.. //depot/projects/ethng/src/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/ethng/src/sys/net/if_media.h#2 integrate
.. //depot/projects/ethng/src/sys/net/if_stf.c#2 integrate
.. //depot/projects/ethng/src/sys/net80211/_ieee80211.h#3 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_ht.c#3 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_ht.h#2 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_ioctl.h#3 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_node.h#2 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_output.c#3 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_power.c#2 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_proto.c#3 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_proto.h#3 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_regdomain.c#3 integrate
.. //depot/projects/ethng/src/sys/net80211/ieee80211_var.h#3 integrate
.. //depot/projects/ethng/src/sys/netgraph/ng_ppp.c#2 integrate
.. //depot/projects/ethng/src/sys/netgraph/ng_pppoe.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet/in_gif.c#2 integrate
.. //depot/projects/ethng/src/sys/netinet/ip_fw2.c#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp.h#5 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_asconf.c#7 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_asconf.h#4 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_constants.h#5 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_indata.c#5 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_input.c#7 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_lock_bsd.h#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_os_bsd.h#4 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_output.c#6 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_output.h#4 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_pcb.c#6 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_pcb.h#5 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_sysctl.c#5 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_sysctl.h#5 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_timer.c#5 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_timer.h#3 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_uio.h#4 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_usrreq.c#6 integrate
.. //depot/projects/ethng/src/sys/netinet/sctputil.c#6 integrate
.. //depot/projects/ethng/src/sys/netinet/sctputil.h#4 integrate
.. //depot/projects/ethng/src/sys/netinet/tcp_subr.c#4 integrate
.. //depot/projects/ethng/src/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/ethng/src/sys/netinet/tcp_timer.h#3 integrate
.. //depot/projects/ethng/src/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/ethng/src/sys/netinet/tcp_var.h#3 integrate
.. //depot/projects/ethng/src/sys/netinet6/sctp6_usrreq.c#5 integrate
.. //depot/projects/ethng/src/sys/netinet6/sctp6_var.h#2 integrate
.. //depot/projects/ethng/src/sys/nfsclient/nfs_bio.c#2 integrate
.. //depot/projects/ethng/src/sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/ethng/src/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/ethng/src/sys/pci/agp_i810.c#2 integrate
.. //depot/projects/ethng/src/sys/pci/agp_via.c#2 integrate
.. //depot/projects/ethng/src/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/ethng/src/sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/ethng/src/sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/ethng/src/sys/powerpc/powerpc/uma_machdep.c#2 integrate
.. //depot/projects/ethng/src/sys/security/mac_lomac/mac_lomac.c#3 integrate
.. //depot/projects/ethng/src/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/ethng/src/sys/sparc64/include/vmparam.h#2 integrate
.. //depot/projects/ethng/src/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/ethng/src/sys/sparc64/sparc64/genassym.c#2 integrate
.. //depot/projects/ethng/src/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/ethng/src/sys/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/ethng/src/sys/sun4v/include/vmparam.h#2 integrate
.. //depot/projects/ethng/src/sys/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/ethng/src/sys/sys/callout.h#3 integrate
.. //depot/projects/ethng/src/sys/sys/lock_profile.h#2 integrate
.. //depot/projects/ethng/src/sys/sys/mount.h#3 integrate
.. //depot/projects/ethng/src/sys/sys/proc.h#3 integrate
.. //depot/projects/ethng/src/sys/sys/socket.h#2 integrate
.. //depot/projects/ethng/src/sys/sys/user.h#2 integrate
.. //depot/projects/ethng/src/sys/sys/vmmeter.h#2 integrate
.. //depot/projects/ethng/src/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/ethng/src/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/ethng/src/sys/vm/vm_glue.c#2 integrate
.. //depot/projects/ethng/src/sys/vm/vm_map.c#3 integrate
.. //depot/projects/ethng/src/sys/vm/vm_object.c#2 integrate
.. //depot/projects/ethng/src/sys/vm/vm_object.h#2 integrate
.. //depot/projects/ethng/src/sys/vm/vm_page.c#2 integrate
.. //depot/projects/ethng/src/sys/vm/vm_page.h#2 integrate
.. //depot/projects/ethng/src/sys/vm/vm_pageout.c#2 integrate
.. //depot/projects/ethng/src/sys/vm/vm_pageq.c#2 integrate
.. //depot/projects/ethng/src/sys/vm/vm_phys.c#2 integrate
.. //depot/projects/ethng/src/sys/vm/vm_phys.h#2 integrate
.. //depot/projects/ethng/src/tools/tools/crypto/ipsecstats.c#2 integrate
.. //depot/projects/ethng/src/tools/tools/nanobsd/nanobsd.sh#2 integrate
.. //depot/projects/ethng/src/usr.bin/at/at.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/calendar/calendars/calendar.dutch#3 integrate
.. //depot/projects/ethng/src/usr.bin/calendar/calendars/calendar.freebsd#2 integrate
.. //depot/projects/ethng/src/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici#2 integrate
.. //depot/projects/ethng/src/usr.bin/login/login_fbtab.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/m4/gnum4.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/mklocale/yacc.y#2 integrate
.. //depot/projects/ethng/src/usr.bin/systat/pigs.c#3 integrate
.. //depot/projects/ethng/src/usr.bin/top/machine.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/Makefile#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/agent.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/agent.h#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/agents/Makefile.inc#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/agents/group.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/agents/group.h#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/agents/passwd.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/agents/passwd.h#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/agents/services.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/agents/services.h#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/cachelib.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/cachelib.h#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/cacheplcs.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/cacheplcs.h#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/config.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/config.h#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/debug.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/hashtable.h#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/log.c#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/log.h#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/mp_rs_query.#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/mp_rs_query.c#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/mp_rs_query.h#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/mp_ws_query.c#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/mp_ws_query.h#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/nscd.8#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/nscd.c#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/nscd.conf.5#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/nscdcli.c#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/nscdcli.h#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/parser.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/parser.h#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/protocol.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/protocol.h#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/query.c#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/query.h#3 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/singletons.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/nscd/singletons.h#3 integrate
.. //depot/projects/ethng/src/usr.sbin/repquota/repquota.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/wpa/hostapd/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate

Differences ...

==== //depot/projects/ethng/src/ObsoleteFiles.inc#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.110 2007/08/31 19:41:27 yar Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.112 2007/09/29 22:37:40 bushman Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20070930: rename of cached to nscd
+OLD_FILES+=etc/rc.d/cached
+OLD_FILES+=usr/sbin/cached
+OLD_FILES+=usr/share/man/man5/cached.conf.5
+OLD_FILES+=usr/share/man/man8/cached.8
 # 20070807: removal of PowerPC specific header file.
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/interruptvar.h
@@ -3301,7 +3306,6 @@
 OLD_FILES+=usr/share/man/man4/uaudio.4.gz
 OLD_FILES+=usr/share/man/man4/utf2.4.gz
 OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz
-OLD_FILES+=usr/share/man/man5/ar.5.gz
 OLD_FILES+=usr/share/man/man5/disklabel.5.gz
 OLD_FILES+=usr/share/man/man5/dm.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ranlib.5.gz

==== //depot/projects/ethng/src/UPDATING#2 (text+ko) ====

@@ -21,6 +21,13 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070928:
+        The caching daemon (cached) was renamed to nscd. nscd.conf
+        configuration file should be used instead of cached.conf and
+        nscd_enable, nscd_pidfile and nscd_flags options should be used
+        instead of cached_enable, cached_pidfile and cached_flags in
+        rc.conf.
+
 20070704:
         The new IPsec code is now compiled in using the IPSEC option.  The
 	IPSEC option now requires "device crypto" be defined in your kernel
@@ -887,4 +894,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $
+$FreeBSD: src/UPDATING,v 1.504 2007/09/28 10:38:07 bushman Exp $

==== //depot/projects/ethng/src/bin/getfacl/getfacl.c#2 (text+ko) ====

@@ -32,7 +32,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.11 2006/03/13 11:45:29 rwatson Exp $");
+__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.12 2007/09/19 02:04:47 kevlo Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -41,6 +41,8 @@
 
 #include <err.h>
 #include <errno.h>
+#include <grp.h>
+#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -55,6 +57,32 @@
 	fprintf(stderr, "getfacl [-dhq] [file ...]\n");
 }
 
+static char *
+getuname(uid_t uid)
+{
+	struct passwd *pw;
+	static char uids[10];
+
+	if ((pw = getpwuid(uid)) == NULL) {
+		(void)snprintf(uids, sizeof(uids), "%u", uid);
+		return (uids);
+	} else
+		return (pw->pw_name);
+}
+
+static char *
+getgname(gid_t gid)
+{
+	struct group *gr;
+	static char gids[10];
+
+	if ((gr = getgrgid(gid)) == NULL) {
+		(void)snprintf(gids, sizeof(gids), "%u", gid);
+		return (gids);
+	} else
+		return (gr->gr_name);
+}
+
 /*
  * return an ACL corresponding to the permissions
  * contained in struct stat
@@ -169,8 +197,8 @@
 		more_than_one++;
 
 	if (!qflag)
-		printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid,
-		    sb.st_gid);
+		printf("# file: %s\n# owner: %s\n# group: %s\n", path,
+		    getuname(sb.st_uid), getgname(sb.st_gid));
 
 	if (hflag)
 		acl = acl_get_link_np(path, type);

==== //depot/projects/ethng/src/bin/ps/print.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -197,14 +197,13 @@
 void
 state(KINFO *k, VARENT *ve)
 {
-	int flag, sflag, tdflags;
+	int flag, tdflags;
 	char *cp;
 	VAR *v;
 	char buf[16];
 
 	v = ve->var;
 	flag = k->ki_p->ki_flag;
-	sflag = k->ki_p->ki_sflag;
 	tdflags = k->ki_p->ki_tdflags;	/* XXXKSE */
 	cp = buf;
 
@@ -242,7 +241,7 @@
 		*cp = '?';
 	}
 	cp++;
-	if (!(sflag & PS_INMEM))
+	if (!(flag & P_INMEM))
 		*cp++ = 'W';
 	if (k->ki_p->ki_nice < NZERO)
 		*cp++ = '<';
@@ -591,7 +590,7 @@
 #define	fxtofl(fixpt)	((double)(fixpt) / fscale)
 
 	/* XXX - I don't like this */
-	if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_sflag & PS_INMEM) == 0)
+	if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_flag & P_INMEM) == 0)
 		return (0.0);
 	if (rawcpu)
 		return (100.0 * fxtofl(k->ki_p->ki_pctcpu));
@@ -619,7 +618,7 @@
 	if (failure)
 		return (0.0);
 
-	if ((k->ki_p->ki_sflag & PS_INMEM) == 0)
+	if ((k->ki_p->ki_flag & P_INMEM) == 0)
 		return (0.0);
 	/* XXX want pmap ptpages, segtab, etc. (per architecture) */
 	/* XXX don't have info about shared */

==== //depot/projects/ethng/src/bin/ps/ps.c#2 (text+ko) ====

@@ -47,7 +47,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.110 2005/02/09 17:37:38 ru Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -994,13 +994,13 @@
 	return (s);
 }
 
-#define UREADOK(ki)	(forceuread || (ki->ki_p->ki_sflag & PS_INMEM))
+#define UREADOK(ki)	(forceuread || (ki->ki_p->ki_flag & P_INMEM))
 
 static void
 saveuser(KINFO *ki)
 {
 
-	if (ki->ki_p->ki_sflag & PS_INMEM) {
+	if (ki->ki_p->ki_flag & P_INMEM) {
 		/*
 		 * The u-area might be swapped out, and we can't get
 		 * at it because we have a crashdump and no swap.

==== //depot/projects/ethng/src/etc/defaults/rc.conf#3 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.318 2007/09/28 10:38:08 bushman Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -495,7 +495,6 @@
 auditd_enable="NO"	# Run the audit daemon.
 auditd_program="/usr/sbin/auditd"	# Path to the audit daemon.
 auditd_flags=""		# Which options to pass to the audit daemon.
-cached_enable="NO"	# Run the nsswitch caching daemon.
 cron_enable="YES"	# Run the periodic job daemon.
 cron_program="/usr/sbin/cron"	# Which cron executable to run (if enabled).
 cron_dst="YES"		# Handle DST transitions intelligently (YES/NO)
@@ -503,6 +502,7 @@
 lpd_enable="NO"		# Run the line printer daemon.
 lpd_program="/usr/sbin/lpd"	# path to lpd, if you want a different one.
 lpd_flags=""		# Flags to lpd (if enabled).
+nscd_enable="NO"	# Run the nsswitch caching daemon.
 chkprintcap_enable="NO"	# Run chkprintcap(8) before running lpd.
 chkprintcap_flags="-d"	# Create missing directories by default.
 dumpdev="AUTO"		# Device to crashdump to (device name, AUTO, or NO).

==== //depot/projects/ethng/src/etc/mtree/BSD.include.dist#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.118 2007/07/14 21:49:21 rwatson Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.119 2007/09/23 07:34:21 pjd Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -174,6 +174,8 @@
         ..
         stripe
         ..
+        virstor
+        ..
     ..
     gnu
         posix

==== //depot/projects/ethng/src/etc/rc.d/Makefile#4 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.83 2007/09/07 15:44:09 mlaier Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $
 
 .include <bsd.own.mk>
 
@@ -48,7 +48,7 @@
 .endif
 
 .if ${MK_NS_CACHING} != "no"
-FILES+= cached
+FILES+= nscd
 .endif
 
 FILESDIR=	/etc/rc.d

==== //depot/projects/ethng/src/etc/rc.d/nscd#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/nscd,v 1.4 2007/08/09 13:06:11 bushman Exp $
+# $FreeBSD: src/etc/rc.d/nscd,v 1.6 2007/09/28 10:38:08 bushman Exp $
 #
 
 # PROVIDE: nscd
@@ -8,7 +8,7 @@
 # BEFORE: LOGIN
 
 #
-# Add the following lines to /etc/rc.conf to enable cached:
+# Add the following lines to /etc/rc.conf to enable nscd:
 #
 # nscd_enable="YES"
 #
@@ -24,9 +24,29 @@
 extra_commands="flush"
 flush_cmd="${command} -I all"
 
-nscd_enable=${nscd_enable:-"NO"}
-nscd_pidfile=${nscd_pidfile:-"/var/run/nscd.pid"}
-nscd_flags=${nscd_flags:-""}
+# usage: _nscd_set_option <option name> <default value>
+#
+_nscd_set_option() {
+	local _optname _defoptval _nscd_opt_val _cached_opt_val
+	_optname=$1
+	_defoptval=$2
+
+	_nscd_opt_val=$(eval "echo \$nscd_${_optname}")
+	_cached_opt_val=$(eval "echo \$cached_${_optname}")
+	
+	if [ -n "$_cached_opt_val" -a "$_nscd_opt_val" != "$_defoptval" ]; then
+		warn "You should use nscd_${_optname} instead of" \
+		    "cached_${_optname}"
+		setvar "nscd_${_optname}" "$_cached_opt_val"
+	else
+		setvar "nscd_${_optname}" "${_nscd_opt_val:-$_defoptval}"
+	fi
+}
+
 
 load_rc_config $name
+_nscd_set_option "enable" "NO"
+_nscd_set_option "pidfile" "/var/run/nscd.pid"
+_nscd_set_option "flags" ""
 run_rc_command "$1"
+

==== //depot/projects/ethng/src/etc/services#3 (text+ko) ====

@@ -16,7 +16,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-# $FreeBSD: src/etc/services,v 1.112 2007/09/08 08:56:01 mr Exp $
+# $FreeBSD: src/etc/services,v 1.113 2007/09/21 01:26:00 brooks Exp $
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
@@ -2331,7 +2331,7 @@
 sge_qmaster	6444/tcp   #Grid Engine Qmaster Service
 sge_qmaster	6444/udp   #Grid Engine Qmaster Service
 sge_execd	6445/tcp   #Grid Engine Execution Service
-sge_execd	6445/upd   #Grid Engine Execution Service
+sge_execd	6445/udp   #Grid Engine Execution Service
 xdsxdm		6558/tcp
 xdsxdm		6558/udp
 ircd		6667/tcp   #Internet Relay Chat (unoffical)

==== //depot/projects/ethng/src/gnu/usr.bin/binutils/ld/Makefile#2 (text+ko) ====

@@ -1,9 +1,13 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.31 2004/12/21 09:59:40 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.32 2007/09/26 01:31:28 marcel Exp $
 
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/ld
 
+.if ${TARGET_ARCH} == "ia64"
+CFLAGS+= -O1
+.endif
+
 PROG=	ld
 SCRIPTDIR= /usr/libdata/ldscripts
 SRCS+=	ldcref.c ldctor.c ldemul.c ldemul-list.h ldexp.c ldfile.c \

==== //depot/projects/ethng/src/gnu/usr.bin/binutils/ld/genscripts.sh#2 (text+ko) ====

@@ -9,7 +9,7 @@
 # sparc-sun-sunos4.1.3 sparc-sun-sunos4.1.3 sun4 "" sun3 sparc-sun-sunos4.1.3
 # produces sun3.x sun3.xbn sun3.xn sun3.xr sun3.xu em_sun3.c
 #
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.7 2006/09/14 07:46:32 imp Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.9 2007/09/19 14:19:32 obrien Exp $
 #
 # This is a cut-down version of the GNU script. Instead of jumping through
 # hoops for all possible combinations of paths, just use the libdir
@@ -54,8 +54,12 @@
 fi
 
 # Set some flags for the emultempl scripts.  USE_LIBPATH will
-# be set for any libpath-using emulation.
-      USE_LIBPATH=yes
+# be set for any libpath-using emulation; NATIVE will be set for a
+# emulation to enable 'LD_LIBRARY_PATH=/foo:/bar ld -lfooz'
+    if [ "x${host}" = "x${target}" ] ; then
+      NATIVE=yes
+    fi
+  USE_LIBPATH=yes
 
 # Set the library search path, for libraries named by -lfoo.
 # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used.

==== //depot/projects/ethng/src/gnu/usr.bin/cc/cc_int/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.51 2007/05/19 04:25:57 kan Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.52 2007/09/18 23:34:42 cognet Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.ver"
@@ -75,6 +75,10 @@
 # Target specific, C specific object file
 C_TARGET_OBJS=
 
+.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
+CFLAGS += -DTARGET_ENDIAN_DEFAULT=MASK_BIG_END
+.endif
+
 # Language-specific object files for C and Objective C.
 C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \
   c-convert.o c-aux-info.o c-common.o c-opts.o c-format.o c-semantics.o \

==== //depot/projects/ethng/src/gnu/usr.bin/man/man/man.c#2 (text+ko) ====

@@ -16,7 +16,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.63 2005/12/05 14:22:11 ru Exp $";
+  "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.65 2007/09/25 21:41:22 edwin Exp $";
 #endif /* not lint */
 
 #define MAN_MAIN
@@ -884,11 +884,26 @@
 
  next:
 
+#if HAVE_LIBZ > 0
+  if ((fp = gzopen (ult, "r")) == NULL)
+  {
+    /* check for the compressed version too */
+    strlcat(ult, ".gz", FILENAME_MAX);
+    if ((fp = gzopen (ult, "r")) == NULL)
+      return ult; /* we munged it, but it doesn't exist anyway */
+  }
+#else
   if ((fp = fopen (ult, "r")) == NULL)
     return ult;
+#endif
 
+#if HAVE_LIBZ > 0
+  end = gzgets (fp, buf, BUFSIZ);
+  gzclose(fp);
+#else
   end = fgets (buf, BUFSIZ, fp);
   fclose(fp);
+#endif
 
   if (!end || strlen (buf) < 5)
     return ult;

==== //depot/projects/ethng/src/gnu/usr.bin/texinfo/info/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.13 2002/06/05 06:58:32 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.14 2007/09/19 14:21:18 obrien Exp $
 
 PROG=	info
 MAN=	info.1 info.5 texinfo.5
@@ -8,7 +8,7 @@
 	infomap.c m-x.c man.c nodemenu.c nodes.c search.c session.c \
 	signals.c terminal.c tilde.c variables.c window.c
 
-CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:/usr/X11R6/info:.\"
+CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\"
 
 DPADD=	${LIBTERMCAP} ${LIBTXI}
 LDADD=	-ltermcap ${LIBTXI}

==== //depot/projects/ethng/src/include/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.274 2007/07/14 21:49:22 rwatson Exp $
+# $FreeBSD: src/include/Makefile,v 1.275 2007/09/23 07:34:21 pjd Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -49,7 +49,7 @@
 	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
 	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
-	geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \
+	geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe geom/virstor \
 	netgraph/atm netgraph/netflow \
 	security/audit \
 	security/mac_biba security/mac_bsdextended security/mac_lomac \

==== //depot/projects/ethng/src/lib/libarchive/archive_read.3#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/lib/libarchive/archive_read.3,v 1.34 2007/05/29 01:00:18 kientzle Exp $
+.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.35 2007/09/19 16:37:45 kientzle Exp $
 .\"
 .Dd August 19, 2006
 .Dt archive_read 3
@@ -267,7 +267,7 @@
 The
 .Va flags
 argument is passed unmodified to
-.Xr archiv_write_disk_set_options 3 .
+.Xr archive_write_disk_set_options 3 .
 .It Fn archive_read_extract_set_progress_callback
 Sets a pointer to a user-defined callback that can be used
 for updating progress displays during extraction.

==== //depot/projects/ethng/src/lib/libarchive/archive_write_disk.c#3 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.14 2007/08/12 17:35:05 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.17 2007/09/21 04:52:42 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -448,8 +448,10 @@
 
 	__archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 	    ARCHIVE_STATE_DATA, "archive_write_disk_block");
-	if (a->fd < 0)
-		return (ARCHIVE_OK);
+	if (a->fd < 0) {
+		archive_set_error(&a->archive, 0, "File not open");
+		return (ARCHIVE_WARN);
+	}
 	archive_clear_error(&a->archive);
 
 	/* Seek if necessary to the specified offset. */
@@ -478,12 +480,17 @@
 _archive_write_data(struct archive *_a, const void *buff, size_t size)
 {
 	struct archive_write_disk *a = (struct archive_write_disk *)_a;
+	int r;
+
 	__archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 	    ARCHIVE_STATE_DATA, "archive_write_data");
 	if (a->fd < 0)
 		return (ARCHIVE_OK);
 
-	return (_archive_write_data_block(_a, buff, size, a->offset));
+	r = _archive_write_data_block(_a, buff, size, a->offset);
+	if (r < ARCHIVE_OK)
+		return (r);
+	return (size);
 }
 
 static int

==== //depot/projects/ethng/src/lib/libarchive/test/test_write_disk.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.3 2007/07/06 15:43:11 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.6 2007/09/21 04:52:43 kientzle Exp $");
 
 #if ARCHIVE_VERSION_STAMP >= 1009000
 
@@ -50,8 +50,76 @@
 	    st.st_mode, archive_entry_mode(ae));
 	assert(st.st_mode == (archive_entry_mode(ae) & ~UMASK));
 }
+
+static void create_reg_file(struct archive_entry *ae, const char *msg)
+{
+	static const char data[]="abcdefghijklmnopqrstuvwxyz";
+	struct archive *ad;
+	struct stat st;
+
+	/* Write the entry to disk. */
+	assert((ad = archive_write_disk_new()) != NULL);
+	failure("%s", msg);
+	assertEqualIntA(ad, 0, archive_write_header(ad, ae));
+	assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data)));
+	assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
+#if ARCHIVE_API_VERSION > 1
+	assertEqualInt(0, archive_write_finish(ad));
+#else
+	archive_write_finish(ad);
 #endif
+	/* Test the entries on disk. */
+	assert(0 == stat(archive_entry_pathname(ae), &st));
+	failure("st.st_mode=%o archive_entry_mode(ae)=%o",
+	    st.st_mode, archive_entry_mode(ae));
+	assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK));
+	assertEqualInt(st.st_size, sizeof(data));
+}
+
+static void create_reg_file2(struct archive_entry *ae, const char *msg)
+{
+	const int datasize = 100000;
+	char *data;
+	char *compare;
+	struct archive *ad;
+	struct stat st;
+	int i, fd;
 
+	data = malloc(datasize);
+	for (i = 0; i < datasize; i++)
+		data[i] = (char)(i % 256);
+
+	/* Write the entry to disk. */
+	assert((ad = archive_write_disk_new()) != NULL);
+	failure("%s", msg);
+	assertEqualIntA(ad, 0, archive_write_header(ad, ae));
+	for (i = 0; i < datasize - 999; i += 1000) {
+		assertEqualIntA(ad, ARCHIVE_OK,
+		    archive_write_data_block(ad, data + i, 1000, i));
+	}
+	assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
+#if ARCHIVE_API_VERSION > 1
+	assertEqualInt(0, archive_write_finish(ad));
+#else
+	archive_write_finish(ad);
+#endif
+	/* Test the entries on disk. */
+	assert(0 == stat(archive_entry_pathname(ae), &st));
+	failure("st.st_mode=%o archive_entry_mode(ae)=%o",
+	    st.st_mode, archive_entry_mode(ae));
+	assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK));
+	assertEqualInt(st.st_size, i);
+
+	compare = malloc(datasize);
+	fd = open(archive_entry_pathname(ae), O_RDONLY);
+	assertEqualInt(datasize, read(fd, compare, datasize));
+	close(fd);
+	assert(memcmp(compare, data, datasize) == 0);
+	free(compare);
+	free(data);
+}
+#endif
+
 DEFINE_TEST(test_write_disk)
 {
 #if ARCHIVE_VERSION_STAMP < 1009000
@@ -66,7 +134,14 @@
 	assert((ae = archive_entry_new()) != NULL);
 	archive_entry_copy_pathname(ae, "file");
 	archive_entry_set_mode(ae, S_IFREG | 0755);
-	create(ae, "Test creating a regular file");
+	create_reg_file(ae, "Test creating a regular file");
+	archive_entry_free(ae);
+
+	/* Another regular file. */
+	assert((ae = archive_entry_new()) != NULL);
+	archive_entry_copy_pathname(ae, "file2");
+	archive_entry_set_mode(ae, S_IFREG | 0755);
+	create_reg_file2(ae, "Test creating another regular file");
 	archive_entry_free(ae);
 
 	/* A regular file over an existing file */

==== //depot/projects/ethng/src/lib/libc/gen/Makefile.inc#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.127 2007/07/04 23:27:38 peter Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.128 2007/09/28 02:22:56 scf Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -85,7 +85,8 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sun Sep 30 05:12:48 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 27D1416A419; Sun, 30 Sep 2007 05:12:48 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD94516A468
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 05:12:47 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BA88713C447
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 05:12:47 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8U5ClcP007299
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 05:12:47 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8U5Clix007296
	for perforce@freebsd.org; Sun, 30 Sep 2007 05:12:47 GMT
	(envelope-from jb@freebsd.org)
Date: Sun, 30 Sep 2007 05:12:47 GMT
Message-Id: <200709300512.l8U5Clix007296@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127001 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Sep 2007 05:12:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=127001

Change 127001 by jb@jb_freebsd1 on 2007/09/30 05:12:45

	Add the ctfconvert and ctfmerge commands back in.

Affected files ...

.. //depot/projects/dtrace/src/share/mk/bsd.lib.mk#11 edit

Differences ...

==== //depot/projects/dtrace/src/share/mk/bsd.lib.mk#11 (text+ko) ====

@@ -64,43 +64,82 @@
 
 .c.po:
 	${CC} ${PO_FLAG} ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 .c.So:
 	${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 .cc.po .C.po .cpp.po .cxx.po:
 	${CXX} ${PO_FLAG} ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 .cc.So .C.So .cpp.So .cxx.So:
 	${CXX} ${PICFLAG} -DPIC ${CXXFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 .f.po:
 	${FC} -pg ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 .f.So:
 	${FC} ${PICFLAG} -DPIC ${FFLAGS} -o ${.TARGET} -c ${.IMPSRC}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 .m.po:
 	${OBJC} ${OBJCFLAGS} -pg -c ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 .m.So:
 	${OBJC} ${PICFLAG} -DPIC ${OBJCFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 .s.po .s.So:
 	${AS} ${AFLAGS} -o ${.TARGET} ${.IMPSRC}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 .asm.po:
 	${CC} -x assembler-with-cpp -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 .asm.So:
 	${CC} -x assembler-with-cpp ${PICFLAG} -DPIC ${CFLAGS} \
 	    -c ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 .S.po:
 	${CC} -DPROF ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 .S.So:
 	${CC} ${PICFLAG} -DPIC ${CFLAGS} -c ${.IMPSRC} -o ${.TARGET}
+.if defined(CTFCONVERT)
+	${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
+.endif
 
 all: objwarn
 
@@ -171,6 +210,9 @@
 	    -o ${.TARGET} -Wl,-soname,${SONAME} \
 	    `NM='${NM}' lorder ${SOBJS} | tsort -q` ${LDADD}
 .endif
+.if defined(CTFMERGE)
+	${CTFMERGE} ${CTFFLAGS} -o ${.TARGET} ${SOBJS}
+.endif
 .endif
 
 .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB) && ${MK_TOOLCHAIN} != "no"

From owner-p4-projects@FreeBSD.ORG  Sun Sep 30 10:10:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 67CEB16A46B; Sun, 30 Sep 2007 10:10:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0DCA316A421
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 10:10:12 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0E4DF13C457
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 10:10:12 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8UAAChp065673
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 10:10:12 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8UAABNv065670
	for perforce@freebsd.org; Sun, 30 Sep 2007 10:10:11 GMT
	(envelope-from thompsa@freebsd.org)
Date: Sun, 30 Sep 2007 10:10:11 GMT
Message-Id: <200709301010.l8UAABNv065670@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127009 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Sep 2007 10:10:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=127009

Change 127009 by thompsa@thompsa_heff on 2007/09/30 10:09:51

	- Use our own watchdog
	- Add WPA support again
	- Add more scan hacks and tricks
	- Put msdu tx rates back in
	
	Obtained from:	sams ipw changes

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#27 edit
.. //depot/projects/wifi/sys/dev/ipw/if_ipwreg.h#7 edit
.. //depot/projects/wifi/sys/dev/ipw/if_ipwvar.h#9 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#27 (text+ko) ====

@@ -126,7 +126,7 @@
 static int	ipw_tx_start(struct ifnet *, struct mbuf *,
 		    struct ieee80211_node *);
 static void	ipw_start(struct ifnet *);
-static void	ipw_watchdog(struct ifnet *);
+static void	ipw_watchdog(void *);
 static int	ipw_ioctl(struct ifnet *, u_long, caddr_t);
 static void	ipw_stop_master(struct ipw_softc *);
 static int	ipw_enable(struct ipw_softc *);
@@ -226,6 +226,7 @@
 	TASK_INIT(&sc->sc_init_task, 0, ipw_init_task, sc);
 	TASK_INIT(&sc->sc_scan_task, 0, ipw_scan_task, sc);
 	TASK_INIT(&sc->sc_assoc_task, 0, ipw_assoc_task, sc);
+	callout_init_mtx(&sc->sc_wdtimer, &sc->sc_mtx, 0);
 
 	if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) {
 		device_printf(dev, "chip is in D%d power mode "
@@ -279,7 +280,6 @@
 	ifp->if_init = ipw_init;
 	ifp->if_ioctl = ipw_ioctl;
 	ifp->if_start = ipw_start;
-	ifp->if_watchdog = ipw_watchdog;
 	IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN);
 	ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN;
 	IFQ_SET_READY(&ifp->if_snd);
@@ -290,11 +290,12 @@
 	ic->ic_state = IEEE80211_S_INIT;
 
 	/* set device capabilities */
-	ic->ic_caps =
-	    IEEE80211_C_IBSS |		/* IBSS mode supported */
-	    IEEE80211_C_MONITOR |	/* monitor mode supported */
-	    IEEE80211_C_TXPMGT |	/* tx power management */
-	    IEEE80211_C_SHPREAMBLE;	/* short preamble supported */
+	ic->ic_caps = IEEE80211_C_IBSS		/* IBSS mode supported */
+		| IEEE80211_C_MONITOR		/* monitor mode supported */
+		| IEEE80211_C_PMGT		/* power save supported */
+		| IEEE80211_C_SHPREAMBLE	/* short preamble supported */
+		| IEEE80211_C_WPA		/* 802.11i supported */
+		;
 
 	/* read MAC address from EEPROM */
 	val = ipw_read_prom_word(sc, IPW_EEPROM_MAC + 0);
@@ -395,6 +396,7 @@
 	struct ifnet *ifp = ic->ic_ifp;
 
 	ipw_stop(sc);
+	callout_drain(&sc->sc_wdtimer);
 
 	if (ifp != NULL) {
 		bpfdetach(ifp);
@@ -966,7 +968,7 @@
 
 	cmd = mtod(sbuf->m, struct ipw_cmd *);
 
-	DPRINTFN(4, ("cmd ack'ed %s(%u, %u, %u, %u, %u)\n",
+	DPRINTFN(9, ("cmd ack'ed %s(%u, %u, %u, %u, %u)\n",
 	    ipw_cmdname(le32toh(cmd->type)), le32toh(cmd->type),
 	    le32toh(cmd->subtype), le32toh(cmd->seq), le32toh(cmd->len),
 	    le32toh(cmd->status)));
@@ -1012,11 +1014,23 @@
 		break;
 
 	case IPW_STATE_SCAN_COMPLETE:
+		/*
+		 * XXX For some reason scan requests generate scan
+		 * started + scan done events before any traffic is
+		 * received (e.g. probe response frames).  We work
+		 * around this by marking the HACK flag and skipping
+		 * the first scan complete event.
+		*/
+		if (sc->flags & IPW_FLAG_HACK) {
+			sc->flags &= ~IPW_FLAG_HACK;
+			break;
+		}
 		DPRINTFN(3, ("Scan complete (%s flags 0x%x)\n",
 			    IEEESTATE(ic), sc->flags));
 		if (sc->flags & IPW_FLAG_SCANNING) {
 			ieee80211_scan_done(ic);
 			sc->flags &= ~IPW_FLAG_SCANNING;
+			sc->sc_scan_timer = 0;
 		}
 		break;
 
@@ -1185,7 +1199,7 @@
 		bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m);
 	}
 
-	if (ic->ic_state == IEEE80211_S_SCAN)
+	if (sc->flags & IPW_FLAG_SCANNING)
 		ipw_fix_channel(sc, m);
 
 	wh = mtod(m, struct ieee80211_frame *);
@@ -1407,12 +1421,13 @@
 		{ IPW_CMD_SET_ESSID,		"SET_ESSID" },
 		{ IPW_CMD_SET_FRAG_THRESHOLD,	"SET_FRAG_THRESHOLD" },
 		{ IPW_CMD_SET_MAC_ADDRESS,	"SET_MAC_ADDRESS" },
-		{ IPW_CMD_SET_MANDATORY_BSSID, 	"SET_MANDATORY_BSSID" },
+		{ IPW_CMD_SET_MANDATORY_BSSID,	"SET_MANDATORY_BSSID" },
 		{ IPW_CMD_SET_MODE,		"SET_MODE" },
+		{ IPW_CMD_SET_MSDU_TX_RATES,	"SET_MSDU_TX_RATES" },
 		{ IPW_CMD_SET_POWER_MODE,	"SET_POWER_MODE" },
 		{ IPW_CMD_SET_RTS_THRESHOLD,	"SET_RTS_THRESHOLD" },
 		{ IPW_CMD_SET_SCAN_OPTIONS,	"SET_SCAN_OPTIONS" },
-		{ IPW_CMD_SET_SECURITY_INFORMATION,	"SET_SECURITY_INFO" },
+		{ IPW_CMD_SET_SECURITY_INFO,	"SET_SECURITY_INFO" },
 		{ IPW_CMD_SET_TX_POWER_INDEX,	"SET_TX_POWER_INDEX" },
 		{ IPW_CMD_SET_TX_RATES,		"SET_TX_RATES" },
 		{ IPW_CMD_SET_WEP_FLAGS,	"SET_WEP_FLAGS" },
@@ -1478,8 +1493,19 @@
 	bus_dmamap_sync(sc->cmd_dmat, sc->cmd_map, BUS_DMASYNC_PREWRITE);
 	bus_dmamap_sync(sc->tbd_dmat, sc->tbd_map, BUS_DMASYNC_PREWRITE);
 
-	DPRINTFN(4, ("sending %s(%u, %u, %u, %u)\n",
-		ipw_cmdname(type), type, 0, 0, len));
+#ifdef IPW_DEBUG
+	if (ipw_debug >= 4) {
+		printf("sending %s(%u, %u, %u, %u)", ipw_cmdname(type), type,
+		    0, 0, len);
+		/* Print the data buffer in the higher debug level */
+		if (ipw_debug >= 9 && len > 0) {
+			printf(" data: 0x");
+			for (int i = 1; i <= len; i++)
+				printf("%1D", (char *)data + len - i, "");
+		}
+		printf("\n");
+	}
+#endif
 
 	/* kick firmware */
 	sc->txfree--;
@@ -1703,20 +1729,19 @@
 
 		/* start watchdog timer */
 		sc->sc_tx_timer = 5;
-		ifp->if_timer = 1;
 	}
 
 	mtx_unlock(&sc->sc_mtx);
 }
 
 static void
-ipw_watchdog(struct ifnet *ifp)
+ipw_watchdog(void *arg)
 {
-	struct ipw_softc *sc = ifp->if_softc;
+	struct ipw_softc *sc = arg;
+	struct ieee80211com *ic = &sc->sc_ic;
+	struct ifnet *ifp = sc->sc_ifp;
 
-	mtx_lock(&sc->sc_mtx);
-
-	ifp->if_timer = 0;
+	mtx_assert(&sc->sc_mtx, MA_OWNED);
 
 	if (sc->sc_tx_timer > 0) {
 		if (--sc->sc_tx_timer == 0) {
@@ -1724,13 +1749,20 @@
 			ifp->if_oerrors++;
 			taskqueue_enqueue_fast(taskqueue_fast,
 			    &sc->sc_init_task);
-			mtx_unlock(&sc->sc_mtx);
-			return;
+		}
+	}
+	if (sc->sc_scan_timer > 0) {
+		if (--sc->sc_scan_timer == 0) {
+			DPRINTFN(3, ("Scan timeout\n"));
+			/* End the scan */
+			if (sc->flags & IPW_FLAG_SCANNING) {
+				ieee80211_scan_done(ic);
+				sc->flags &= ~IPW_FLAG_SCANNING;
+			}
 		}
-		ifp->if_timer = 1;
 	}
-
-	mtx_unlock(&sc->sc_mtx);
+	if (ifp->if_drv_flags & IFF_DRV_RUNNING)
+		callout_reset(&sc->sc_wdtimer, hz, ipw_watchdog, sc);
 }
 
 static int
@@ -1790,7 +1822,8 @@
 	tmp = CSR_READ_4(sc, IPW_CSR_RST);
 	CSR_WRITE_4(sc, IPW_CSR_RST, tmp | IPW_RST_PRINCETON_RESET);
 
-	sc->flags &= ~IPW_FLAG_FW_INITED;
+	/* Clear all flags except the following */
+	sc->flags &= IPW_FLAG_HAS_RADIO_SWITCH;
 }
 
 static int
@@ -1979,6 +2012,48 @@
 }
 
 static int
+ipw_setwepkeys(struct ipw_softc *sc)
+{
+	struct ieee80211com *ic = &sc->sc_ic;
+	struct ipw_wep_key wepkey;
+	struct ieee80211_key *wk;
+	int error, i;
+
+	for (i = 0; i < IEEE80211_WEP_NKID; i++) {
+		wk = &ic->ic_crypto.cs_nw_keys[i];
+
+		if (wk->wk_cipher == NULL ||
+		    wk->wk_cipher->ic_cipher != IEEE80211_CIPHER_WEP)
+			continue;
+
+		wepkey.idx = i;
+		wepkey.len = wk->wk_keylen;
+		memset(wepkey.key, 0, sizeof wepkey.key);
+		memcpy(wepkey.key, wk->wk_key, wk->wk_keylen);
+		DPRINTF(("Setting wep key index %u len %u\n", wepkey.idx,
+		    wepkey.len));
+		error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY, &wepkey,
+		    sizeof wepkey);
+		if (error != 0)
+			return error;
+	}
+	return 0;
+}
+
+static int
+ipw_setwpaie(struct ipw_softc *sc, const void *ie, int ielen)
+{
+	struct ipw_wpa_ie wpaie;
+
+	memset(&wpaie, 0, sizeof(wpaie));
+	wpaie.len = htole32(ielen);
+	/* XXX verify length */
+	memcpy(&wpaie.ie, ie, ielen);
+	DPRINTF(("Setting wpa ie\n"));
+	return ipw_cmd(sc, IPW_CMD_SET_WPA_IE, &wpaie, sizeof(wpaie));
+}
+
+static int
 ipw_setbssid(struct ipw_softc *sc, uint8_t *bssid)
 {
 	static const uint8_t zerobssid[IEEE80211_ADDR_LEN];
@@ -2052,7 +2127,10 @@
 	int error;
 
 	DPRINTF(("%s: flags 0x%x\n", __func__, sc->flags));
-	sc->flags |= IPW_FLAG_SCANNING;
+
+	if (sc->flags & IPW_FLAG_SCANNING)
+		return (EBUSY);
+	sc->flags |= IPW_FLAG_SCANNING | IPW_FLAG_HACK;
 
 	/* NB: IPW_SCAN_DO_NOT_ASSOCIATE does not work (we set it anyway) */
 	error = ipw_setscanopts(sc, 0x3fff, IPW_SCAN_DO_NOT_ASSOCIATE);
@@ -2073,6 +2151,7 @@
 	 *     if so just re-enable it to kick off scanning.
 	 */
 	DPRINTF(("Starting scan\n"));
+	sc->sc_scan_timer = 3;
 	if (sc->flags & IPW_FLAG_ENABLED) {
 		params = 0;				/* XXX? */
 		error = ipw_cmd(sc, IPW_CMD_BROADCAST_SCAN,
@@ -2082,7 +2161,7 @@
 done:
 	if (error != 0) {
 		DPRINTF(("Scan failed\n"));
-		sc->flags &= ~IPW_FLAG_SCANNING;
+		sc->flags &= ~(IPW_FLAG_SCANNING | IPW_FLAG_HACK);
 	}
 	return (error);
 }
@@ -2108,11 +2187,9 @@
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = ic->ic_ifp;
 	struct ipw_security security;
-	struct ieee80211_key *k;
-	struct ipw_wep_key wepkey;
 	struct ipw_configuration config;
 	uint32_t data;
-	int error, i;
+	int error;
 
 	error = ipw_disable(sc);
 	if (error != 0)
@@ -2173,6 +2250,12 @@
 	if (error != 0)
 		return error;
 
+	/* NB: use the same rate set */
+	DPRINTF(("Setting msdu tx rates to 0x%x\n", le32toh(data)));
+	error = ipw_cmd(sc, IPW_CMD_SET_MSDU_TX_RATES, &data, sizeof data);
+	if (error != 0)
+		return error;
+
 	data = htole32(0xf); /* 1, 2, 5.5, 11 */
 	DPRINTF(("Setting tx rates to 0x%x\n", le32toh(data)));
 	error = ipw_cmd(sc, IPW_CMD_SET_TX_RATES, &data, sizeof data);
@@ -2228,35 +2311,25 @@
 	    IPW_AUTH_SHARED : IPW_AUTH_OPEN;
 	security.ciphers = htole32(IPW_CIPHER_NONE);
 	DPRINTF(("Setting authmode to %u\n", security.authmode));
-	error = ipw_cmd(sc, IPW_CMD_SET_SECURITY_INFORMATION, &security,
+	error = ipw_cmd(sc, IPW_CMD_SET_SECURITY_INFO, &security,
 	    sizeof security);
 	if (error != 0)
 		return error;
 
 	if (ic->ic_flags & IEEE80211_F_PRIVACY) {
-		k = ic->ic_crypto.cs_nw_keys;
-		for (i = 0; i < IEEE80211_WEP_NKID; i++, k++) {
-			if (k->wk_keylen == 0)
-				continue;
+		error = ipw_setwepkeys(sc);
+		if (error != 0)
+			return error;
 
-			wepkey.idx = i;
-			wepkey.len = k->wk_keylen;
-			memset(wepkey.key, 0, sizeof wepkey.key);
-			memcpy(wepkey.key, k->wk_key, k->wk_keylen);
-			DPRINTF(("Setting wep key index %u len %u\n",
-			    wepkey.idx, wepkey.len));
-			error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY, &wepkey,
-			    sizeof wepkey);
+		if (ic->ic_crypto.cs_def_txkey != IEEE80211_KEYIX_NONE) {
+			data = htole32(ic->ic_crypto.cs_def_txkey);
+			DPRINTF(("Setting wep tx key index to %u\n",
+				le32toh(data)));
+			error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY_INDEX, &data,
+			    sizeof data);
 			if (error != 0)
 				return error;
 		}
-
-		data = htole32(ic->ic_crypto.cs_def_txkey);
-		DPRINTF(("Setting wep tx key index to %u\n", le32toh(data)));
-		error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY_INDEX, &data,
-		    sizeof data);
-		if (error != 0)
-			return error;
 	}
 
 	data = htole32((ic->ic_flags & IEEE80211_F_PRIVACY) ? IPW_WEPON : 0);
@@ -2265,16 +2338,11 @@
 	if (error != 0)
 		return error;
 
-#if 0
-	struct ipw_wpa_ie ie;
-
-	memset(&ie, 0, sizeof ie);
-	ie.len = htole32(sizeof (struct ieee80211_ie_wpa));
-	DPRINTF(("Setting wpa ie\n"));
-	error = ipw_cmd(sc, IPW_CMD_SET_WPA_IE, &ie, sizeof ie);
-	if (error != 0)
-		return error;
-#endif
+	if (ic->ic_opt_ie != NULL) {
+		error = ipw_setwpaie(sc, ic->ic_opt_ie, ic->ic_opt_ie_len);
+		if (error != 0)
+			return error;
+	}
 
 	if (ic->ic_opmode == IEEE80211_M_IBSS) {
 		data = htole32(ic->ic_bintval);
@@ -2311,10 +2379,8 @@
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ieee80211_node *ni = ic->ic_bss;
 	struct ipw_security security;
-	struct ieee80211_key *k;
-	struct ipw_wep_key wepkey;
 	uint32_t data;
-	int error, i;
+	int error;
 
 	error = ipw_disable(sc);
 	if (error != 0)
@@ -2325,35 +2391,25 @@
 	    IPW_AUTH_SHARED : IPW_AUTH_OPEN;
 	security.ciphers = htole32(IPW_CIPHER_NONE);
 	DPRINTF(("Setting authmode to %u\n", security.authmode));
-	error = ipw_cmd(sc, IPW_CMD_SET_SECURITY_INFORMATION, &security,
+	error = ipw_cmd(sc, IPW_CMD_SET_SECURITY_INFO, &security,
 	    sizeof security);
 	if (error != 0)
 		return (error);
 
 	if (ic->ic_flags & IEEE80211_F_PRIVACY) {
-		k = ic->ic_crypto.cs_nw_keys;
-		for (i = 0; i < IEEE80211_WEP_NKID; i++, k++) {
-			if (k->wk_keylen == 0)
-				continue;
+		error = ipw_setwepkeys(sc);
+		if (error != 0)
+			return error;
 
-			wepkey.idx = i;
-			wepkey.len = k->wk_keylen;
-			memset(wepkey.key, 0, sizeof wepkey.key);
-			memcpy(wepkey.key, k->wk_key, k->wk_keylen);
-			DPRINTF(("Setting wep key index %u len %u\n",
-			    wepkey.idx, wepkey.len));
-			error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY, &wepkey,
-			    sizeof wepkey);
+		if (ic->ic_crypto.cs_def_txkey != IEEE80211_KEYIX_NONE) {
+			data = htole32(ic->ic_crypto.cs_def_txkey);
+			DPRINTF(("Setting wep tx key index to %u\n",
+				le32toh(data)));
+			error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY_INDEX, &data,
+			    sizeof data);
 			if (error != 0)
 				return error;
 		}
-
-		data = htole32(ic->ic_crypto.cs_def_txkey);
-		DPRINTF(("Setting wep tx key index to %u\n", le32toh(data)));
-		error = ipw_cmd(sc, IPW_CMD_SET_WEP_KEY_INDEX, &data,
-		    sizeof data);
-		if (error != 0)
-			return error;
 	}
 
 	data = htole32((ic->ic_flags & IEEE80211_F_PRIVACY) ? IPW_WEPON : 0);
@@ -2370,6 +2426,11 @@
 	if (error != 0)
 		return (error);
 
+	if (ic->ic_opt_ie != NULL) {
+		error = ipw_setwpaie(sc, ic->ic_opt_ie, ic->ic_opt_ie_len);
+		if (error != 0)
+			return error;
+	}
 	if (ic->ic_opmode == IEEE80211_M_IBSS) {
 		error = ipw_setchannel(sc, ni->ni_chan);
 		if (error != 0)
@@ -2557,6 +2618,7 @@
 	} else
 		ieee80211_new_state(ic, IEEE80211_S_RUN, -1);
 
+	callout_reset(&sc->sc_wdtimer, hz, ipw_watchdog, sc);
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
 	ifp->if_drv_flags |= IFF_DRV_RUNNING;
 
@@ -2588,6 +2650,7 @@
 
 	ieee80211_new_state(ic, IEEE80211_S_INIT, -1);
 
+	callout_stop(&sc->sc_wdtimer);
 	ipw_stop_master(sc);
 
 	CSR_WRITE_4(sc, IPW_CSR_RST, IPW_RST_SW_RESET);
@@ -2599,7 +2662,6 @@
 		ipw_release_sbd(sc, &sc->stbd_list[i]);
 
 	sc->sc_tx_timer = 0;
-	ifp->if_timer = 0;
 	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
 
 	mtx_unlock(&sc->sc_mtx);

==== //depot/projects/wifi/sys/dev/ipw/if_ipwreg.h#7 (text+ko) ====

@@ -88,11 +88,18 @@
 #define IPW_IO_LED_OFF		0x00002000
 #define IPW_IO_RADIO_DISABLED	0x00010000
 
+/* state codes sent by fw on IPW_STATUS_CODE_NEWSTATE interrupt */
+#define IPW_STATE_INITIALIZED		0x0001
+#define IPW_STATE_CC_FOUND		0x0002	/* 802.11d cc received */
 #define IPW_STATE_ASSOCIATED		0x0004
 #define IPW_STATE_ASSOCIATION_LOST	0x0008
+#define IPW_STATE_ASSOCIATION_CHANGED	0x0010	/* assoc params changed? */
 #define IPW_STATE_SCAN_COMPLETE		0x0020
+#define IPW_STATE_PS_ENTER		0x0040	/* entered power-save mode */
+#define IPW_STATE_PS_EXIT		0x0080	/* exited power-save mode */
 #define IPW_STATE_RADIO_DISABLED	0x0100
 #define IPW_STATE_DISABLED		0x0200
+#define IPW_STATE_POWER_DOWN		0x0400	/* ??? */
 #define IPW_STATE_SCANNING		0x0800
 
 /* table1 offsets */
@@ -146,7 +153,9 @@
 	uint8_t		flags;
 #define IPW_STATUS_FLAG_DECRYPTED	0x01
 #define IPW_STATUS_FLAG_WEP_ENCRYPTED	0x02
+#define IPW_STATUS_FLAG_CRC_ERROR	0x04
 	uint8_t		rssi;	/* received signal strength indicator */
+#define	IPW_RSSI_TO_DBM	(-98)		/* XXX fixed nf to convert dBm */
 } __packed;
 
 /* data header */
@@ -190,9 +199,13 @@
 #define IPW_CMD_DISABLE				44
 #define IPW_CMD_SET_DESIRED_BSSID		45
 #define IPW_CMD_SET_SCAN_OPTIONS		46
+#define IPW_CMD_SET_SCAN_DWELL_TIME		47
+#define IPW_CMD_SET_SHORT_RETRY			51
+#define IPW_CMD_SET_LONG_RETRY			52
 #define IPW_CMD_PREPARE_POWER_DOWN		58
 #define IPW_CMD_DISABLE_PHY			61
-#define IPW_CMD_SET_SECURITY_INFORMATION	67
+#define IPW_CMD_SET_MSDU_TX_RATES		62
+#define IPW_CMD_SET_SECURITY_INFO		67
 #define IPW_CMD_DISASSOCIATE			68
 #define IPW_CMD_SET_WPA_IE			69
 	uint32_t	subtype;
@@ -205,7 +218,7 @@
 
 /* possible values for command IPW_CMD_SET_POWER_MODE */
 #define IPW_POWER_MODE_CAM	0
-#define IPW_POWER_AUTOMATIC	6
+#define IPW_POWER_MODE_AUTO	6
 
 /* possible values for command IPW_CMD_SET_MODE */
 #define IPW_MODE_BSS		0
@@ -242,6 +255,7 @@
 struct ipw_scan_options {
 	uint32_t	flags;
 #define IPW_SCAN_DO_NOT_ASSOCIATE	0x00000001
+#define IPW_SCAN_MIXED_CELL		0x00000002
 #define IPW_SCAN_PASSIVE		0x00000008
 	uint32_t	channels;
 } __packed;

==== //depot/projects/wifi/sys/dev/ipw/if_ipwvar.h#9 (text+ko) ====

@@ -87,12 +87,13 @@
 	struct task			sc_init_task;
 	struct task			sc_scan_task;
 	struct task			sc_assoc_task;
+	struct callout			sc_wdtimer;	/* watchdog timer */
 
 	uint32_t			flags;
 #define IPW_FLAG_FW_INITED		(1 << 0)
 #define IPW_FLAG_INIT_LOCKED		(1 << 1)
 #define IPW_FLAG_HAS_RADIO_SWITCH	(1 << 2)
-#define	IPW_FLAG_FW_WARNED		(1 << 3)
+#define	IPW_FLAG_HACK			(1 << 3)
 #define	IPW_FLAG_SCANNING		(1 << 4)
 #define	IPW_FLAG_ENABLED		(1 << 5)
 #define	IPW_FLAG_BUSY			(1 << 6)
@@ -108,6 +109,7 @@
 	const struct firmware		*sc_firmware;
 
 	int				sc_tx_timer;
+	int				sc_scan_timer;
 
 	bus_dma_tag_t			tbd_dmat;
 	bus_dma_tag_t			rbd_dmat;

From owner-p4-projects@FreeBSD.ORG  Sun Sep 30 13:33:05 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8B3B116A41B; Sun, 30 Sep 2007 13:33:05 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A20E16A419
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 13:33:05 +0000 (UTC)
	(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 33F8313C478
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 13:33:05 +0000 (UTC)
	(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8UDX5oB096387
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 13:33:05 GMT
	(envelope-from marius@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8UDX4nt096384
	for perforce@freebsd.org; Sun, 30 Sep 2007 13:33:04 GMT
	(envelope-from marius@freebsd.org)
Date: Sun, 30 Sep 2007 13:33:04 GMT
Message-Id: <200709301333.l8UDX4nt096384@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marius@freebsd.org using -f
From: Marius Strobl <marius@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127020 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Sep 2007 13:33:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=127020

Change 127020 by marius@flak on 2007/09/30 13:32:36

	IFC @127017 in order to obtain support for PCI domains.

Affected files ...

.. //depot/projects/usiii/amd64/amd64/legacy.c#2 integrate
.. //depot/projects/usiii/amd64/include/legacyvar.h#2 integrate
.. //depot/projects/usiii/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/usiii/arm/arm/locore.S#2 integrate
.. //depot/projects/usiii/arm/conf/AVILA#2 integrate
.. //depot/projects/usiii/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/usiii/arm/xscale/i8134x/i81342_pci.c#2 integrate
.. //depot/projects/usiii/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/usiii/arm/xscale/ixp425/ixp425_npe.c#2 integrate
.. //depot/projects/usiii/arm/xscale/ixp425/ixp425_npevar.h#2 integrate
.. //depot/projects/usiii/arm/xscale/ixp425/ixp425_pci.c#2 integrate
.. //depot/projects/usiii/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch
.. //depot/projects/usiii/contrib/dev/npe/LICENSE#1 branch
.. //depot/projects/usiii/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/usiii/dev/acpica/acpi_pcib_acpi.c#2 integrate
.. //depot/projects/usiii/dev/bge/if_bge.c#3 integrate
.. //depot/projects/usiii/dev/cardbus/cardbus.c#2 integrate
.. //depot/projects/usiii/dev/pccbb/pccbb.c#2 integrate
.. //depot/projects/usiii/dev/pccbb/pccbb_pci.c#2 integrate
.. //depot/projects/usiii/dev/pccbb/pccbbvar.h#2 integrate
.. //depot/projects/usiii/dev/pci/pci.c#3 integrate
.. //depot/projects/usiii/dev/pci/pci_pci.c#2 integrate
.. //depot/projects/usiii/dev/pci/pci_private.h#2 integrate
.. //depot/projects/usiii/dev/pci/pci_user.c#2 integrate
.. //depot/projects/usiii/dev/pci/pcib_private.h#2 integrate
.. //depot/projects/usiii/dev/pci/pcivar.h#3 integrate
.. //depot/projects/usiii/geom/geom_event.c#2 integrate
.. //depot/projects/usiii/i386/i386/legacy.c#2 integrate
.. //depot/projects/usiii/i386/include/legacyvar.h#2 integrate
.. //depot/projects/usiii/i386/pci/pci_bus.c#2 integrate
.. //depot/projects/usiii/kern/sched_ule.c#3 integrate
.. //depot/projects/usiii/netinet/ip_fw2.c#3 integrate
.. //depot/projects/usiii/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/usiii/powerpc/powermac/uninorth.c#2 integrate
.. //depot/projects/usiii/sparc64/pci/apb.c#2 integrate
.. //depot/projects/usiii/sparc64/pci/ofw_pcibus.c#4 integrate
.. //depot/projects/usiii/sparc64/pci/psycho.c#4 integrate
.. //depot/projects/usiii/sun4v/sun4v/hv_pci.c#2 integrate
.. //depot/projects/usiii/sys/param.h#2 integrate
.. //depot/projects/usiii/sys/pciio.h#2 integrate
.. //depot/projects/usiii/vm/vm_object.c#3 integrate
.. //depot/projects/usiii/vm/vm_page.c#3 integrate
.. //depot/projects/usiii/vm/vm_page.h#3 integrate

Differences ...

==== //depot/projects/usiii/amd64/amd64/legacy.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.60 2007/03/20 20:21:44 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.61 2007/09/30 11:05:13 marius Exp $");
 
 /*
  * This code implements a system driver for legacy systems that do not
@@ -207,6 +207,9 @@
 	struct legacy_device *atdev = DEVTOAT(child);
 
 	switch (which) {
+	case LEGACY_IVAR_PCIDOMAIN:
+		*result = 0;
+		break;
 	case LEGACY_IVAR_PCIBUS:
 		*result = atdev->lg_pcibus;
 		break;
@@ -223,6 +226,8 @@
 	struct legacy_device *atdev = DEVTOAT(child);
 
 	switch (which) {
+	case LEGACY_IVAR_PCIDOMAIN:
+		return EINVAL;
 	case LEGACY_IVAR_PCIBUS:
 		atdev->lg_pcibus = value;
 		break;

==== //depot/projects/usiii/amd64/include/legacyvar.h#2 (text+ko) ====

@@ -23,19 +23,21 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.7 2005/09/18 01:42:43 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.8 2007/09/30 11:05:13 marius Exp $
  */
 
 #ifndef _MACHINE_LEGACYVAR_H_
 #define	_MACHINE_LEGACYVAR_H_
 
 enum legacy_device_ivars {
+	LEGACY_IVAR_PCIDOMAIN,
 	LEGACY_IVAR_PCIBUS
 };
 
 #define LEGACY_ACCESSOR(var, ivar, type)				\
     __BUS_ACCESSOR(legacy, var, LEGACY, ivar, type)
 
+LEGACY_ACCESSOR(pcidomain,		PCIDOMAIN,	uint32_t)
 LEGACY_ACCESSOR(pcibus,			PCIBUS,		uint32_t)
 
 #undef LEGACY_ACCESSOR

==== //depot/projects/usiii/amd64/pci/pci_bus.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.121 2007/05/02 17:50:34 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.122 2007/09/30 11:05:13 marius Exp $");
 
 #include "opt_cpu.h"
 
@@ -276,6 +276,9 @@
 {
 
 	switch (which) {
+	case  PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return 0;
 	case  PCIB_IVAR_BUS:
 		*result = legacy_get_pcibus(dev);
 		return 0;
@@ -289,6 +292,8 @@
 {
 
 	switch (which) {
+	case  PCIB_IVAR_DOMAIN:
+		return EINVAL;
 	case  PCIB_IVAR_BUS:
 		legacy_set_pcibus(dev, value);
 		return 0;

==== //depot/projects/usiii/arm/arm/locore.S#2 (text+ko) ====

@@ -37,7 +37,7 @@
 #include <machine/asm.h>
 #include <machine/armreg.h>
 #include <machine/pte.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.16 2007/02/26 02:03:48 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.17 2007/09/27 20:52:17 cognet Exp $");
 
 /* What size should this really be ? It is only used by initarm() */
 #define INIT_ARM_STACK_SIZE	2048
@@ -134,7 +134,7 @@
 	adds	r1, r1, #-1
 	bhi	2b
 3:
-	ldmia	r4!, {r1,r2,r3}   /* # of sections, PA|attr, VA */
+	ldmia	r4!, {r1,r2,r3}   /* # of sections, VA, PA|attr */
 	cmp	r1, #0
 	adrne	r5, 2b
 	bicne	r5, r5, #0xff000000

==== //depot/projects/usiii/arm/conf/AVILA#2 (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/arm/conf/AVILA,v 1.4 2007/05/24 16:27:48 sam Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.6 2007/09/27 22:39:49 cognet Exp $
 
 machine		arm
 ident		AVILA
@@ -104,8 +104,8 @@
 device		avila_ata	# Gateworks CF/IDE support
 
 device		npe		# Network Processing Engine
-device		npe_fw		# NPE firmware
-device		firmware	# firmware support for npe_fw
+device		npe_fw
+device		firmware
 device		qmgr		# Q Manager (required by npe)
 device		miibus		# NB: required by npe
 device		ether

==== //depot/projects/usiii/arm/xscale/i80321/i80321_pci.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.11 2007/07/27 14:53:42 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.12 2007/09/30 11:05:13 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -250,8 +250,10 @@
 {
 	struct i80321_pci_softc *sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
-
 		*result = sc->sc_busno;
 		return (0);
 		
@@ -265,6 +267,8 @@
 	struct i80321_pci_softc * sc = device_get_softc(dev);
 
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_busno = result;
 		return (0);

==== //depot/projects/usiii/arm/xscale/i8134x/i81342_pci.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -481,8 +481,10 @@
 {
 	struct i81342_pci_softc *sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
-
 		*result = sc->sc_busno;
 		return (0);
 		
@@ -496,6 +498,8 @@
 	struct i81342_pci_softc * sc = device_get_softc(dev);
 
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_busno = result;
 		return (0);

==== //depot/projects/usiii/arm/xscale/ixp425/files.ixp425#2 (text+ko) ====

@@ -1,4 +1,4 @@
-#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.2 2006/12/07 00:49:33 sam Exp $
+#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.4 2007/09/27 22:39:49 cognet Exp $
 arm/arm/cpufunc_asm_xscale.S		standard
 arm/arm/irq_dispatch.S			standard
 arm/xscale/ixp425/ixp425.c		standard
@@ -16,12 +16,7 @@
 arm/xscale/ixp425/ixp425_a4x_io.S	optional	uart
 dev/uart/uart_dev_ns8250.c		optional	uart
 #
-# NPE-based Ethernet support (requires qmgr also).  Note the
-# firmware images must be downloaded from the Intel web site.
-# The URL seems to change frequently; try this as a starting
-# place:
-#
-# http://www.intel.com/design/network/products/npfamily/download_ixp400.htm
+# NPE-based Ethernet support (requires qmgr also).
 #
 arm/xscale/ixp425/if_npe.c		optional npe
 arm/xscale/ixp425/ixp425_npe.c		optional npe
@@ -41,7 +36,7 @@
 	clean		"IxNpeMicrocode.fwo"
 IxNpeMicrocode.dat			optional npe_fw			\
 	dependency	".PHONY"					\
-	compile-with	"if [ -e $S/arm/xscale/ixp425/IxNpeMicrocode.dat ]; then ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat .; else echo 'WARNING, no IxNpeMicrocode.dat file; you must obtain this from the Intel web site'; false; fi" \
+	compile-with	"uudecode < $S/contrib/dev/npe/IxNpeMicrocode.dat.uu" \
 	no-obj no-implicit-rule						\
 	clean		"IxNpeMicrocode.dat"
 #

==== //depot/projects/usiii/arm/xscale/ixp425/ixp425_npe.c#2 (text+ko) ====

@@ -57,7 +57,7 @@
  * SUCH DAMAGE.
 */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.6 2007/05/24 16:31:22 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.8 2007/09/27 22:39:49 cognet Exp $");
 
 /*
  * Intel XScale Network Processing Engine (NPE) support.

==== //depot/projects/usiii/arm/xscale/ixp425/ixp425_npevar.h#2 (text+ko) ====

@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npevar.h,v 1.2 2007/05/24 16:31:22 sam Exp $
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npevar.h,v 1.4 2007/09/27 22:39:49 cognet Exp $
  */
 
 #ifndef _IXP425_NPEVAR_H_

==== //depot/projects/usiii/arm/xscale/ixp425/ixp425_pci.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.4 2007/03/06 10:58:22 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.5 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -229,6 +229,9 @@
 
 	sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
 		*result = sc->sc_bus;
 		return (0);
@@ -244,6 +247,8 @@
 
 	sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_bus = value;
 		return (0);

==== //depot/projects/usiii/dev/acpica/acpi_pci.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.30 2006/05/11 22:13:20 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.31 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -275,17 +275,19 @@
 static int
 acpi_pci_attach(device_t dev)
 {
-	int busno;
+	int busno, domain;
 
 	/*
 	 * Since there can be multiple independantly numbered PCI
 	 * busses on systems with multiple PCI domains, we can't use
 	 * the unit number to decide which bus we are probing. We ask
-	 * the parent pcib what our bus number is.
+	 * the parent pcib what our domain and bus numbers are.
 	 */
+	domain = pcib_get_domain(dev);
 	busno = pcib_get_bus(dev);
 	if (bootverbose)
-		device_printf(dev, "physical bus=%d\n", busno);
+		device_printf(dev, "domain=%d, physical bus=%d\n",
+		    domain, busno);
 
 	/*
 	 * First, PCI devices are added as in the normal PCI bus driver.
@@ -297,7 +299,7 @@
 	 * pci_add_children() doesn't find.  We currently just ignore
 	 * these devices.
 	 */
-	pci_add_children(dev, busno, sizeof(struct acpi_pci_devinfo));
+	pci_add_children(dev, domain, busno, sizeof(struct acpi_pci_devinfo));
 	AcpiWalkNamespace(ACPI_TYPE_DEVICE, acpi_get_handle(dev), 1,
 	    acpi_pci_save_handle, dev, NULL);
 

==== //depot/projects/usiii/dev/acpica/acpi_pcib_acpi.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.54 2007/05/02 17:50:35 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.55 2007/09/30 11:05:14 marius Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -259,6 +259,9 @@
     struct acpi_hpcib_softc	*sc = device_get_softc(dev);
 
     switch (which) {
+    case PCIB_IVAR_DOMAIN:
+	*result = 0;
+	return (0);
     case PCIB_IVAR_BUS:
 	*result = sc->ap_bus;
 	return (0);
@@ -278,6 +281,8 @@
     struct acpi_hpcib_softc	*sc = device_get_softc(dev);
 
     switch (which) {
+    case PCIB_IVAR_DOMAIN:
+	return (EINVAL);
     case PCIB_IVAR_BUS:
 	sc->ap_bus = value;
 	return (0);

==== //depot/projects/usiii/dev/bge/if_bge.c#3 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.197 2007/06/04 18:25:03 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.198 2007/09/30 11:05:14 marius Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -2180,16 +2180,15 @@
 static int
 bge_has_multiple_ports(struct bge_softc *sc)
 {
-	device_t dev, p;
-	u_int b, s, f, fscan;
+	device_t dev = sc->bge_dev;
+	u_int b, d, f, fscan, s;
 
-	dev = sc->bge_dev;
-	p = device_get_parent(device_get_parent(dev));
+	d = pci_get_domain(dev);
 	b = pci_get_bus(dev);
 	s = pci_get_slot(dev);
 	f = pci_get_function(dev);
 	for (fscan = 0; fscan <= PCI_FUNCMAX; fscan++)
-		if (fscan != f && pci_find_pbsf(p, b, s, fscan) != NULL)
+		if (fscan != f && pci_find_dbsf(d, b, s, fscan) != NULL)
 			return (1);
 	return (0);
 }

==== //depot/projects/usiii/dev/cardbus/cardbus.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.65 2007/05/16 23:40:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.66 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -162,12 +162,13 @@
 {
 	device_t brdev = device_get_parent(cbdev);
 	device_t child;
+	int bus, domain, slot, func;
 	int cardattached = 0;
-	int bus, slot, func;
 	int cardbusfunchigh = 0;
 
 	cardbus_detach_card(cbdev); /* detach existing cards */
 	POWER_ENABLE_SOCKET(brdev, cbdev);
+	domain = pcib_get_domain(cbdev);
 	bus = pcib_get_bus(cbdev);
 	slot = 0;
 	/* For each function, set it up and try to attach a driver to it */
@@ -175,7 +176,7 @@
 		struct cardbus_devinfo *dinfo;
 
 		dinfo = (struct cardbus_devinfo *)
-		    pci_read_device(brdev, bus, slot, func,
+		    pci_read_device(brdev, domain, bus, slot, func,
 			sizeof(struct cardbus_devinfo));
 		if (dinfo == NULL)
 			continue;

==== //depot/projects/usiii/dev/pccbb/pccbb.c#2 (text+ko) ====

@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.164 2007/06/04 05:59:44 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.165 2007/09/30 11:05:15 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -1470,6 +1470,9 @@
 	struct cbb_softc *sc = device_get_softc(brdev);
 
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = sc->domain;
+		return (0);
 	case PCIB_IVAR_BUS:
 		*result = sc->secbus;
 		return (0);
@@ -1483,6 +1486,8 @@
 	struct cbb_softc *sc = device_get_softc(brdev);
 
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->secbus = value;
 		return (0);

==== //depot/projects/usiii/dev/pccbb/pccbb_pci.c#2 (text+ko) ====

@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.25 2007/06/04 05:59:44 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb_pci.c,v 1.26 2007/09/30 11:05:15 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -316,6 +316,7 @@
 	sc->dev = brdev;
 	sc->cbdev = NULL;
 	sc->exca[0].pccarddev = NULL;
+	sc->domain = pci_get_domain(brdev);
 	sc->secbus = pci_read_config(brdev, PCIR_SECBUS_2, 1);
 	sc->subbus = pci_read_config(brdev, PCIR_SUBBUS_2, 1);
 	sc->pribus = pcib_get_bus(parent);
@@ -346,6 +347,8 @@
 	/*Sysctls*/
 	sctx = device_get_sysctl_ctx(brdev);
 	soid = device_get_sysctl_tree(brdev);
+	SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "domain",
+	    CTLFLAG_RD, &sc->domain, 0, "Domain number");
 	SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "pribus",
 	    CTLFLAG_RD, &sc->pribus, 0, "Primary bus number");
 	SYSCTL_ADD_UINT(sctx, SYSCTL_CHILDREN(soid), OID_AUTO, "secbus",

==== //depot/projects/usiii/dev/pccbb/pccbbvar.h#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/sys/dev/pccbb/pccbbvar.h,v 1.31 2007/06/04 05:59:44 imp Exp $
+ * $FreeBSD: src/sys/dev/pccbb/pccbbvar.h,v 1.32 2007/09/30 11:05:15 marius Exp $
  */
 
 /*
@@ -62,6 +62,7 @@
 	void		*intrhand;
 	bus_space_tag_t bst;
 	bus_space_handle_t bsh;
+	uint32_t	domain;
 	unsigned int	pribus;
 	unsigned int	secbus;
 	unsigned int	subbus;

==== //depot/projects/usiii/dev/pci/pci.c#3 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.354 2007/07/29 02:44:41 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci.c,v 1.355 2007/09/30 11:05:15 marius Exp $");
 
 #include "opt_bus.h"
 
@@ -274,34 +274,24 @@
 SYSCTL_INT(_hw_pci, OID_AUTO, honor_msi_blacklist, CTLFLAG_RD,
     &pci_honor_msi_blacklist, 1, "Honor chipset blacklist for MSI");
 
-/* Find a device_t by bus/slot/function */
+/* Find a device_t by bus/slot/function in domain 0 */
 
 device_t
 pci_find_bsf(uint8_t bus, uint8_t slot, uint8_t func)
 {
-	struct pci_devinfo *dinfo;
 
-	STAILQ_FOREACH(dinfo, &pci_devq, pci_links) {
-		if ((dinfo->cfg.bus == bus) &&
-		    (dinfo->cfg.slot == slot) &&
-		    (dinfo->cfg.func == func)) {
-			return (dinfo->cfg.dev);
-		}
-	}
-
-	return (NULL);
+	return (pci_find_dbsf(0, bus, slot, func));
 }
 
-/* Find a device_t by pcib/bus/slot/function */
+/* Find a device_t by domain/bus/slot/function */
 
 device_t
-pci_find_pbsf(device_t pcib, uint8_t bus, uint8_t slot, uint8_t func)
+pci_find_dbsf(uint32_t domain, uint8_t bus, uint8_t slot, uint8_t func)
 {
 	struct pci_devinfo *dinfo;
 
 	STAILQ_FOREACH(dinfo, &pci_devq, pci_links) {
-		if ((device_get_parent(device_get_parent(dinfo->cfg.dev)) ==
-		    pcib) &&
+		if ((dinfo->cfg.domain == domain) &&
 		    (dinfo->cfg.bus == bus) &&
 		    (dinfo->cfg.slot == slot) &&
 		    (dinfo->cfg.func == func)) {
@@ -436,7 +426,7 @@
 
 /* read configuration header into pcicfgregs structure */
 struct pci_devinfo *
-pci_read_device(device_t pcib, int b, int s, int f, size_t size)
+pci_read_device(device_t pcib, int d, int b, int s, int f, size_t size)
 {
 #define	REG(n, w)	PCIB_READ_CONFIG(pcib, b, s, f, n, w)
 	pcicfgregs *cfg = NULL;
@@ -454,6 +444,7 @@
 
 		cfg = &devlist_entry->cfg;
 
+		cfg->domain		= d;
 		cfg->bus		= b;
 		cfg->slot		= s;
 		cfg->func		= f;
@@ -485,6 +476,7 @@
 
 		STAILQ_INSERT_TAIL(devlist_head, devlist_entry, pci_links);
 
+		devlist_entry->conf.pc_sel.pc_domain = cfg->domain;
 		devlist_entry->conf.pc_sel.pc_bus = cfg->bus;
 		devlist_entry->conf.pc_sel.pc_dev = cfg->slot;
 		devlist_entry->conf.pc_sel.pc_func = cfg->func;
@@ -571,9 +563,10 @@
 					    4);
 					if (addr != MSI_INTEL_ADDR_BASE)
 						device_printf(pcib,
-		    "HT Bridge at %d:%d:%d has non-default MSI window 0x%llx\n",
-						    cfg->bus, cfg->slot,
-						    cfg->func, (long long)addr);
+	    "HT Bridge at pci%d:%d:%d:%d has non-default MSI window 0x%llx\n",
+						    cfg->domain, cfg->bus,
+						    cfg->slot, cfg->func,
+						    (long long)addr);
 				}
 
 				/* Enable MSI -> HT mapping. */
@@ -750,9 +743,9 @@
 				if (remain > (0x7f*4 - vrs.off)) {
 					end = 1;
 					printf(
-			    "pci%d:%d:%d: invalid vpd data, remain %#x\n",
-					    cfg->bus, cfg->slot, cfg->func,
-					    remain);
+			    "pci%d:%d:%d:%d: invalid vpd data, remain %#x\n",
+					    cfg->domain, cfg->bus, cfg->slot,
+					    cfg->func, remain);
 				}
 				name = byte & 0x7f;
 			} else {
@@ -817,8 +810,10 @@
 				 * if this happens, we can't trust the rest
 				 * of the VPD.
 				 */
-				printf("pci%d:%d:%d: bad keyword length: %d\n",
-				    cfg->bus, cfg->slot, cfg->func, dflen);
+				printf(
+				    "pci%d:%d:%d:%d: bad keyword length: %d\n",
+				    cfg->domain, cfg->bus, cfg->slot,
+				    cfg->func, dflen);
 				cksumvalid = 0;
 				end = 1;
 				break;
@@ -851,9 +846,9 @@
 					cksumvalid = 1;
 				else {
 					printf(
-				    "pci%d:%d:%d: bad VPD cksum, remain %hhu\n",
-					    cfg->bus, cfg->slot, cfg->func,
-					    vrs.cksum);
+				"pci%d:%d:%d:%d: bad VPD cksum, remain %hhu\n",
+					    cfg->domain, cfg->bus, cfg->slot,
+					    cfg->func, vrs.cksum);
 					cksumvalid = 0;
 					end = 1;
 					break;
@@ -922,8 +917,9 @@
 			break;
 
 		default:
-			printf("pci%d:%d:%d: invalid state: %d\n",
-			    cfg->bus, cfg->slot, cfg->func, state);
+			printf("pci%d:%d:%d:%d: invalid state: %d\n",
+			    cfg->domain, cfg->bus, cfg->slot, cfg->func,
+			    state);
 			end = 1;
 			break;
 		}
@@ -1967,9 +1963,9 @@
 
 	if (bootverbose)
 		printf(
-		    "pci%d:%d:%d: Transition from D%d to D%d\n",
-		    dinfo->cfg.bus, dinfo->cfg.slot, dinfo->cfg.func,
-		    oldstate, state);
+		    "pci%d:%d:%d:%d: Transition from D%d to D%d\n",
+		    dinfo->cfg.domain, dinfo->cfg.bus, dinfo->cfg.slot,
+		    dinfo->cfg.func, oldstate, state);
 
 	PCI_WRITE_CONFIG(dev, child, cfg->pp.pp_status, status, 2);
 	if (delay)
@@ -2125,8 +2121,8 @@
 
 		printf("found->\tvendor=0x%04x, dev=0x%04x, revid=0x%02x\n",
 		    cfg->vendor, cfg->device, cfg->revid);
-		printf("\tbus=%d, slot=%d, func=%d\n",
-		    cfg->bus, cfg->slot, cfg->func);
+		printf("\tdomain=%d, bus=%d, slot=%d, func=%d\n",
+		    cfg->domain, cfg->bus, cfg->slot, cfg->func);
 		printf("\tclass=%02x-%02x-%02x, hdrtype=0x%02x, mfdev=%d\n",
 		    cfg->baseclass, cfg->subclass, cfg->progif, cfg->hdrtype,
 		    cfg->mfdev);
@@ -2263,7 +2259,8 @@
 		return (barlen);
 	if ((u_long)base != base) {
 		device_printf(bus,
-		    "pci%d:%d:%d bar %#x too many address bits", b, s, f, reg);
+		    "pci%d:%d:%d:%d bar %#x too many address bits",
+		    pci_get_domain(dev), b, s, f, reg);
 		return (barlen);
 	}
 
@@ -2315,8 +2312,8 @@
 	if ((u_long)start != start) {
 		/* Wait a minute!  this platform can't do this address. */
 		device_printf(bus,
-		    "pci%d.%d.%x bar %#x start %#jx, too many bits.",
-		    b, s, f, reg, (uintmax_t)start);
+		    "pci%d:%d.%d.%x bar %#x start %#jx, too many bits.",
+		    pci_get_domain(dev), b, s, f, reg, (uintmax_t)start);
 		resource_list_release(rl, bus, dev, type, reg, res);
 		return (barlen);
 	}
@@ -2401,8 +2398,9 @@
 
 	/* Let the user override the IRQ with a tunable. */
 	irq = PCI_INVALID_IRQ;
-	snprintf(tunable_name, sizeof(tunable_name), "hw.pci%d.%d.INT%c.irq",
-	    cfg->bus, cfg->slot, cfg->intpin + 'A' - 1);
+	snprintf(tunable_name, sizeof(tunable_name),
+	    "hw.pci%d.%d.%d.INT%c.irq",
+	    cfg->domain, cfg->bus, cfg->slot, cfg->intpin + 'A' - 1);
 	if (TUNABLE_INT_FETCH(tunable_name, &irq) && (irq >= 255 || irq <= 0))
 		irq = PCI_INVALID_IRQ;
 
@@ -2488,7 +2486,7 @@
 }
 
 void
-pci_add_children(device_t dev, int busno, size_t dinfo_size)
+pci_add_children(device_t dev, int domain, int busno, size_t dinfo_size)
 {
 #define	REG(n, w)	PCIB_READ_CONFIG(pcib, busno, s, f, n, w)
 	device_t pcib = device_get_parent(dev);
@@ -2510,7 +2508,8 @@
 		if (hdrtype & PCIM_MFDEV)
 			pcifunchigh = PCI_FUNCMAX;
 		for (f = 0; f <= pcifunchigh; f++) {
-			dinfo = pci_read_device(pcib, busno, s, f, dinfo_size);
+			dinfo = pci_read_device(pcib, domain, busno, s, f,
+			    dinfo_size);
 			if (dinfo != NULL) {
 				pci_add_child(dev, dinfo);
 			}
@@ -2544,19 +2543,21 @@
 static int
 pci_attach(device_t dev)
 {
-	int busno;
+	int busno, domain;
 
 	/*
 	 * Since there can be multiple independantly numbered PCI
 	 * busses on systems with multiple PCI domains, we can't use
 	 * the unit number to decide which bus we are probing. We ask
-	 * the parent pcib what our bus number is.
+	 * the parent pcib what our domain and bus numbers are.
 	 */
+	domain = pcib_get_domain(dev);
 	busno = pcib_get_bus(dev);
 	if (bootverbose)
-		device_printf(dev, "physical bus=%d\n", busno);
+		device_printf(dev, "domain=%d, physical bus=%d\n",
+		    domain, busno);
 
-	pci_add_children(dev, busno, sizeof(struct pci_devinfo));
+	pci_add_children(dev, domain, busno, sizeof(struct pci_devinfo));
 
 	return (bus_generic_attach(dev));
 }
@@ -2679,8 +2680,9 @@
 		dinfo = device_get_ivars(child);
 		pci_print_verbose(dinfo);
 		if (bootverbose)
-			printf("pci%d:%d:%d: reprobing on driver added\n",
-			    dinfo->cfg.bus, dinfo->cfg.slot, dinfo->cfg.func);
+			printf("pci%d:%d:%d:%d: reprobing on driver added\n",
+			    dinfo->cfg.domain, dinfo->cfg.bus, dinfo->cfg.slot,
+			    dinfo->cfg.func);
 		pci_cfg_restore(child, dinfo);
 		if (device_probe_and_attach(child) != 0)
 			pci_cfg_save(child, dinfo, 1);
@@ -3146,6 +3148,9 @@
 	case PCI_IVAR_IRQ:
 		*result = cfg->intline;
 		break;
+	case PCI_IVAR_DOMAIN:
+		*result = cfg->domain;
+		break;
 	case PCI_IVAR_BUS:
 		*result = cfg->bus;
 		break;
@@ -3198,6 +3203,7 @@
 	case PCI_IVAR_PROGIF:
 	case PCI_IVAR_REVID:
 	case PCI_IVAR_IRQ:
+	case PCI_IVAR_DOMAIN:
 	case PCI_IVAR_BUS:
 	case PCI_IVAR_SLOT:
 	case PCI_IVAR_FUNCTION:
@@ -3244,12 +3250,12 @@
 			name = device_get_name(dinfo->cfg.dev);
 
 		p = &dinfo->conf;
-		db_printf("%s%d@pci%d:%d:%d:\tclass=0x%06x card=0x%08x "
+		db_printf("%s%d@pci%d:%d:%d:%d:\tclass=0x%06x card=0x%08x "
 			"chip=0x%08x rev=0x%02x hdr=0x%02x\n",
 			(name && *name) ? name : "none",
 			(name && *name) ? (int)device_get_unit(dinfo->cfg.dev) :
 			none_count++,
-			p->pc_sel.pc_bus, p->pc_sel.pc_dev,
+			p->pc_sel.pc_domain, p->pc_sel.pc_bus, p->pc_sel.pc_dev,
 			p->pc_sel.pc_func, (p->pc_class << 16) |
 			(p->pc_subclass << 8) | p->pc_progif,
 			(p->pc_subdevice << 16) | p->pc_subvendor,

==== //depot/projects/usiii/dev/pci/pci_pci.c#2 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.49 2007/05/23 15:31:00 gallatin Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci_pci.c,v 1.50 2007/09/30 11:05:15 marius Exp $");
 
 /*
  * PCI:PCI bridge support.
@@ -147,6 +147,7 @@
      * Get current bridge configuration.
      */
     sc->command   = pci_read_config(dev, PCIR_COMMAND, 1);
+    sc->domain    = pci_get_domain(dev);
     sc->secbus    = pci_read_config(dev, PCIR_SECBUS_1, 1);
     sc->subbus    = pci_read_config(dev, PCIR_SUBBUS_1, 1);
     sc->secstat   = pci_read_config(dev, PCIR_SECSTAT_1, 2);
@@ -257,6 +258,7 @@
 	sc->flags |= PCIB_SUBTRACTIVE;
 	
     if (bootverbose) {
+	device_printf(dev, "  domain            %d\n", sc->domain);
 	device_printf(dev, "  secondary bus     %d\n", sc->secbus);
 	device_printf(dev, "  subordinate bus   %d\n", sc->subbus);
 	device_printf(dev, "  I/O decode        0x%x-0x%x\n", sc->iobase, sc->iolimit);
@@ -309,6 +311,9 @@
     struct pcib_softc	*sc = device_get_softc(dev);
     
     switch (which) {
+    case PCIB_IVAR_DOMAIN:
+	*result = sc->domain;
+	return(0);
     case PCIB_IVAR_BUS:
 	*result = sc->secbus;
 	return(0);
@@ -322,9 +327,11 @@
     struct pcib_softc	*sc = device_get_softc(dev);
 
     switch (which) {
+    case PCIB_IVAR_DOMAIN:
+	return(EINVAL);
     case PCIB_IVAR_BUS:
 	sc->secbus = value;
-	break;
+	return(0);
     }
     return(ENOENT);
 }

==== //depot/projects/usiii/dev/pci/pci_private.h#2 (text+ko) ====

@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/pci/pci_private.h,v 1.24 2007/05/16 18:41:42 imp Exp $
+ * $FreeBSD: src/sys/dev/pci/pci_private.h,v 1.25 2007/09/30 11:05:15 marius Exp $
  *
  */
 
@@ -38,7 +38,8 @@
  */
 DECLARE_CLASS(pci_driver);
 
-void		pci_add_children(device_t dev, int busno, size_t dinfo_size);
+void		pci_add_children(device_t dev, int domain, int busno,
+		    size_t dinfo_size);
 void		pci_add_child(device_t bus, struct pci_devinfo *dinfo);
 void		pci_add_resources(device_t bus, device_t dev, int force,
 		    uint32_t prefetchmask);
@@ -84,7 +85,7 @@
 void		pci_delete_resource(device_t dev, device_t child, 
 		    int type, int rid);
 struct resource_list *pci_get_resource_list (device_t dev, device_t child);
-struct pci_devinfo *pci_read_device(device_t pcib, int b, int s, int f,
+struct pci_devinfo *pci_read_device(device_t pcib, int d, int b, int s, int f,
 		    size_t size);
 void		pci_print_verbose(struct pci_devinfo *dinfo);
 int		pci_freecfg(struct pci_devinfo *dinfo);

==== //depot/projects/usiii/dev/pci/pci_user.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pci/pci_user.c,v 1.21 2006/10/06 14:31:32 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/pci/pci_user.c,v 1.22 2007/09/30 11:05:15 marius Exp $");
 
 #include "opt_bus.h"	/* XXX trim includes */
 #include "opt_compat.h"
@@ -125,6 +125,11 @@
 		 * comparison.  If the comparison fails, we don't have a
 		 * match, go on to the next item if there is one.
 		 */
+		if (((matches[i].flags & PCI_GETCONF_MATCH_DOMAIN) != 0)
+		 && (match_buf->pc_sel.pc_domain !=
+		 matches[i].pc_sel.pc_domain))
+			continue;
+
 		if (((matches[i].flags & PCI_GETCONF_MATCH_BUS) != 0)
 		 && (match_buf->pc_sel.pc_bus != matches[i].pc_sel.pc_bus))
 			continue;
@@ -388,8 +393,9 @@
 			 * Look up the grandparent, i.e. the bridge device,
 			 * so that we can issue configuration space cycles.
 			 */
-			pcidev = pci_find_bsf(io->pi_sel.pc_bus,
-			    io->pi_sel.pc_dev, io->pi_sel.pc_func);
+			pcidev = pci_find_dbsf(io->pi_sel.pc_domain,
+			    io->pi_sel.pc_bus, io->pi_sel.pc_dev,
+			    io->pi_sel.pc_func);
 			if (pcidev) {
 				device_t busdev, brdev;
 

==== //depot/projects/usiii/dev/pci/pcib_private.h#2 (text+ko) ====

@@ -27,7 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.12 2007/05/02 17:50:35 jhb Exp $
+ * $FreeBSD: src/sys/dev/pci/pcib_private.h,v 1.13 2007/09/30 11:05:15 marius Exp $
  */
 
 #ifndef __PCIB_PRIVATE_H__
@@ -48,6 +48,7 @@
 #define	PCIB_SUBTRACTIVE	0x1
 #define	PCIB_DISABLE_MSI	0x2
     uint16_t	command;	/* command register */
+    uint32_t	domain;		/* domain number */
     uint8_t	secbus;		/* secondary bus number */
     uint8_t	subbus;		/* subordinate bus number */
     pci_addr_t	pmembase;	/* base address of prefetchable memory */

==== //depot/projects/usiii/dev/pci/pcivar.h#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.79 2007/05/02 17:50:35 jhb Exp $
+ * $FreeBSD: src/sys/dev/pci/pcivar.h,v 1.80 2007/09/30 11:05:15 marius Exp $
  *
  */
 
@@ -34,6 +34,7 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sun Sep 30 13:43:17 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3351316A421; Sun, 30 Sep 2007 13:43:17 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B552616A41B
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 13:43:16 +0000 (UTC)
	(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B012013C478
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 13:43:16 +0000 (UTC)
	(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8UDhGXp096892
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 13:43:16 GMT
	(envelope-from marius@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8UDhGBc096889
	for perforce@freebsd.org; Sun, 30 Sep 2007 13:43:16 GMT
	(envelope-from marius@freebsd.org)
Date: Sun, 30 Sep 2007 13:43:16 GMT
Message-Id: <200709301343.l8UDhGBc096889@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	marius@freebsd.org using -f
From: Marius Strobl <marius@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127021 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Sep 2007 13:43:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=127021

Change 127021 by marius@flak on 2007/09/30 13:42:15

	- Take advantage of DEFINE_CLASS_0.
	- Use PCI domains (mandatory for Tomatillos, see comment in
	  schizo_attach()).

Affected files ...

.. //depot/projects/usiii/sparc64/pci/schizo.c#3 edit

Differences ...

==== //depot/projects/usiii/sparc64/pci/schizo.c#3 (text+ko) ====

@@ -156,15 +156,11 @@
 	{ 0, 0 }
 };
 
-static driver_t schizo_driver = {
-	"pcib",
-	schizo_methods,
-	sizeof(struct schizo_softc),
-};
+static devclass_t schizo_devclass;
 
-static devclass_t pcib_devclass;
-
-DRIVER_MODULE(schizo, nexus, schizo_driver, pcib_devclass, 0, 0);
+DEFINE_CLASS_0(pcib, schizo_driver, schizo_methods,
+    sizeof(struct schizo_softc));
+DRIVER_MODULE(schizo, nexus, schizo_driver, schizo_devclass, 0, 0);
 
 static SLIST_HEAD(, schizo_softc) schizo_softcs =
     SLIST_HEAD_INITIALIZER(schizo_softcs);
@@ -893,6 +889,9 @@
 
 	sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = device_get_unit(dev);
+		return (0);
 	case PCIB_IVAR_BUS:
 		*result = sc->sc_pci_secbus;
 		return (0);

From owner-p4-projects@FreeBSD.ORG  Sun Sep 30 15:42:30 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3F7FF16A420; Sun, 30 Sep 2007 15:42:30 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E9DCA16A417
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 15:42:29 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id E099313C447
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 15:42:29 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8UFgT6V005235
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 15:42:29 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8UFgTPV005232
	for perforce@freebsd.org; Sun, 30 Sep 2007 15:42:29 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 30 Sep 2007 15:42:29 GMT
Message-Id: <200709301542.l8UFgTPV005232@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127023 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Sep 2007 15:42:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=127023

Change 127023 by hselasky@hselasky_laptop001 on 2007/09/30 15:42:01

	
	Store "use_polling" flag on the stack so that we don't
	access anything in the "xfer" structure in case the
	USB transfer should be cancelled.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ehci.c#40 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/ehci.c#40 (text+ko) ====

@@ -3326,6 +3326,7 @@
 	u_int16_t value;
 	u_int16_t index;
 	u_int8_t l;
+	uint8_t use_polling;
 
 	mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
 
@@ -3344,6 +3345,8 @@
 	value = UGETW(std->req.wValue);
 	index = UGETW(std->req.wIndex);
 
+	use_polling = xfer->flags.use_polling;
+
 	DPRINTFN(2,("type=0x%02x request=0x%02x wLen=0x%04x "
 		    "wValue=0x%04x wIndex=0x%04x\n",
 		    std->req.bmRequestType, std->req.bRequest,
@@ -3634,7 +3637,7 @@
 			v &= ~ (EHCI_PS_PE | EHCI_PS_PR);
 			EOWRITE4(sc, port, v | EHCI_PS_PR);
 
-			if (xfer->flags.use_polling) {
+			if (use_polling) {
 			    /* polling */
 			    DELAY(USB_PORT_ROOT_RESET_DELAY * 1000);
 			} else {
@@ -3647,7 +3650,7 @@
 			/* Terminate reset sequence. */
 			EOWRITE4(sc, port, v);
 
-			if (xfer->flags.use_polling) {
+			if (use_polling) {
 			    /* polling */
 			    DELAY(EHCI_PORT_RESET_COMPLETE * 1000);
 			} else {

From owner-p4-projects@FreeBSD.ORG  Sun Sep 30 15:45:34 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 87D4D16A46B; Sun, 30 Sep 2007 15:45:34 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1A7CD16A420
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 15:45:34 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1188013C46E
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 15:45:34 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8UFjYbr005349
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 15:45:34 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8UFjXpi005346
	for perforce@freebsd.org; Sun, 30 Sep 2007 15:45:33 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 30 Sep 2007 15:45:33 GMT
Message-Id: <200709301545.l8UFjXpi005346@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127024 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Sep 2007 15:45:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=127024

Change 127024 by hselasky@hselasky_laptop001 on 2007/09/30 15:44:38

	
	1) Fix a small bug where the system would continue
	   to scan the TD's even if the last one was stalled.
	
	2) Optimise: Setting up the "td" variable two times
	   in a row for non-isoc transfers does not make sense.
	
	3) Add a comment.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/uhci.c#32 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/uhci.c#32 (text+ko) ====

@@ -1145,6 +1145,8 @@
 	    }
 
 	    if (status & UHCI_TD_STALLED) {
+		/* the transfer is finished */
+	        td = NULL;
 	        break;
 	    }
 
@@ -1340,12 +1342,12 @@
 
 	DPRINTFN(15, ("xfer=%p checking transfer\n", xfer));
 
-	td = xfer->td_transfer_last;
-
 	if(xfer->pipe->methods == &uhci_device_isoc_methods)
 	{
 		/* isochronous transfer */
 
+		td = xfer->td_transfer_last;
+
 		usbd_page_dma_exit(td->page);
 		status = le32toh(td->td_status);
 		usbd_page_dma_enter(td->page);
@@ -1669,6 +1671,8 @@
 	len_old = temp->len;
 	precompute = 1;
 
+	/* software is used to detect short incoming transfers */
+
 	if ((temp->td_token & htole32(UHCI_TD_PID)) == htole32(UHCI_TD_PID_IN)) {
 	    temp->td_status |= htole32(UHCI_TD_SPD);
 	} else {

From owner-p4-projects@FreeBSD.ORG  Sun Sep 30 21:21:49 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A799216A419; Sun, 30 Sep 2007 21:21:49 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3A2A216A417
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 21:21:49 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1317213C44B
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 21:21:49 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8ULLm7H051540
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 21:21:49 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8ULLm4a051537
	for perforce@freebsd.org; Sun, 30 Sep 2007 21:21:48 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sun, 30 Sep 2007 21:21:48 GMT
Message-Id: <200709302121.l8ULLm4a051537@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127040 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Sep 2007 21:21:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=127040

Change 127040 by pgj@disznohal on 2007/09/30 21:21:46

	Add initial Hungarian translation of (the apparently unfinished) Chapter
	21: Virtualization.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/virtualization/chapter.sgml#2 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/virtualization/chapter.sgml#2 (text+ko) ====

@@ -3,97 +3,124 @@
 
      $FreeBSD: doc/en_US.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.10 2007/04/29 12:11:48 brueffer Exp $
 -->
+<!--
+     The FreeBSD Hungarian Documentation Project
+     Translated by: PALI, Gabor <pgj@FreeBSD.org>
+     Original Revision: 1.10                      -->
 
-<chapter id="virtualization">
+<chapter id="virtualization" lang="hu">
   <chapterinfo>
     <authorgroup>
       <author>
         <firstname>Murray</firstname>
 	<surname>Stokely</surname>
-	<contrib>Contributed by </contrib>
+	<contrib>&Iacute;rta: </contrib>
       </author>
     </authorgroup>
     <!-- Mar 2007 -->
   </chapterinfo>
 
-  <title>Virtualization</title>
-  
+  <title>Virtualiz&aacute;ci&oacute;</title>
+
   <sect1 id="virtualization-synopsis">
-    <title>Synopsis</title>
-    
-    <para>Virtualization software allows multiple operating systems
-      to run simultaneously on the same computer.  Such software
-      systems for PCs often involve a host operating system which runs
-      the virtualization software and supports any number of guest
-      operating systems.</para>
-    
-    <para>After reading this chapter, you will know:</para>
+    <title>&Aacute;ttekint&eacute;s</title>
+
+    <para>A virtualiz&aacute;ci&oacute;s szoftverek lehet&#245;v&eacute;
+      teszik, hogy ugyanazon a sz&aacute;m&iacute;t&oacute;g&eacute;pen
+      egyszerre t&ouml;bb oper&aacute;ci&oacute;s rendszert is
+      futassunk.  Ezeknek a programcsomagoknak gyakorta
+      r&eacute;sz&uuml;k egy gazda oper&aacute;ci&oacute;s rendszer is,
+      amely a virtualiz&aacute;ci&oacute;s szoftvert futattja &eacute;s
+      ismer bizonyos vend&eacute;g oper&aacute;ci&oacute;s rendszereket.
+
+    <para>A fejezet elolvas&aacute;sa sor&aacute;n
+      megismerj&uuml;k:</para>
 
     <itemizedlist>
       <listitem>
-	<para>The difference between a host operating system and a
-	  guest operating system.</para>
+	<para>a gazda- &eacute;s a vend&eacute;g oper&aacute;ci&oacute;s
+	  rendszerek k&ouml;zti k&uuml;l&ouml;nbs&eacute;geket.</para>
       </listitem>
 
       <listitem>
-	<para>How to install FreeBSD on Linux with <application>&xen;</application>.</para>
+	<para>hogyan telep&iacute;ts&uuml;nk &os;-t &linux;-ra a
+	  <application>&xen;</application>
+	  haszn&aacute;lat&aacute;val.</para>
       </listitem>
 
       <listitem>
-	<para>How to install FreeBSD on an &intel;-based &apple; &macintosh;
-	  computer.</para>
+	<para>hogyan telep&iacute;ts&uuml;nk &os;-t egy
+	  &intel;-alap&uacute; &apple; &macintosh;
+	  sz&aacute;m&iacute;t&oacute;g&eacute;pre.</para>
       </listitem>
 
       <listitem>
-	<para>How to tune a FreeBSD system for best performance under
-	  virtualization.</para>
+	<para>hogyan hozzuk ki a legt&ouml;bbet &os;
+	  rendszer&uuml;nkb&#245;l virtualiz&aacute;ci&oacute;
+	  alatt.</para>
       </listitem>
 
     </itemizedlist>
 
-    <para>Before reading this chapter, you should:</para>
+    <para>A fejezet elolvas&aacute;s&aacute;hoz aj&aacute;nlott:</para>
 
     <itemizedlist>
       <listitem>
-	<para>Understand the basics of &unix; and FreeBSD (<xref
-	    linkend="basics">).</para>
+	<para>alapvet&#245; &unix;-os &eacute;s &os;-s ismeretek (<xref
+	  linkend="basics">).</para>
       </listitem>
 
-      <listitem><para>Know how to install FreeBSD (<xref
-      linkend="install">).</para></listitem>
+      <listitem>
+	<para>a &os; telep&iacute;t&eacute;s&eacute;nek ismerete (<xref
+	  linkend="install">).</para>
+      </listitem>
 
-      <listitem><para>Know how to set up your network connection (<xref
-      linkend="advanced-networking">).</para></listitem>
+      <listitem>
+	<para>a h&aacute;l&oacute;zati kapcsolatok
+	  be&aacute;ll&iacute;t&aacute;s&aacute;nak ismerete (<xref
+	  linkend="advanced-networking">).</para>
+      </listitem>
 
-      <listitem><para>Know how to install additional third-party
-        software (<xref linkend="ports">).</para></listitem>
+      <listitem>
+	<para>k&uuml;ls&#245;s alkalmaz&aacute;sok
+	  telep&iacute;t&eacute;s&eacute;nek ismerete (<xref
+	  linkend="ports">).</para></listitem>
     </itemizedlist>
 
   </sect1>
 
-
-
   <sect1 id="virtualization-guest">
-    <title>FreeBSD as a Guest OS</title>
+    <title>A &os; mint vend&eacute;g</title>
 
     <sect2 id="virtualization-guest-parallels">
-      <title>Parallels on MacOS</title>
+      <title>Parallels-el &macos;-en</title>
 
-      <para><application>Parallels Desktop</application> for &mac; is a
-	commercial software product available for &intel; based &apple;
-	&mac; computers running &macos; 10.4.6 or higher.  FreeBSD is a
-	fully supported guest operating system.
-	Once <application>Parallels</application> has been installed on &macos;
-        X, the user must configure a virtual machine and then install
-        the desired guest operating system.</para>
+      <para>A <application>Parallels Desktop</application> a &macos;
+	10.4.6, vagy afeletti verzi&oacute;j&aacute;t futatt&oacute;,
+	&intel;-alap&uacute; &apple; &mac; szem&eacute;lyi
+	sz&aacute;m&iacute;t&oacute;g&eacute;pekre fejlesztett
+	kereskedelmi alkalmaz&aacute;s.  A &os;-t teljes
+	m&eacute;rt&eacute;kben t&aacute;mogatja
+	vend&eacute;gk&eacute;nt.  Miut&aacute;n
+	telep&iacute;tett&uuml;k a
+	<application>Parallels</application>-t a &macos; X-re, be kell
+	&aacute;ll&iacute;tanunk egy virtu&aacute;lis g&eacute;pet, majd
+	erre felraknunk a k&iacute;v&aacute;nt vend&eacute;g
+	oper&aacute;ci&oacute;s rendszert.</para>
 
 	<sect3 id="virtualization-guest-parallels-install">
-	  <title>Installing FreeBSD on Parallels/&macos; X</title>
+	  <title>A &os; telep&iacute;t&eacute;se &macos;
+	    X/Parallels-re</title>
 
-	  <para>The first step in installing FreeBSD on &macos;
-	    X/<application>Parallels</application> is to create a new virtual
-	    machine for installing FreeBSD.  Select <guimenuitem>FreeBSD</guimenuitem>
-	    as the <guimenu>Guest OS Type</guimenu> when prompted:</para>
+	  <para>A &os; &macos; X/<application>Parallels</application>
+	    p&aacute;rosra telep&iacute;t&eacute;s&eacute;hez els&#245;
+	    l&eacute;p&eacute;sk&eacute;nt
+	    k&eacute;sz&iacute;ten&uuml;nk kell egy &uacute;j
+	    virtu&aacute;lis sz&aacute;m&iacute;t&oacute;g&eacute;pet.
+	    A l&eacute;trehoz&aacute;s sor&aacute;n v&aacute;lasszuk a
+	    <guimenu>Vend&eacute;g oper&aacute;ci&oacute;s rendszer
+	    t&iacute;pus&aacute;</guimenu>-nak a
+	    <guimenuitem>&os;</guimenuitem>-t:</para>
 
 	  <mediaobject>
             <imageobject>
@@ -101,10 +128,16 @@
             </imageobject>
           </mediaobject>
 
-	  <para>And choose a reasonable amount of disk and
-	    memory depending on your plans for this virtual FreeBSD
-	    instance.  4GB and 512MB of RAM work well for most uses of
-	    FreeBSD under <application>Parallels</application>:</para>
+	  <para>Ezut&aacute;n adjunk meg egy nagyj&aacute;b&oacute;l
+	    elfogadhat&oacute; m&eacute;retet a virtu&aacute;lis
+	    merevlemez&uuml;nknek, valamint annyi
+	    mem&oacute;ri&aacute;t, amennyire
+	    sz&uuml;ks&eacute;g&uuml;nk lehet a virtu&aacute;lis &os;-nk
+	    haszn&aacute;lata sor&aacute;n.  Egy 4 GB-os lemez &eacute;s
+	    512 MB rendszermem&oacute;ria a legt&ouml;bb esetben
+	    j&oacute; v&aacute;laszt&aacute;snak bizonyulhat a &os;
+	    <application>Parallels</application> alatti
+	    haszn&aacute;lata sor&aacute;n:</para>
 
 	  <mediaobject>
 	    <imageobject>
@@ -130,8 +163,9 @@
 	    </imageobject>
 	  </mediaobject>
 
-	  <para>Select the type of networking and a network
-	    interface:</para>
+	  <para>V&aacute;lasszuk ki a
+	    h&aacute;l&oacute;zatkezel&eacute;s t&iacute;pus&aacute;t
+	    &eacute;s a h&aacute;l&oacute;zati csatol&oacute;t:</para>
 
 	  <mediaobject>
 	    <imageobject>
@@ -145,7 +179,8 @@
 	    </imageobject>
 	  </mediaobject>
 
-	  <para>Save and finish the configuration:</para>
+	  <para>Ments&uuml;k el &eacute;s fejezz&uuml;k be a
+	    konfigur&aacute;l&aacute;st:</para>
 
 	  <mediaobject>
 	    <imageobject>
@@ -159,17 +194,25 @@
             </imageobject>
           </mediaobject>
 
-	  <para>After your FreeBSD virtual machine has been created,
-	    you will need to install FreeBSD on it.  This is best done
-	    with an official FreeBSD CDROM or with an ISO image
-	    downloaded from an official FTP site.  When you have the
-	    appropriate ISO image on your local &mac; filesystem or a
-	    CDROM in your &mac;'s CD drive, click on the disc icon in the
-	    bottom right corner of your FreeBSD
-	    <application>Parallels</application> window.  This
-	    will bring up a window that allows you to associate the
-	    CDROM drive in your virtual machine with an ISO file on
-	    disk or with your real CDROM drive.</para>
+	  <para>Miut&aacute;n a &os;-s virtu&aacute;lis
+	    g&eacute;p&uuml;nk elk&eacute;sz&uuml;lt,
+	    telep&iacute;ten&uuml;nk kell r&aacute; mag&aacute;t az
+	    oper&aacute;ci&oacute;s rendszert is.  Ezt a
+	    legegyszer&#251;bben a hivatalosan &os; telep&iacute;t&#245;
+	    CD-r&#245;l, vagy a hivatalos FTP oldalr&oacute;l
+	    let&ouml;lthet&#245; CD-k&eacute;ppel tehetj&uuml;k meg.  Ha
+	    lem&aacute;soltuk a megfelel&#245; CD-k&eacute;pet a &mac;
+	    helyi &aacute;llom&aacute;nyrendszer&eacute;re, vagy
+	    behelyezt&uuml;k a telep&iacute;t&#245; CD-t a
+	    CD-meghajt&oacute;ba, kattintsunk a &os;-s
+	    <application>Parallels</application> ablakunk jobb
+	    als&oacute; sark&aacute;ban tal&aacute;lhat&oacute; lemez
+	    ikonj&aacute;ra.  Ekkor felj&ouml;n egy
+	    p&aacute;rbesz&eacute;dablak, ahol
+	    &ouml;sszerendelhetj&uuml;k a virtu&aacute;lis
+	    g&eacute;p&uuml;nk CD-meghajt&oacute;j&aacute;t egy lemezen
+	    tal&aacute;lhat&oacute; k&eacute;ppel, vagy &eacute;ppen a
+	    val&oacute;di CD-meghajt&oacute;nkkal.</para>
 
 	  <mediaobject>
 	    <imageobject>
@@ -177,12 +220,11 @@
 	    </imageobject>
 	  </mediaobject>
 
-	  <para>Once you have made this association with your CDROM
-	    source, reboot your FreeBSD virtual machine as normal by
-	    clicking the reboot icon.
-	    <application>Parallels</application> will reboot with a
-	    special BIOS that first checks if you have a CDROM just as a
-	    normal BIOS would do.</para>
+	  <para>Ahogy megtett&uuml;k az im&eacute;nt eml&iacute;tett
+	    &ouml;sszerendel&eacute;st, ind&iacute;tsuk is &uacute;jra a
+	    &os;-s virtu&aacute;lis g&eacute;p&uuml;nket a megszokott
+	    m&oacute;don, az &uacute;jraind&iacute;t&aacute;s
+	    ikonj&aacute;ra kattintva.</para>
 
 	  <mediaobject>
 	    <imageobject>
@@ -190,11 +232,16 @@
 	    </imageobject>
 	  </mediaobject>
 
-	  <para>In this case it will find the FreeBSD installation media
-	    and begin a normal <application>sysinstall</application> based
-	    installation as described in <xref linkend="install">.  You
-	    may install, but do not attempt to configure X11 at
-	    this time.</para>
+	  <para>Ekkor a rendszer megtal&aacute;lja a &os;
+	    telep&iacute;t&#245;lemezt &eacute;s a
+	    <application>sysinstall</application>
+	    seg&iacute;ts&eacute;g&eacute;vel megkezdi a
+	    telep&iacute;t&eacute;st a <xref linkend="install">
+	    r&eacute;szben le&iacute;rtak szerint.  Ha
+	    sz&uuml;ks&eacute;g&uuml;nk van r&aacute;,
+	    telep&iacute;thetj&uuml;k az X11-et is, de egyel&#245;re
+	    m&eacute;g ne pr&oacute;b&aacute;ljuk
+	    be&aacute;ll&iacute;tani.</para>
 
 	  <mediaobject>
 	    <imageobject>
@@ -202,8 +249,10 @@
 	    </imageobject>
 	  </mediaobject>
 
-	  <para>When you have finished the installation, reboot
-	    into your newly installed FreeBSD virtual machine.</para>
+	  <para>A telep&iacute;t&eacute;s befejez&eacute;s&eacute;t
+	    k&ouml;vet&#245;en ind&iacute;tsuk &uacute;jra a frissen
+	    telep&iacute;tett &os;-s virtu&aacute;lis
+	    g&eacute;p&uuml;nket.</para>
 
 	  <mediaobject>
 	    <imageobject>
@@ -213,55 +262,81 @@
 	</sect3>
 
 	<sect3 id="virtualization-guest-parallels-configure">
-	  <title>Configuring FreeBSD on &macos; X/Parallels</title>
+	  <title>A &os; be&aacute;ll&iacute;t&aacute;sa &macos;
+	    X/Parallels-en</title>
 
-	  <para>After FreeBSD has been successfully installed on &macos;
-	    X with <application>Parallels</application>, there are a number
-	    of configuration steps that can be taken to optimize the system
-	    for virtualized operation.</para>
+	  <para>A &os; &macos; X/Parallels-re t&ouml;rt&eacute;n&#245;
+	    sikeres telep&iacute;t&eacute;s&eacute;t k&ouml;vet&#245;en
+	    m&eacute;g v&aacute;r r&aacute;nk n&eacute;h&aacute;ny
+	    konfigur&aacute;ci&oacute;s l&eacute;p&eacute;s a rendszer
+	    virtu&aacute;liz&aacute;lt
+	    m&#251;k&ouml;d&eacute;s&eacute;nek
+	    optimaliz&aacute;l&aacute;sa &eacute;rdek&eacute;ben.</para>
 
-          <procedure>
+	  <procedure>
 	    <step>
-	      <title>Set boot loader variables</title>
+	      <title>A rendszerbet&ouml;lt&#245;
+		v&aacute;ltoz&oacute;inak
+		be&aacute;ll&iacute;t&aacute;sa</title>
 
-	      <para>The most important step is to reduce the
-	        <option>kern.hz</option> tunable to reduce the CPU utilization
-		of FreeBSD under the <application>Parallels</application>
-		environment.  This is accomplished by adding the following
-		line to <filename>/boot/loader.conf</filename>:</para>
+	      <para>A legfontosabb l&eacute;p&eacute;s a
+		<option>kern.hz</option> v&aacute;ltoz&oacute;
+		&eacute;rt&eacute;k&eacute;nek cs&ouml;kkent&eacute;se,
+		amivel &iacute;gy a &os;
+		processzor-kihaszn&aacute;lts&aacute;g&aacute;t is
+		cs&ouml;kkentj&uuml;k a
+		<application>Parallels</application> alatt.  Ezt a
+		k&ouml;vetkez&#245; sor hozzad&aacute;s&aacute;val
+		tehetj&uuml;k meg a
+		<filename>/boot/loader.conf</filename>-ban:</para>
 
-	  	<programlisting>kern.hz=100</programlisting>
+		  <programlisting>kern.hz=100</programlisting>
 
-	      <para>Without this setting, an idle FreeBSD
-	        <application>Parallels</application> guest
-		OS will use roughly 15% of the CPU of a single
-		processor &imac;.  After this change the usage will be
-		closer to a mere 5%.</para>
+	      <para>En&eacute;lk&uuml;l egy &uuml;resj&aacute;ratban
+		lev&#245; &os;
+		<application>Parallels</application>-vend&eacute;g az
+		&imac; egy processzor&aacute;nak durv&aacute;n
+		15%-&aacute;t foglalja le.  A v&aacute;ltoztat&aacute;s
+		&eacute;letbe l&eacute;ptet&eacute;se ut&aacute;n
+		azonban ez megk&ouml;zel&iacute;t&#245;en 5%-ra
+		reduk&aacute;lhat&oacute;.</para>
 	    </step>
 
 	    <step>
-	      <title>Create a new kernel configuration file</title>
+	      <title>Egy &uacute;j konfigur&aacute;ci&oacute;s
+		&aacute;llom&aacute;ny l&eacute;trehoz&aacute;sa a
+		rendszermaghoz</title>
+
+	      <para>Nyugodtan elt&aacute;vol&iacute;thatjuk az
+		&ouml;sszes SCSI, FireWire &eacute;s USB
+		eszk&ouml;zmeghajt&oacute;t.  A
+		<application>Parallels</application> &aacute;ltal
+		felk&iacute;n&aacute;lt virtu&aacute;lis
+		h&aacute;l&oacute;zati csatol&oacute;t az &man.ed.4;
+		meghajt&oacute;n kereszt&uuml;l tudjuk el&eacute;rni,
+		ez&eacute;rt az &man.ed.4; &eacute;s &man.miibus.4;
+		meghajt&oacute;kon k&iacute;v&uuml;l az &ouml;sszes
+		t&ouml;bbi elhagyhat&oacute;.</para>
 
-	      <para>You can remove all of the SCSI, FireWire, and USB
-	        device drivers.  <application>Parallels</application>
-		provides a virtual network
-	        adapter used by the &man.ed.4; driver, so
-	        all other network devices except for
-	        &man.ed.4; and &man.miibus.4; can be
-	        removed from the kernel.</para>
-	    </step>
+    </step>
 
 	    <step>
-	      <title>Setup networking</title>
+	      <title>A h&aacute;l&oacute;zati kapcsolat
+		be&aacute;ll&iacute;t&aacute;sa</title>
 
-	      <para>The most basic networking setup involves simply
-	        using DHCP to connect your virtual machine to the same
-	        local area network as your host &mac;.  This can be
-	        accomplished by adding
-	        <literal>ifconfig_ed0="DHCP"</literal> to
-	        <filename>/etc/rc.conf</filename>.  More advanced
-		networking setups are described in <xref
-		linkend="advanced-networking">.</para>
+	      <para>Az alapvet&#245; h&aacute;l&oacute;zati
+		be&aacute;ll&iacute;t&aacute;s a virtu&aacute;lis
+		g&eacute;p&uuml;nk&ouml;n a DHCP
+		aktiv&aacute;l&aacute;sa, aminek
+		seg&iacute;ts&eacute;g&eacute;vel csatlakozni tudunk
+		arra a helyi h&aacute;l&oacute;zatra, amelyen maga a
+		gazda &mac; is megtal&aacute;lhat&oacute;.  Ezt az
+		al&aacute;bbi sor felv&eacute;tel&eacute;vel tudjuk
+		megoldani az <filename>/etc/rc.conf</filename>
+		&aacute;llom&aacute;nyba:
+		<literal>ifconfig_ed0="DHCP"</literal>.  B&#245;vebb
+		inform&aacute;ci&oacute;k&eacute;rt j&aacute;ruljunk a
+		<xref linkend="advanced-networking"> fejezethez.</para>
 	    </step>
           </procedure>
 
@@ -275,61 +350,77 @@
 	  <author>
             <firstname>Fukang</firstname>
 	    <surname>Chen (Loader)</surname>
-	    <contrib>Contributed by </contrib>
+	    <contrib>&Iacute;rta: </contrib>
           </author>
         </authorgroup>
         <!-- Mar/Apr 2007 -->
       </sect2info>
 
-      <title>FreeBSD with &xen; on Linux</title>
+      <title>&xen;-el &linux;-on</title>
 
-	<para>The <application>&xen;</application> hypervisor is an open
-	  source paravirtualization product which is now supported by the
-	  commercial XenSource company.  Guest operating systems are known
-	  as domU domains, and the host operating system is known as dom0.
-	  The first step in running a virtual FreeBSD instance under Linux
-	  is to install <application>&xen;</application> for Linux dom0.
-	  The host operating system will be a Slackware Linux
-	  distribution.</para>
+      <para>A <application>&xen;</application> hipervisor egy
+	ny&iacute;lt forr&aacute;sk&oacute;d&uacute;,
+	paravirtualiz&aacute;ci&oacute;t ny&uacute;jt&oacute;
+	term&eacute;k, amely m&ouml;g&ouml;tt mostanra m&aacute;r a
+	XenSource kereskedelmi c&eacute;g &aacute;ll.  Itt a
+	vend&eacute;g oper&aacute;ci&oacute;s rendszereket a domU
+	tartom&aacute;nyk&eacute;nt azonos&iacute;tj&aacute;k,
+	m&iacute;g a gazda oper&aacute;ci&oacute;s rendszer a dom0.  A
+	&os; &linux; alatti virtu&aacute;lis futatt&aacute;s&aacute;hoz
+	els&#245;k&eacute;nt telep&iacute;ten&uuml;nk kell a
+	<application>&xen;</application>-t egy dom0-&aacute;s
+	&linux;-ra.  A le&iacute;r&aacute;sban a gazda
+	oper&aacute;ci&oacute;s rendszer a Slackware &linux;
+	disztrib&uacute;ci&oacute; lesz.</para>
 
 	<sect3 id="xen-slackware-dom0">
-	  <title>Setup &xen; 3 on Linux dom0</title>
+	  <title>A &xen; 3 be&aacute;ll&iacute;t&aacute;sa egy &linux;
+	  dom0-&aacute;n</title>
 
 	  <procedure>
 	    <step>
-	      <title>Download &xen; 3.0 from XenSource</title>
+	      <title>T&ouml;lts&uuml;k le a &xen; 3.0-&aacute;t a
+		XenSource-t&oacute;l</title>
 
-	      <para>Download <ulink
-	        url="http://bits.xensource.com/oss-xen/release/3.0.4-1/src.tgz/xen-3.0.4_1-src.tgz">xen-3.0.4_1-src.tgz</ulink>
-	        from <ulink url="http://www.xensource.com/"></ulink>.</para>
+	      <para>T&ouml;lts&uuml;k le a <ulink
+		url="http://bits.xensource.com/oss-xen/release/3.0.4-1/src.tgz/xen-3.0.4_1-src.tgz">xen-3.0.4_1-src.tgz</ulink>
+		&aacute;llom&aacute;nyt a <ulink
+		url="http://www.xensource.com/">XenSource
+		oldal&aacute;r&oacute;l</ulink>.</para>
 
 	    </step>
 
 	    <step>
-	      <title>Unpack the tarball</title>
+	      <title>Bontsuk ki a csomagot</title>
 
               <screen>&prompt.root; <userinput>cd xen-3.0.4_1-src</userinput>
 &prompt.root; <userinput>KERNELS="linux-2.6-xen0 linux-2.6-xenU" make world</userinput>
 &prompt.root; <userinput>make install</userinput></screen>
 
             <note>
-	      <para>To re-compile the kernel for dom0:</para>
+	      <para>A rendszermagot &iacute;gy tudjuk dom0 m&oacute;dban
+		&uacute;jraford&iacute;tani:</para>
 
 	      <screen>&prompt.root; <userinput>cd xen-3.0.4_1-src/linux-2.6.16.33-xen0</userinput>
 &prompt.root; <userinput>make menuconfig</userinput>
 &prompt.root; <userinput>make</userinput>
 &prompt.root; <userinput>make install</userinput></screen>
 
-	      <para>Older version of <application>&xen;</application> may need to specify
-	        <command>make ARCH=xen menuconfig</command></para>
+	      <para>A <application>&xen;</application> r&eacute;gebbi
+		verzi&oacute;in&aacute;l elk&eacute;pzelhet&#245;, hogy
+		&iacute;gy kell megadni:
+		<command>make ARCH=xen menuconfig</command></para>
 	    </note>
 	    </step>
 
 	    <step>
-	      <title>Add a menu entry into Grub menu.lst</title>
+	      <title>Vegy&uuml;k fel a megfelel&#245; pontot a GRUB
+		men&uuml;j&eacute;be</title>
 
-	      <para>Edit <filename>/boot/grub/menu.lst</filename> and
-		add the following lines:</para>
+	      <para>Nyissuk meg a
+		<filename>/boot/grub/menu.lst</filename>
+		&aacute;llom&aacute;nyt &eacute;s &iacute;rjuk be a
+		k&ouml;vetkez&#245; sort:</para>
 
 	      <programlisting>title Xen-3.0.4
 root (hd0,0)
@@ -338,21 +429,24 @@
             </step>
 
             <step>
-              <title>Reboot your computer into &xen;</title>
+	      <title>Ind&iacute;tsuk &uacute;jra a g&eacute;pet
+		&eacute;s aktiv&aacute;ljuk a &xen;-t</title>
 
-	      <para>First, edit
-		<filename>/etc/xen/xend-config.sxp</filename>, and add
-		the following line:</para>
+	      <para>El&#245;sz&ouml;r nyissuk meg az
+		<filename>/etc/xen/xend-config.sxp</filename>
+		&aacute;llom&aacute;nyt, majd adjuk hozz&aacute; a
+		k&ouml;vetkez&#245; sort:</para>
 
 	      <programlisting>(network-script 'network-bridge netdev=eth0')</programlisting>
 
-	      <para>Then, we can launch
-		<application>&xen;</application>:</para>
+	      <para>Ezut&aacute;n el is ind&iacute;thatjuk a
+		<application>&xen;</application>-t:</para>
 
               <screen>&prompt.root; <userinput>/etc/init.d/xend start</userinput>
 &prompt.root; <userinput>/etc/init.d/xendomains start</userinput></screen>
 
-	      <para>Our dom0 is running:</para>
+	      <para>L&aacute;thatjuk, hogy a dom0 tartom&aacute;ny most
+		m&aacute;r akt&iacute;v:</para>
 
               <screen>&prompt.root; <userinput>xm list</userinput>
 Name                                      ID   Mem VCPUs      State   Time(s)
@@ -362,11 +456,14 @@
         </sect3>
 
         <sect3>
-          <title>FreeBSD 7-CURRENT domU</title>
+	  <title>A &os; 7-CURRENT mint domU</title>
 
-          <para>Download the FreeBSD domU kernel for <application>&xen; 3.0</application> and
-	    disk image from <ulink
-            url="http://www.fsmware.com/">http://www.fsmware.com/</ulink></para>
+	  <para>T&ouml;lts&uuml;k le a &os; <application>&xen;
+	    3.0</application>-&aacute;s domU rendszermagj&aacute;t
+	    &eacute;s a hozz&aacute;tartoz&oacute; lemezk&eacute;pet a
+	    <ulink
+	    url="http://www.fsmware.com/">http://www.fsmware.com/</ulink>
+	    c&iacute;mr&#245;l:</para>
 
       <itemizedlist>
 	<listitem>
@@ -382,10 +479,13 @@
 	</listitem>
       </itemizedlist>
 
-      <para>Put the configuration file <filename>xmexample1.bsd</filename>
-	into <filename>/etc/xen/</filename> and modify the related
-	entries about where the kernel and the disk image are stored.
-	It should look like the following:</para>
+      <para>Tegy&uuml;k a <filename>xmexample1.bsd</filename>
+	konfigur&aacute;ci&oacute;s &aacute;llom&aacute;nyt a
+	<filename>/etc/xen/</filename> k&ouml;nyvt&aacute;rba &eacute;s
+	&iacute;rjuk &aacute;t a relev&aacute;ns bejegyz&eacute;seket a
+	rendszermag &eacute;s a lemezk&eacute;p el&eacute;r&eacute;si
+	&uacute;tj&aacute;nak megfelel&#245;en.  Valahogy &iacute;gy
+	kellene kin&eacute;zni az eredm&eacute;nynek:</para>
 
       <programlisting>kernel = "/opt/kernel-current"
 memory = 256
@@ -398,12 +498,16 @@
 extra += ",kern.hz=100"
 extra += ",vfs.root.mountfrom=ufs:/dev/xbd769a"</programlisting>
 
-      <para>The <filename>mdroot-7.0.bz2</filename> file should be 
-	uncompressed.</para>
+      <para>Az <filename>mdroot-7.0.bz2</filename>
+	&aacute;llom&aacute;nyt ki kell
+	t&ouml;m&ouml;r&iacute;teni!</para>
 
-      <para>Next, the __xen_guest section in <filename>kernel-current</filename>
-	needs to be altered to add the VIRT_BASE that
-	<application>&xen; 3.0.3</application> requires:</para>
+      <para>Ezut&aacute;n a <filename>kernel-current</filename>
+	&aacute;llom&aacute;nyban tal&aacute;lhat&oacute; __xen_guest
+	r&eacute;szt &aacute;t kell &iacute;rni &uacute;gy, hogy
+	hozz&aacute;adjuk a <application>&xen; 3.0.3</application>
+	sz&aacute;m&aacute;ra fontos VIRT_BASE
+	&eacute;rt&eacute;ket:</para>
 
       <screen>&prompt.root; <userinput>objcopy kernel-current -R __xen_guest</userinput>
 &prompt.root; <userinput>perl -e 'print "LOADER=generic,GUEST_OS=freebsd,GUEST_VER=7.0,XEN_VER=xen-3.0,BSD_SYMTAB,VIRT_BASE=0xC0000000\x00"' &gt; tmp</userinput>
@@ -421,7 +525,9 @@
  0040 445f5359 4d544142 2c564952 545f4241  D_SYMTAB,VIRT_BA
  0050 53453d30 78433030 30303030 3000      SE=0xC0000000. </screen>
 
-      <para>We are, now, ready to create and launch our domU:</para>
+      <para>Most m&aacute;r k&eacute;szen &aacute;llunk a domU
+	l&eacute;trehoz&aacute;s&aacute;ra &eacute;s
+	beind&iacute;t&aacute;s&aacute;ra:</para>
 
       <screen>&prompt.root; <userinput>xm create /etc/xen/xmexample1.bsd -c</userinput>
 Using config file "/etc/xen/xmexample1.bsd".
@@ -484,16 +590,18 @@
 
 login: </screen>
 
-      <para>The domU should run the &os;&nbsp;7.0-CURRENT
-	kernel:</para>
+      <para>A domU-ban a &os;&nbsp;7.0-CURRENT rendszermagnak kell
+	futnia:</para>
 
       <screen>&prompt.root; <userinput>uname -a</userinput>
 FreeBSD demo.freebsd.org 7.0-CURRENT FreeBSD 7.0-CURRENT #113: Wed Jan  4 06:25:43 UTC 2006     
 kmacy@freebsd7.gateway.2wire.net:/usr/home/kmacy/p4/freebsd7_xen3/src/sys/i386-xen/compile/XENCONF  i386</screen>
 
-      <para>The network can now be configured on the domU.  The &os;
-	domU will use a specific interface called
-	<devicename>xn0</devicename>:</para>
+      <para>Miut&aacute;n err&#245;l megbizonyosodtunk, be tudjuk
+	&aacute;ll&iacute;tani a h&aacute;l&oacute;zatot is domU-ban.  A
+	domU &os; egy <devicename>xn0</devicename> nev&#251;
+	speci&aacute;lis eszk&ouml;zt haszn&aacute;l erre a
+	c&eacute;lra:</para>
 
       <screen>&prompt.root; <userinput>ifconfig xn0 10.10.10.200 netmask 255.0.0.0</userinput>
 &prompt.root; <userinput>ifconfig</userinput>
@@ -505,8 +613,10 @@
       inet6 fe80::1%lo0 prefixlen 64 scopeid 0x2 
       inet 127.0.0.1 netmask 0xff000000 </screen>
 
-      <para>On dom0 Slackware, some <application>&xen;</application>
-	dependant network interfaces should show up:</para>
+      <para>Ek&ouml;zben a dom0 Slackware-en n&eacute;h&aacute;ny
+      <application>&xen;</application>-f&uuml;gg&#245;
+      h&aacute;l&oacute;zati csatol&oacute;nak is meg kell
+      jelennie:</para>
 
       <screen>&prompt.root; <userinput>ifconfig</userinput>
 eth0      Link encap:Ethernet  HWaddr 00:07:E9:A0:02:C2  
@@ -564,22 +674,27 @@
     </sect2>
 
     <sect2 id="virtualization-guest-vmware">
-      <title>VMware on &windows;/&mac;/&linux;</title>
+      <title>VMware-rel &windows;/&mac;/&linux;-on</title>
 
-      <para>This section has yet to be written.</para>
+      <para>Ez a r&eacute;sz m&eacute;g nincs
+	elk&eacute;sz&iacute;tve.</para>
 
     </sect2>
 
   </sect1>
 
   <sect1 id="virtualization-host">
-    <title>FreeBSD as a Host OS</title>
+    <title>A &os; mint gazda</title>
 
-    <para>FreeBSD is not officially supported by any virtualization
-      package as a host operating system at this time, but many people
-      use older versions of <application>VMware</application> in this capacity.
-      Work is also ongoing in getting <application>&xen;</application> to
-      work as a host environment on FreeBSD.</para>
+    <para>Jelenleg a &os;-t hivatalosan egyik
+      virtualiz&aacute;ci&oacute;s programcsomag sem t&aacute;mogatja
+      gazda oper&aacute;ci&oacute;s rendszerk&eacute;nt, de sokan
+      haszn&aacute;lj&aacute;k a <application>VMware</application>
+      r&eacute;gebbi verzi&oacute;it ilyen megfontol&aacute;sb&oacute;l.
+      Ezenk&iacute;v&uuml;l folynak munk&aacute;latok abb&oacute;l a
+      c&eacute;lb&oacute;l, hogy a <application>&xen;</application>-t
+      felk&eacute;sz&iacute;ts&eacute;k a &os; t&ouml;rt&eacute;n&#245;
+      futatt&aacute;sra.</para>
 
   </sect1>
 

From owner-p4-projects@FreeBSD.ORG  Sun Sep 30 22:12:32 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E1C1016A419; Sun, 30 Sep 2007 22:12:31 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 836AB16A418
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 22:12:31 +0000 (UTC)
	(envelope-from ermal.luci@gmail.com)
Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.226])
	by mx1.freebsd.org (Postfix) with ESMTP id 2395713C43E
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 22:12:31 +0000 (UTC)
	(envelope-from ermal.luci@gmail.com)
Received: by wx-out-0506.google.com with SMTP id i29so2556219wxd
	for <perforce@freebsd.org>; Sun, 30 Sep 2007 15:12:30 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta;
	h=domainkey-signature:received:received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	bh=ZLjQa6zzQXl0Sk5BxiYdbPSu1hjXDd8gFlmqhKT6dQ0=;
	b=ocO5MuXKdJ+t7+nPFFiRgbdCGy2M5lG4cq0K5hhnLEldFxkAZktwYaE0h1nXvrHFw8kvWAr0D1YIPaIGqcv5I/7gQbbZ3l+PzltPtyJjFy1HCH9FNKNwLKM8OjZUmyVObTWQ9cns8tJGB8v/xxMMItuHs5mZrQRG7zQBtdwm3Q8=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta;
	h=received:message-id:date:from:to:subject:cc:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references;
	b=aEwYurHUJJtUu4FsItIliIGNixCNgu3+DGNJ+OjikOL+DwBFS35mkpa6LqqpF6tc4v54+Qo2prdpsDgxV60K0iylUqd2VtwNUaq6SRDFaQg+lIPnoPuwyc5ANz0OWjQHzavs8DYDHpnbXGtKV78RSze8v7cWbNWyU8Sc6dLQQSE=
Received: by 10.70.29.14 with SMTP id c14mr8366757wxc.1191188781717;
	Sun, 30 Sep 2007 14:46:21 -0700 (PDT)
Received: by 10.70.73.1 with HTTP; Sun, 30 Sep 2007 14:46:21 -0700 (PDT)
Message-ID: <9a542da30709301446y37109414m62e6f96287acceaa@mail.gmail.com>
Date: Sun, 30 Sep 2007 23:46:21 +0200
From: "=?ISO-8859-1?Q?Ermal_Lu=E7i?=" <ermal.luci@gmail.com>
To: "Max Laier" <max@love2party.net>
In-Reply-To: <200709300025.29860.max@love2party.net>
MIME-Version: 1.0
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <200709281936.l8SJafp0038500@repoman.freebsd.org>
	<200709281334.52659.peter@wemm.org>
	<200709300025.29860.max@love2party.net>
Cc: Ermal Luci <eri@freebsd.org>,
	Perforce Change Reviews <perforce@freebsd.org>, Peter Wemm <peter@wemm.org>
Subject: Re: PERFORCE change 126941 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Sep 2007 22:12:32 -0000

On 9/30/07, Max Laier <max@love2party.net> wrote:
> On Friday 28 September 2007, Peter Wemm wrote:
> > Umm. What the heck?  You've dumped a bunch of stuff in //depot/doc,
> > which is where the perforce repository docs are...
>
> Strange.  I'd assume that normal (external) users wouldn't even have
> access to these files.  In addition Ermal's branch "pf_ext" - despite
> being named in contrast to general practice - looks okay.  Might this be
> fall out from the update?
>
> Ermal, do you have a view of //depot/doc/... at all?  Looking at your
> clients I don't see any.
No i don't and never had such a view.


>
> > On Friday 28 September 2007, Ermal Luci wrote:
> > > http://perforce.freebsd.org/chv.cgi?CH=126941
> > >
> > > Change 126941 by eri@eri on 2007/09/28 19:36:17
> > >
> > >     update to current src
> > >
> > > Affected files ...
> > >
> > > .. //depot/doc/Makefile#1 branch
>
> --
> /"\  Best regards,                      | mlaier@freebsd.org
> \ /  Max Laier                          | ICQ #67774661
>  X   http://pf4freebsd.love2party.net/  | mlaier@EFnet
> / \  ASCII Ribbon Campaign              | Against HTML Mail and News
>
>

From owner-p4-projects@FreeBSD.ORG  Sun Sep 30 23:21:02 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 477D516A4C4; Sun, 30 Sep 2007 23:21:02 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E3BA916A417
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 23:21:01 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D38C313C478
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 23:21:01 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l8UNL1Wk060154
	for <perforce@FreeBSD.org>; Sun, 30 Sep 2007 23:21:01 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l8UNL1Pt060151
	for perforce@freebsd.org; Sun, 30 Sep 2007 23:21:01 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sun, 30 Sep 2007 23:21:01 GMT
Message-Id: <200709302321.l8UNL1Pt060151@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127049 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 30 Sep 2007 23:21:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=127049

Change 127049 by pgj@disznohal on 2007/09/30 23:20:02

	Add initial Hungarian translation of the book framework & colophon.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/book.sgml#3 edit
.. //depot/projects/docproj_hu/books/handbook/colophon.sgml#2 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/book.sgml#3 (text+ko) ====

@@ -3,6 +3,10 @@
 
      $FreeBSD: doc/en_US.ISO8859-1/books/handbook/book.sgml,v 1.171 2007/04/06 07:38:50 murray Exp $
 -->
+<!--
+     The FreeBSD Hungarian Documentation Project
+     Translated by: PALI, Gabor <pgj@FreeBSD.org>
+     Original Revision: 1.171                     -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % books.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//HU">
@@ -52,14 +56,14 @@
 <!ENTITY % pgpkeys SYSTEM "../../../share/pgpkeys/pgpkeys.ent"> %pgpkeys;
 ]>
 
-<book>
+<book lang="hu">
   <bookinfo>
-    <title>FreeBSD Handbook</title>
-    
-    <corpauthor>The FreeBSD Documentation Project</corpauthor>
-    
-    <pubdate>February 1999</pubdate>
-    
+    <title>&os; k&eacute;zik&ouml;nyv</title>
+
+    <corpauthor>A &os; dokument&aacute;ci&oacute;s projekt</corpauthor>
+
+    <pubdate>1999.  febru&aacute;r</pubdate>
+
     <copyright>
       <year>1995</year>
       <year>1996</year>
@@ -74,7 +78,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
-      <holder>The FreeBSD Documentation Project</holder>
+      <holder>A &os; dokument&aacute;ci&oacute;s projekt</holder>
     </copyright>
 
     &bookinfo.legalnotice;
@@ -120,71 +124,89 @@
       &tm-attrib.xiph;
       &tm-attrib.general;
     </legalnotice>
-    
+
     <abstract>
-      <para>Welcome to FreeBSD! This handbook covers the installation and day
-	to day use of <emphasis>FreeBSD &rel2.current;-RELEASE</emphasis>
-	and <emphasis>FreeBSD &rel.current;-RELEASE</emphasis>.
-	This manual is a <emphasis>work in progress</emphasis> and is the work
-	of many individuals.  As such, some sections may become dated and
-	require updating.  If you are interested in helping out
-	with this project, send email to the &a.doc;.  The latest version of
-	this document is always available from the <ulink
-	  url="http://www.FreeBSD.org/">FreeBSD web site</ulink>
-	(previous versions of this handbook can be obtained from <ulink
-	url="http://docs.FreeBSD.org/doc/"></ulink>).
-	It may also be downloaded in a variety of formats and compression
-	options from the <ulink 
-          url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">FreeBSD FTP 
-          server</ulink> or one of the numerous <link
-	  linkend="mirrors-ftp">mirror sites</link>.  If you would prefer
-	  to have a hard copy of the handbook, you can purchase one at the
-	  <ulink
-	  url="http://www.freebsdmall.com/">FreeBSD Mall</ulink>.  You
-	  may also want to <ulink
-	  url="&url.base;/search/index.html">search the
-	  handbook</ulink>.</para>
+      <para>&Uuml;dv&ouml;z&ouml;lj&uuml;k a &os;
+	vil&aacute;g&aacute;ban!  Ez a k&eacute;zik&ouml;nyv ismerteti a
+	<emphasis>&os; &rel2.current;-RELEASE</emphasis>, ill.  a
+	<emphasis>&os; &rel.current;-RELEASE</emphasis>
+	telep&iacute;t&eacute;s&eacute;t &eacute;s
+	haszn&aacute;lat&aacute;t a mindennapokban.  A
+	k&eacute;zik&ouml;nyv tartalma <emphasis>folyamatos
+	fejleszt&eacute;s alatt &aacute;ll</emphasis> sz&aacute;mos
+	f&uuml;ggetlen fejleszt&#245; &aacute;ltal.  Emiatt
+	elk&eacute;pzelhet&#245;, hogy bizonyos fejezetek m&aacute;r
+	el&eacute;v&uuml;ltek &eacute;s aktualiz&aacute;l&aacute;sra
+	szorulnak.  Amennyiben &uacute;gy &eacute;rzi, hogy
+	seg&iacute;teni tudna a projekt munk&aacute;j&aacute;ban,
+	&eacute;rtes&iacute;tsen minket a &a.doc; c&iacute;men!  Ezen
+	dokumentum legfrissebb v&aacute;ltozata mindig
+	el&eacute;rhet&#245; a <ulink url="http://www.FreeBSD.org/">&os;
+	weboldal&aacute;r&oacute;l</ulink> (a kor&aacute;bbi
+	v&aacute;ltozatok pedig megtal&aacute;lhat&oacute;ak a <ulink
+	url="http://docs.FreeBSD.org/doc/"></ulink> c&iacute;men).
+	Ezenk&iacute;v&uuml;l rengeteg form&aacute;tumban &eacute;s
+	t&ouml;m&ouml;r&iacute;tve is let&ouml;lthet&#245; a <ulink
+	url="ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/">&os; FTP
+	szerver&eacute;r&#245;l</ulink> vagy a <link
+	linkend="mirrors-ftp">t&uuml;k&ouml;roldalak</link>
+	egyik&eacute;r&#245;l.  Ha viszont a k&eacute;zik&ouml;nyv
+	nyomtatott v&aacute;ltozat&aacute;ra lenne sz&uuml;ks&eacute;ge,
+	megv&aacute;s&aacute;rolhatja a <ulink
+	url="http://www.freebsdmall.com/">&os; Mall</ulink>-ban is.  Ha
+	pedig keresni szeretn&eacute;nk benne, azt a funkci&oacute;t
+	<ulink url="&url.base;/search/index.html">itt</ulink>
+	&eacute;rhetj&uuml;k el.</para>
     </abstract>
   </bookinfo>
 
   &chap.preface;
 
   <part id="getting-started">
-    <title>Getting Started</title>
-    
+    <title>Bevezet&eacute;s</title>
+
     <partintro>
-      <para>This part of the FreeBSD Handbook is for users and
-	administrators who are new to FreeBSD.  These chapters:</para>
-
+      <para>A &os; k&eacute;zik&ouml;nyv ezen r&eacute;sze azoknak a
+	felhaszn&aacute;l&oacute;knak &eacute;s rendszergazd&aacute;knak
+	sz&oacute;l, akik m&eacute;g nem ismerik a &os;-t.  A
+	fejezetek:</para>
       <itemizedlist>
 	<listitem>
-	  <para>Introduce you to FreeBSD.</para>
+	  <para>Bemutatj&aacute;k a &os;-t.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Guide you through the installation process.</para>
+	  <para>V&eacute;gigvezetnek a telep&iacute;t&eacute;s
+	    folyamat&aacute;n.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Teach you &unix; basics and fundamentals.</para>
+	  <para>Ismerteti a &unix; alapjait.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Show you how to install the wealth of third party
-	    applications available for FreeBSD.</para>
+	  <para>Megmutatja, hogyan telep&iacute;ts&uuml;k fel a &os;-hez
+	    el&eacute;rhet&#245; tem&eacute;rdek k&uuml;ls&#245;s
+	    alkalmaz&aacute;st.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Introduce you to X, the &unix; windowing system, and
-	    detail how to configure a desktop environment that makes you
-	    more productive.</para>
+	  <para>Megismerhetj&uuml;k az X-et, a &unix;-os
+	    ablakoz&oacute;rendszert, &eacute;s r&eacute;szleteiben is
+	    l&aacute;thatjuk, mik&eacute;nt konfigur&aacute;ljunk be egy
+	    asztalk&ouml;rnyezetet, amivel k&eacute;nyelmesebb&eacute;
+	    v&aacute;lik a munka.</para>
 	</listitem>
       </itemizedlist>
 
-      <para>We have tried to keep the number of forward references in
-	the text to a minimum so that you can read this section of the
-	Handbook from front to back with the minimum page flipping
-	required.</para>
+      <para>A fejezetek meg&iacute;r&aacute;sa sor&aacute;n arra
+	t&ouml;rekedt&uuml;nk, hogy min&eacute;l kevesebb
+	hivatkoz&aacute;st tegy&uuml;nk a k&ouml;nyv k&eacute;s&#245;bb
+	k&ouml;vetkez&#245; r&eacute;szeire, &iacute;gy ennek
+	k&ouml;sz&ouml;nhet&#245;en a k&eacute;zik&ouml;nyv ezen
+	r&eacute;sze an&eacute;lk&uuml;l olvashat&oacute;, hogy
+	k&ouml;zben folyamatosan el&#245;re-h&aacute;tra kellene
+	lapozgatnunk benne.</para>
     </partintro>
 
     <![ %chap.introduction;             [ &chap.introduction;         ]]>
@@ -193,47 +215,59 @@
     <![ %chap.ports;                    [ &chap.ports;                ]]>
     <![ %chap.x11;                      [ &chap.x11;                  ]]>
   </part>
-  
+
   <part id="common-tasks">
-    <title>Common Tasks</title>
-    
+    <title>Gyakori feladatok</title>
+
     <partintro>
-      <para>Now that the basics have been covered, this part of the
-        FreeBSD Handbook will discuss some frequently used features of
-        FreeBSD.  These chapters:</para>
+      <para>Miut&aacute;n az alapokat m&aacute;r &aacute;tvett&uuml;k, a
+	&os; k&eacute;zik&ouml;nyv k&ouml;vetkez&#245; r&eacute;sze
+	n&eacute;h&aacute;ny gyakorta alkalmazott funkci&oacute;t
+	t&aacute;rgyal.  Az itt szerepl&#245; fejezetek:</para>
 
       <itemizedlist>
 	<listitem>
-	  <para>Introduce you to popular and useful desktop
-	    applications: browsers, productivity tools, document
-	    viewers, etc.</para>
+	  <para>Bemutatnak k&uuml;l&ouml;nf&eacute;le hasznos &eacute;s
+	    n&eacute;pszer&#251; asztali alkalmaz&aacute;st:
+	    b&ouml;ng&eacute;sz&#245;ket, termel&eacute;st
+	    el&#245;seg&iacute;t&#245; eszk&ouml;z&ouml;ket,
+	    dokumentumn&eacute;zeget&#245;ket stb.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Introduce you to a number of multimedia tools
-	  available for FreeBSD.</para>
+	  <para>Bemutatj&aacute;k a &os; alatt is el&eacute;rhet&#245;
+	    multim&eacute;dia eszk&ouml;z&ouml;ket.</para>
 	</listitem>
 
 	<listitem>
-	  <para>Explain the process of building a customized FreeBSD
-	  kernel, to enable extra functionality on your system.</para>
+	  <para>Kifejtik a &os; rendszermagj&aacute;nak
+	    testreszab&aacute;si folyamat&aacute;t, &eacute;s
+	    ez&aacute;ltal a rendszer&uuml;nk
+	    funkcionalit&aacute;s&aacute;nak
+	    n&ouml;vel&eacute;s&eacute;nek
+	    mik&eacute;ntj&eacute;t.</para>
 	</listitem>
 
-        <listitem>
-          <para>Describe the print system in detail, both for desktop
-          and network-connected printer setups.</para>
-        </listitem>
+	<listitem>
+	  <para>R&eacute;szletesen bemutatj&aacute;k a
+	    nyomtat&aacute;s&eacute;rt felel&#245;s alrendszert, asztali
+	    &eacute;s h&aacute;l&oacute;zati nyomtat&oacute;k
+	    haszn&aacute;lata eset&eacute;n egyar&aacute;nt.</para>
+	</listitem>
 
-        <listitem>
-          <para>Show you how to run Linux applications on your FreeBSD
-          system.</para>
-        </listitem>
+	<listitem>
+	  <para>Megmutatj&aacute;k, hogyan futassunk &linux;-ra
+	    &iacute;r&oacute;dott alkalmaz&aacute;sokat &os;
+	    rendszer&uuml;nk&ouml;n.</para>
+	</listitem>
 
       </itemizedlist>
 
-      <para>Some of these chapters recommend that you do some prior
-	reading, and this is noted in the synopsis at the beginning of
-	each chapter.</para>
+      <para>Egyes fejezetek elolvas&aacute;s&aacute;hoz aj&aacute;nlott
+	bizonyos m&eacute;rt&eacute;k&#251;
+	felk&eacute;sz&uuml;l&eacute;s, amely megeml&iacute;t&eacute;sre
+	is ker&uuml;l az &eacute;rintett fejezetek
+	&aacute;ttekint&eacute;s&eacute;ben.</para>
 
     </partintro>
 
@@ -245,19 +279,24 @@
   </part>
 
   <part id="system-administration">
-    <title>System Administration</title>
+    <title>Rendszeradminisztr&aacute;ci&oacute;</title>
 
     <partintro>
-      <para>The remaining chapters of the FreeBSD Handbook cover all
-	aspects of FreeBSD system administration.  Each chapter
-	starts by describing what you will learn as a result of reading
-	the chapter, and also details what you are expected to know
-	before tackling the material.</para>
+      <para>A &os; k&eacute;zik&ouml;nyv fennmarad&oacute; fejezeteiben
+	a &os; rendszeradminisztr&aacute;ci&oacute;
+	k&uuml;l&ouml;nb&ouml;z&#245; aspektusait mutatjuk be.
+	Mindegyik fejezet elej&eacute;n megtudhatjuk, mit is fogunk
+	megismerni a fejezet elolvas&aacute;sa sor&aacute;n, ill.
+	arr&oacute;l is inform&aacute;ci&oacute;kat kapunk, miket kell
+	tudnunk a t&aacute;rgyalt anyag
+	feldolgoz&aacute;s&aacute;hoz.</para>
 
-      <para>These chapters are designed to be read when
-	you need the information.  You do not have to read them in any
-	particular order, nor do you need to read all of them before you
-	can begin using FreeBSD.</para>
+      <para>Ezeket a fejezeteket annak &eacute;rdek&eacute;ben
+	alak&iacute;tottuk ki, hogy az adott t&eacute;m&aacute;kban
+	ismereteket adjunk.  Nincs k&ouml;zt&uuml;k semmilyen sorrendi
+	k&ouml;t&ouml;tts&eacute;g, s&#245;t, egy&aacute;ltal&aacute;n
+	nem is sz&uuml;ks&eacute;ges &#245;ket elolvasni a &os;
+	alapvet&#245; haszn&aacute;lat&aacute;hoz.</para>
     </partintro>
 
     <![ %chap.config;                   [ &chap.config;               ]]>
@@ -276,43 +315,52 @@
   </part>
 
   <part id="network-communication">
-    <title>Network Communication</title>
+    <title>H&aacute;l&oacute;zati kommunik&aacute;ci&oacute;</title>
 
     <partintro>
-      <para>FreeBSD is one of the most widely deployed operating
-        systems for high performance network servers.  The chapters in
-        this part cover:</para>
+      <para>A &os; az egyik legelterjedtebb oper&aacute;ci&oacute;s
+	rendszer a legnagyobb h&aacute;l&oacute;zati
+	teljes&iacute;tm&eacute;nyt ny&uacute;jt&oacute;
+	kiszolg&aacute;l&oacute;k k&ouml;r&eacute;ben.  Az itt
+	tal&aacute;lhat&oacute; fejezetek t&eacute;m&aacute;i:</para>
 
       <itemizedlist>
-        <listitem>
-          <para>Serial communication</para>
-        </listitem>
+	<listitem>
+	  <para>Soros kommunik&aacute;ci&oacute;</para>
+	</listitem>
 
-        <listitem>
-          <para>PPP and PPP over Ethernet</para>
-        </listitem>
+	<listitem>
+	  <para>PPP &eacute;s PPP Etherneten kereszt&uuml;l
+	    (PPPoE)</para>
+	</listitem>
 
-        <listitem>
-          <para>Electronic Mail</para>
-        </listitem>
+	<listitem>
+	  <para>Elektronikus levelez&eacute;s</para>
+	</listitem>
 
-        <listitem>
-          <para>Running Network Servers</para>
-        </listitem>
+	<listitem>
+	  <para>H&aacute;l&oacute;zati kiszolg&aacute;l&oacute;k
+	    futatt&aacute;sa</para>
+	</listitem>
 
-        <listitem>
-          <para>Firewalls</para>
-        </listitem>
+	<listitem>
+	  <para>T&#251;zfalak</para>
+	</listitem>
 
-        <listitem>
-          <para>Other Advanced Networking Topics</para>
-        </listitem>
+	<listitem>
+	  <para>Egy&eacute;b halad&oacute; h&aacute;l&oacute;zati
+	    t&eacute;m&aacute;k</para>
+	</listitem>
       </itemizedlist>
 
-      <para>These chapters are designed to be read when
-	you need the information.  You do not have to read them in any
-	particular order, nor do you need to read all of them before you
-	can begin using FreeBSD in a network environment.</para>
+      <para>Ezek a fejezetek nem &aacute;llnak egym&aacute;ssal szoros
+	kapcsolatban, csup&aacute;n egy adott
+	t&eacute;m&aacute;r&oacute;l adnak ismereteket.
+	Enn&eacute;lfogva nem k&ouml;telez&#245; &#245;ket sorrendben
+	elolvasni, valamint egy&aacute;ltal&aacute;n nem is kell
+	mindegyik&#245;j&uuml;ket &aacute;tolvasni ahhoz, hogy a &os;-t
+	h&aacute;l&oacute;zati k&ouml;rnyezetben haszn&aacute;lni
+	tudjuk.</para>
     </partintro>
 
     <![ %chap.serialcomms;              [ &chap.serialcomms;          ]]>
@@ -323,10 +371,10 @@
     <![ %chap.advanced-networking;      [ &chap.advanced-networking;  ]]>
 
   </part>
-  
+
   <part id="appendices">
-    <title>Appendices</title>
-    
+    <title>F&uuml;ggel&eacute;k</title>
+
     <![ %chap.mirrors;                  [ &chap.mirrors;              ]]>
     <![ %chap.bibliography;             [ &chap.bibliography;         ]]>
     <![ %chap.eresources;               [ &chap.eresources;           ]]>

==== //depot/projects/docproj_hu/books/handbook/colophon.sgml#2 (text+ko) ====

@@ -3,21 +3,30 @@
 
      $FreeBSD: doc/en_US.ISO8859-1/books/handbook/colophon.sgml,v 1.9 2005/08/06 02:31:55 trhodes Exp $
 -->
+<!--
+     The FreeBSD Hungarian Documentation Project
+     Tramslated by: PALI, Gabor <pgj@FreeBSD.org>
+     Original Revision: 1.9                       -->
 
-<colophon id='colophon'>
-  <para>This book is the combined work of hundreds of contributors to
-    <quote>The FreeBSD Documentation Project</quote>.  The text is
-    authored in SGML
-    according to the DocBook DTD and is formatted from SGML into many
-    different presentation formats using <application>Jade</application>,
-    an open source DSSSL
-    engine.  Norm Walsh's DSSSL stylesheets were used with an
-    additional customization layer to provide the presentation
-    instructions for <application>Jade</application>.  The printed
-    version of this document would not be possible without Donald
-    Knuth's <application>&tex;</application> typesetting language,
-    Leslie Lamport's <application>LaTeX</application>, or Sebastian
-    Rahtz's <application>JadeTeX</application> macro package.</para>
+<colophon id='colophon' lang="hu">
+  <para>Ez a k&ouml;nyv <quote>A &os; dokument&aacute;ci&oacute;s
+    projekt</quote> t&ouml;bbsz&aacute;z r&eacute;sztvev&#245;j&eacute;nek
+    egy&uuml;ttes munk&aacute;j&aacute;val j&ouml;tt l&eacute;tre.  A
+    forr&aacute;sa SGML-ben k&eacute;sz&uuml;l a DocBook DTD
+    alapj&aacute;n, &eacute;s ebb&#245;l sz&aacute;mos
+    k&uuml;l&ouml;nb&ouml;z&#245; form&aacute;tumba ker&uuml;l
+    &aacute;talak&iacute;t&aacute;sra a <application>Jade</application>,
+    a ny&iacute;lt forr&aacute;sk&oacute;d&uacute; DSSSL engine
+    seg&iacute;ts&eacute;g&eacute;vel.  Norm Walsh DSSSL
+    st&iacute;luslapjait haszn&aacute;ltuk fel egy tov&aacute;bbi
+    r&eacute;teg hozz&aacute;ad&aacute;s&aacute;val a
+    <application>Jade</application> vez&eacute;rl&eacute;s&eacute;re.  A
+    dokumentum nyomtatott v&aacute;ltozata nem j&ouml;hetett volna
+    l&eacute;tre Donald Knuth <application>&tex;</application>
+    bet&#251;szed&#245; rendszere, ill.  Leslie Lamport
+    <application>&latex;</application> vagy Sebastian Rahtz
+    <application>JadeTeX</application> makr&oacute;csomagja
+    n&eacute;lk&uuml;l.</para>
 </colophon>
 
 <!-- 

From owner-p4-projects@FreeBSD.ORG  Mon Oct  1 05:53:23 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4C8FA16A421; Mon,  1 Oct 2007 05:53:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CD7AD16A41A
	for <perforce@freebsd.org>; Mon,  1 Oct 2007 05:53:22 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B746213C468
	for <perforce@freebsd.org>; Mon,  1 Oct 2007 05:53:22 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l915rMXZ031334
	for <perforce@freebsd.org>; Mon, 1 Oct 2007 05:53:22 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l915rMfO031331
	for perforce@freebsd.org; Mon, 1 Oct 2007 05:53:22 GMT
	(envelope-from imp@freebsd.org)
Date: Mon, 1 Oct 2007 05:53:22 GMT
Message-Id: <200710010553.l915rMfO031331@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127056 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2007 05:53:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=127056

Change 127056 by imp@imp_paco-paco on 2007/10/01 05:52:50

	
	We link now.  Define the cpu_* routines that had been
	undefined in orion_machdep.c.  Document this and some other
	random notes about the next steps for this port.  I need to at
	least connect the serial port to the orion bus to get a good
	serial console.  Fortunately, it appears that a 16550CF compatible
	interface is what's used on this part.

Affected files ...

.. //depot/projects/arm/src/sys/arm/orion/Orion-Port#3 edit
.. //depot/projects/arm/src/sys/arm/orion/orion.c#3 edit
.. //depot/projects/arm/src/sys/arm/orion/orion_machdep.c#3 edit

Differences ...

==== //depot/projects/arm/src/sys/arm/orion/Orion-Port#3 (text+ko) ====

@@ -81,3 +81,22 @@
 ../../../kern/kern_clock.c:389: undefined reference to `cpu_stopprofclock'
 ../../../kern/kern_clock.c:362: undefined reference to `cpu_startprofclock'
 ../../../kern/kern_shutdown.c:484: undefined reference to `cpu_reset'
+
+20070930: 23:30-23:45
+o Added dummy defines for the cpu_ functions from last entry to
+  orion_machdep.c.  The at91 port has these in at91_st, which defines its
+  normal time keeping hardware.  Maybe a move would be warranted after bit.
+o Thought I needed to update the generic_bs_armv4 to v5 since this is an armv5
+  processor.  However, the armv4 macros are used in armv5 parts that NetBSD
+  supports, and there are no armv5 special macros.  I've not looked the new
+  armv6 branch in NetBSD to see if there's anything necessary there or not.
+o orion kernel now links.  I doubt we'll get that far into arm_init(), and
+  there's likely some threading together of the init code that hasn't been put
+  in place yet as I've not quite worked out many of the details.  Many of the
+  details will have to wait until I can get documentation on the memory map
+  for this part, or puzzle out same from the Orion2 linux patches that were
+  posted over the summer.
+o kernel.bin can be loaded directly with the uboot boot loader that's on these
+  boards.  Otherwise, mkimage needs to be run to put the right kind of header
+  onto the kernel.
+

==== //depot/projects/arm/src/sys/arm/orion/orion.c#3 (text+ko) ====

@@ -102,8 +102,6 @@
 bs_protos(generic);
 bs_protos(generic_armv4);
 
-/* XXX likely need to use generic_armv5 in places */
-
 struct bus_space orion_bs_tag = {
 	/* cookie */
 	(void *) 0,

==== //depot/projects/arm/src/sys/arm/orion/orion_machdep.c#3 (text+ko) ====

@@ -191,11 +191,63 @@
 #endif
 
 void
+cpu_initclocks(void)
+{
+#if 0
+	int rel_value;
+	struct resource *irq;
+	int rid = 0;
+	void *ih;
+	device_t dev = timer_softc->sc_dev;
+
+	rel_value = 32768 / hz;
+	if (rel_value < 1)
+		rel_value = 1;
+	if (32768 % hz) {
+		printf("Cannot get %d Hz clock; using %dHz\n", hz, 32768 / rel_value);
+		hz = 32768 / rel_value;
+		tick = 1000000 / hz;
+	}
+	/* Disable all interrupts. */
+	WR4(ST_IDR, 0xffffffff);
+	/* The system timer shares the system irq (1) */
+	irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 1, 1, 1,
+	  RF_ACTIVE | RF_SHAREABLE);
+	if (!irq)
+		panic("Unable to allocate irq for the system timer");
+	else
+		bus_setup_intr(dev, irq, INTR_TYPE_CLK,
+		    clock_intr, NULL, NULL, &ih);
+
+	WR4(ST_PIMR, rel_value);
+
+	/* Enable PITS interrupts. */
+	WR4(ST_IER, ST_SR_PITS);
+	tc_init(&at91st_timecounter);
+#endif
+}
+void
 DELAY(int us)
 {
 	/* XXX write me */
 }
 
+void
+cpu_startprofclock(void)
+{
+}
+
+void
+cpu_stopprofclock(void)
+{
+}
+
+void
+cpu_reset(void)
+{
+    /* XXX Write me */
+}
+
 static long
 ramsize(void)
 {

From owner-p4-projects@FreeBSD.ORG  Mon Oct  1 10:04:10 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 71F0E16A41A; Mon,  1 Oct 2007 10:04:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 278E516A417
	for <perforce@freebsd.org>; Mon,  1 Oct 2007 10:04:10 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B55113C4A5
	for <perforce@freebsd.org>; Mon,  1 Oct 2007 10:04:10 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l91A49Jl060478
	for <perforce@freebsd.org>; Mon, 1 Oct 2007 10:04:09 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l91A49rK060475
	for perforce@freebsd.org; Mon, 1 Oct 2007 10:04:09 GMT
	(envelope-from thompsa@freebsd.org)
Date: Mon, 1 Oct 2007 10:04:09 GMT
Message-Id: <200710011004.l91A49rK060475@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127059 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2007 10:04:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=127059

Change 127059 by thompsa@thompsa_heff on 2007/10/01 10:03:57

	- drop default debug level back to 0
	- use macro names for locking
	- add _locked versions of some functions
	- only do partial config in monitor mode
	- set the channel passed from net80211
	
	Obtained from:	sam (mostly)

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#28 edit
.. //depot/projects/wifi/sys/dev/ipw/if_ipwreg.h#8 edit
.. //depot/projects/wifi/sys/dev/ipw/if_ipwvar.h#10 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#28 (text+ko) ====

@@ -4,6 +4,7 @@
  * Copyright (c) 2004-2006
  *      Damien Bergamini <damien.bergamini@free.fr>. All rights reserved.
  * Copyright (c) 2006 Sam Leffler, Errno Consulting
+ * Copyright (c) 2007 Andrew Thompson <thompsa@FreeBSD.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -83,7 +84,7 @@
 #ifdef IPW_DEBUG
 #define DPRINTF(x)	do { if (ipw_debug > 0) printf x; } while (0)
 #define DPRINTFN(n, x)	do { if (ipw_debug >= (n)) printf x; } while (0)
-int ipw_debug = 3;
+int ipw_debug = 0;
 SYSCTL_INT(_debug, OID_AUTO, ipw, CTLFLAG_RW, &ipw_debug, 0, "ipw debug level");
 #else
 #define DPRINTF(x)
@@ -112,9 +113,9 @@
 static void	ipw_media_status(struct ifnet *, struct ifmediareq *);
 static int	ipw_newstate(struct ieee80211com *, enum ieee80211_state, int);
 static uint16_t	ipw_read_prom_word(struct ipw_softc *, uint8_t);
-static void	ipw_command_intr(struct ipw_softc *, struct ipw_soft_buf *);
-static void	ipw_newstate_intr(struct ipw_softc *, struct ipw_soft_buf *);
-static void	ipw_data_intr(struct ipw_softc *, struct ipw_status *,
+static void	ipw_rx_cmd_intr(struct ipw_softc *, struct ipw_soft_buf *);
+static void	ipw_rx_newstate_intr(struct ipw_softc *, struct ipw_soft_buf *);
+static void	ipw_rx_data_intr(struct ipw_softc *, struct ipw_status *,
 		    struct ipw_soft_bd *, struct ipw_soft_buf *);
 static void	ipw_rx_intr(struct ipw_softc *);
 static void	ipw_release_sbd(struct ipw_softc *, struct ipw_soft_bd *);
@@ -126,6 +127,7 @@
 static int	ipw_tx_start(struct ifnet *, struct mbuf *,
 		    struct ieee80211_node *);
 static void	ipw_start(struct ifnet *);
+static void	ipw_start_locked(struct ifnet *);
 static void	ipw_watchdog(void *);
 static int	ipw_ioctl(struct ifnet *, u_long, caddr_t);
 static void	ipw_stop_master(struct ipw_softc *);
@@ -139,7 +141,9 @@
 static int	ipw_config(struct ipw_softc *);
 static void	ipw_init_task(void *, int);
 static void	ipw_init(void *);
+static void	ipw_init_locked(struct ipw_softc *, int);
 static void	ipw_stop(void *);
+static void	ipw_stop_locked(struct ipw_softc *);
 static int	ipw_sysctl_stats(SYSCTL_HANDLER_ARGS);
 static int	ipw_sysctl_radio(SYSCTL_HANDLER_ARGS);
 static uint32_t	ipw_read_table1(struct ipw_softc *, uint32_t);
@@ -738,18 +742,19 @@
 {
 	struct ipw_softc *sc = device_get_softc(dev);
 	struct ifnet *ifp = sc->sc_ic.ic_ifp;
+	IPW_LOCK_DECL;
 
-	mtx_lock(&sc->sc_mtx);
+	IPW_LOCK(sc);
 
 	pci_write_config(dev, 0x41, 0, 1);
 
 	if (ifp->if_flags & IFF_UP) {
-		ifp->if_init(ifp->if_softc);
+		ipw_init_locked(sc, 0);
 		if (ifp->if_drv_flags & IFF_DRV_RUNNING)
-			ifp->if_start(ifp);
+			ipw_start_locked(ifp);
 	}
 
-	mtx_unlock(&sc->sc_mtx);
+	IPW_UNLOCK(sc);
 
 	return 0;
 }
@@ -759,21 +764,19 @@
 {
 	struct ipw_softc *sc = ifp->if_softc;
 	int error;
+	IPW_LOCK_DECL;
 
-	mtx_lock(&sc->sc_mtx);
-
+	IPW_LOCK(sc);
 	error = ieee80211_media_change(ifp);
-	if (error != ENETRESET) {
-		mtx_unlock(&sc->sc_mtx);
-		return error;
+	if (error == ENETRESET) {
+		if ((ifp->if_flags & IFF_UP) &&
+		    (ifp->if_drv_flags & IFF_DRV_RUNNING))
+			ipw_init_locked(sc, 0);
+		error = 0;
 	}
+	IPW_UNLOCK(sc);
 
-	if ((ifp->if_flags & IFF_UP) && (ifp->if_drv_flags & IFF_DRV_RUNNING))
-		ipw_init(sc);
-
-	mtx_unlock(&sc->sc_mtx);
-
-	return 0;
+	return (error);
 }
 
 /*
@@ -960,7 +963,7 @@
 }
 
 static void
-ipw_command_intr(struct ipw_softc *sc, struct ipw_soft_buf *sbuf)
+ipw_rx_cmd_intr(struct ipw_softc *sc, struct ipw_soft_buf *sbuf)
 {
 	struct ipw_cmd *cmd;
 
@@ -978,7 +981,7 @@
 }
 
 static void
-ipw_newstate_intr(struct ipw_softc *sc, struct ipw_soft_buf *sbuf)
+ipw_rx_newstate_intr(struct ipw_softc *sc, struct ipw_soft_buf *sbuf)
 {
 #define	IEEESTATE(ic)	ieee80211_state_name[ic->ic_state]
 	struct ieee80211com *ic = &sc->sc_ic;
@@ -1002,7 +1005,7 @@
 
 	case IPW_STATE_SCANNING:
 		DPRINTFN(3, ("Scanning (%s flags 0x%x)\n",
-			    IEEESTATE(ic), sc->flags));
+			IEEESTATE(ic), sc->flags));
 		/*
 		 * NB: Check driver state for association on assoc
 		 * loss as the firmware will immediately start to
@@ -1051,7 +1054,7 @@
 		DPRINTFN(2, ("Radio off (%s flags 0x%x)\n",
 			IEEESTATE(ic), sc->flags));
 		ic->ic_ifp->if_flags &= ~IFF_UP;
-		ipw_stop(sc);
+		ipw_stop_locked(sc);
 		break;
 
 	default:
@@ -1125,7 +1128,7 @@
 }
 
 static void
-ipw_data_intr(struct ipw_softc *sc, struct ipw_status *status,
+ipw_rx_data_intr(struct ipw_softc *sc, struct ipw_status *status,
     struct ipw_soft_bd *sbd, struct ipw_soft_buf *sbuf)
 {
 	struct ieee80211com *ic = &sc->sc_ic;
@@ -1135,6 +1138,7 @@
 	struct ieee80211_node *ni;
 	bus_addr_t physaddr;
 	int error;
+	IPW_LOCK_DECL;
 
 	DPRINTFN(5, ("received frame len=%u, rssi=%u\n", le32toh(status->len),
 	    status->rssi));
@@ -1192,7 +1196,7 @@
 		struct ipw_rx_radiotap_header *tap = &sc->sc_rxtap;
 
 		tap->wr_flags = 0;
-		tap->wr_antsignal = status->rssi;
+		tap->wr_antsignal = status->rssi + IPW_RSSI_TO_DBM;
 		tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq);
 		tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags);
 
@@ -1203,7 +1207,7 @@
 		ipw_fix_channel(sc, m);
 
 	wh = mtod(m, struct ieee80211_frame *);
-	mtx_unlock(&sc->sc_mtx);
+	IPW_UNLOCK(sc);
 	ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh);
 
 	/* send the frame to the 802.11 layer */
@@ -1211,7 +1215,7 @@
 
 	/* node is no longer needed */
 	ieee80211_free_node(ni);
-	mtx_lock(&sc->sc_mtx);
+	IPW_LOCK(sc);
 
 	bus_dmamap_sync(sc->rbd_dmat, sc->rbd_map, BUS_DMASYNC_PREWRITE);
 }
@@ -1239,16 +1243,16 @@
 
 		switch (le16toh(status->code) & 0xf) {
 		case IPW_STATUS_CODE_COMMAND:
-			ipw_command_intr(sc, sbuf);
+			ipw_rx_cmd_intr(sc, sbuf);
 			break;
 
 		case IPW_STATUS_CODE_NEWSTATE:
-			ipw_newstate_intr(sc, sbuf);
+			ipw_rx_newstate_intr(sc, sbuf);
 			break;
 
 		case IPW_STATUS_CODE_DATA_802_3:
 		case IPW_STATUS_CODE_DATA_802_11:
-			ipw_data_intr(sc, status, sbd, sbuf);
+			ipw_rx_data_intr(sc, status, sbd, sbuf);
 			break;
 
 		case IPW_STATUS_CODE_NOTIFICATION:
@@ -1345,7 +1349,7 @@
 	sc->txold = (r == 0) ? IPW_NTBD - 1 : r - 1;
 
 	ifp->if_drv_flags &= ~IFF_DRV_OACTIVE;
-	ipw_start(ifp);
+	ipw_start_locked(ifp);
 }
 
 static void
@@ -1353,11 +1357,12 @@
 {
 	struct ipw_softc *sc = arg;
 	uint32_t r;
+	IPW_LOCK_DECL;
 
-	mtx_lock(&sc->sc_mtx);
+	IPW_LOCK(sc);
 
 	if ((r = CSR_READ_4(sc, IPW_CSR_INTR)) == 0 || r == 0xffffffff) {
-		mtx_unlock(&sc->sc_mtx);
+		IPW_UNLOCK(sc);
 		return;
 	}
 
@@ -1385,7 +1390,7 @@
 	/* re-enable interrupts */
 	CSR_WRITE_4(sc, IPW_CSR_INTR_MASK, IPW_INTR_MASK);
 
-	mtx_unlock(&sc->sc_mtx);
+	IPW_UNLOCK(sc);
 }
 
 static void
@@ -1457,9 +1462,6 @@
 	bus_addr_t physaddr;
 	int error;
 
-	if (mtx_recursed(&sc->sc_mtx))
-		device_printf(sc->sc_dev, "OMG, msleeping on a recursed mtx\n");
-
 	if (sc->flags & IPW_FLAG_BUSY) {
 		device_printf(sc->sc_dev, "%s: %s not sent, busy\n",
 			__func__, ipw_cmdname(type));
@@ -1677,17 +1679,26 @@
 ipw_start(struct ifnet *ifp)
 {
 	struct ipw_softc *sc = ifp->if_softc;
+	IPW_LOCK_DECL;
+
+	IPW_LOCK(sc);
+	ipw_start_locked(ifp);
+	IPW_UNLOCK(sc);
+}
+
+static void
+ipw_start_locked(struct ifnet *ifp)
+{
+	struct ipw_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct mbuf *m0;
 	struct ether_header *eh;
 	struct ieee80211_node *ni;
 
-	mtx_lock(&sc->sc_mtx);
+	IPW_LOCK_ASSERT(sc);
 
-	if (ic->ic_state != IEEE80211_S_RUN) {
-		mtx_unlock(&sc->sc_mtx);
+	if (ic->ic_state != IEEE80211_S_RUN)
 		return;
-	}
 
 	for (;;) {
 		IFQ_DRV_DEQUEUE(&ifp->if_snd, m0);
@@ -1730,8 +1741,6 @@
 		/* start watchdog timer */
 		sc->sc_tx_timer = 5;
 	}
-
-	mtx_unlock(&sc->sc_mtx);
 }
 
 static void
@@ -1741,7 +1750,7 @@
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = sc->sc_ifp;
 
-	mtx_assert(&sc->sc_mtx, MA_OWNED);
+	IPW_LOCK_ASSERT(sc);
 
 	if (sc->sc_tx_timer > 0) {
 		if (--sc->sc_tx_timer == 0) {
@@ -1771,17 +1780,18 @@
 	struct ipw_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
 	int error = 0;
+	IPW_LOCK_DECL;
 
-	mtx_lock(&sc->sc_mtx);
+	IPW_LOCK(sc);
 
 	switch (cmd) {
 	case SIOCSIFFLAGS:
 		if (ifp->if_flags & IFF_UP) {
 			if (!(ifp->if_drv_flags & IFF_DRV_RUNNING))
-				ipw_init(sc);
+				ipw_init_locked(sc, 0);
 		} else {
 			if (ifp->if_drv_flags & IFF_DRV_RUNNING)
-				ipw_stop(sc);
+				ipw_stop_locked(sc);
 		}
 		break;
 
@@ -1791,12 +1801,13 @@
 
 	if (error == ENETRESET) {
 		if ((ifp->if_flags & IFF_UP) &&
-		    (ifp->if_drv_flags & IFF_DRV_RUNNING))
-			ipw_init(sc);
+		    (ifp->if_drv_flags & IFF_DRV_RUNNING) &&
+		    (ic->ic_roaming != IEEE80211_ROAMING_MANUAL))
+			ipw_init_locked(sc, 0);
 		error = 0;
 	}
 
-	mtx_unlock(&sc->sc_mtx);
+	IPW_UNLOCK(sc);
 
 	return error;
 }
@@ -2049,7 +2060,7 @@
 	wpaie.len = htole32(ielen);
 	/* XXX verify length */
 	memcpy(&wpaie.ie, ie, ielen);
-	DPRINTF(("Setting wpa ie\n"));
+	DPRINTF(("Setting WPA IE\n"));
 	return ipw_cmd(sc, IPW_CMD_SET_WPA_IE, &wpaie, sizeof(wpaie));
 }
 
@@ -2114,10 +2125,11 @@
 ipw_scan_task(void *context, int pending)
 {
 	struct ipw_softc *sc = context;
+	IPW_LOCK_DECL;
 
-	mtx_lock(&sc->sc_mtx);
+	IPW_LOCK(sc);
 	ipw_scan(sc);
-	mtx_unlock(&sc->sc_mtx);
+	IPW_UNLOCK(sc);
 }
 
 static int
@@ -2222,7 +2234,7 @@
 	}
 
 	if (ic->ic_opmode == IEEE80211_M_MONITOR)
-		ipw_enable(sc);
+		return ipw_enable(sc);
 
 	IEEE80211_ADDR_COPY(ic->ic_myaddr, IF_LLADDR(ifp));
 	DPRINTF(("Setting MAC address to %6D\n", ic->ic_myaddr, ":"));
@@ -2367,10 +2379,11 @@
 ipw_assoc_task(void *context, int pending)
 {
 	struct ipw_softc *sc = context;
+	IPW_LOCK_DECL;
 
-	mtx_lock(&sc->sc_mtx);
+	IPW_LOCK(sc);
 	ipw_auth_and_assoc(sc);
-	mtx_unlock(&sc->sc_mtx);
+	IPW_UNLOCK(sc);
 }
 
 static int
@@ -2475,35 +2488,38 @@
 ipw_init(void *priv)
 {
 	struct ipw_softc *sc = priv;
+	IPW_LOCK_DECL;
+
+	IPW_LOCK(sc);
+	ipw_init_locked(sc, 0);
+	IPW_UNLOCK(sc);
+}
+
+static void
+ipw_init_locked(struct ipw_softc *sc, int force)
+{
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = ic->ic_ifp;
 	const struct firmware *fp;
 	const struct ipw_firmware_hdr *hdr;
 	const char *imagename, *fw;
-	int owned;
+	IPW_LOCK_DECL;
+
+	IPW_LOCK_ASSERT(sc);
 
-	/*
-	 * ipw_init() is exposed through ifp->if_init so it might be called
-	 * without the driver's lock held.  Since msleep() doesn't like being
-	 * called on a recursed mutex, we acquire the driver's lock only if
-	 * we're not already holding it.
-	 */
-	if (!(owned = mtx_owned(&sc->sc_mtx)))
-		mtx_lock(&sc->sc_mtx);
+	DPRINTF(("%s: state %s flags 0x%x\n", __func__,
+		ieee80211_state_name[ic->ic_state], sc->flags));
 
 	/*
 	 * Avoid re-entrant calls.  We need to release the mutex in ipw_init()
 	 * when loading the firmware and we don't want to be called during this
 	 * operation.
 	 */
-	if (sc->flags & IPW_FLAG_INIT_LOCKED) {
-		if (!owned)
-			mtx_unlock(&sc->sc_mtx);
+	if (sc->flags & IPW_FLAG_INIT_LOCKED)
 		return;
-	}
 	sc->flags |= IPW_FLAG_INIT_LOCKED;
 
-	ipw_stop(sc);
+	ipw_stop_locked(sc);
 
 	if (ipw_reset(sc) != 0) {
 		device_printf(sc->sc_dev, "could not reset adapter\n");
@@ -2530,11 +2546,11 @@
 	 */
 	if (sc->sc_firmware == NULL || strcmp(sc->sc_firmware->name,
 	    imagename) != 0) {
-		mtx_unlock(&sc->sc_mtx);
+		IPW_UNLOCK(sc);
 		if (sc->sc_firmware != NULL)
 			firmware_put(sc->sc_firmware, FIRMWARE_UNLOAD);
 		sc->sc_firmware = firmware_get(imagename);
-		mtx_lock(&sc->sc_mtx);
+		IPW_LOCK(sc);
 	}
 
 	if (sc->sc_firmware == NULL) {
@@ -2559,6 +2575,7 @@
 		goto fail2;
 	}
 
+	DPRINTF(("Loading firmware image '%s'\n", imagename));
 	fw = (const char *)fp->data + sizeof *hdr + le32toh(hdr->mainsz);
 	if (ipw_load_ucode(sc, fw, le32toh(hdr->ucodesz)) != 0) {
 		device_printf(sc->sc_dev, "could not load microcode\n");
@@ -2613,7 +2630,7 @@
 		 * we need to notify user apps so they can manually
 		 * get us going again.
 		 */
-		if (ic->ic_roaming != IEEE80211_ROAMING_MANUAL)
+		if (ic->ic_roaming != IEEE80211_ROAMING_MANUAL || force)
 			ieee80211_new_state(ic, IEEE80211_S_SCAN, 0);
 	} else
 		ieee80211_new_state(ic, IEEE80211_S_RUN, -1);
@@ -2623,30 +2640,34 @@
 	ifp->if_drv_flags |= IFF_DRV_RUNNING;
 
 	sc->flags &=~ IPW_FLAG_INIT_LOCKED;
-
-	if (!owned)
-		mtx_unlock(&sc->sc_mtx);
-
 	return;
 
 fail2:	firmware_put(fp, FIRMWARE_UNLOAD);
 	sc->sc_firmware = NULL;
 fail1:	ifp->if_flags &= ~IFF_UP;
-	ipw_stop(sc);
+	ipw_stop_locked(sc);
 	sc->flags &=~ IPW_FLAG_INIT_LOCKED;
-	if (!owned)
-		mtx_unlock(&sc->sc_mtx);
 }
 
 static void
 ipw_stop(void *priv)
 {
 	struct ipw_softc *sc = priv;
+	IPW_LOCK_DECL;
+
+	IPW_LOCK(sc);
+	ipw_stop_locked(sc);
+	IPW_UNLOCK(sc);
+}
+
+static void
+ipw_stop_locked(struct ipw_softc *sc)
+{
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct ifnet *ifp = ic->ic_ifp;
 	int i;
 
-	mtx_lock(&sc->sc_mtx);
+	IPW_LOCK_ASSERT(sc);
 
 	ieee80211_new_state(ic, IEEE80211_S_INIT, -1);
 
@@ -2663,8 +2684,6 @@
 
 	sc->sc_tx_timer = 0;
 	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
-
-	mtx_unlock(&sc->sc_mtx);
 }
 
 static int
@@ -2764,12 +2783,12 @@
 {
 	struct ifnet *ifp = ic->ic_ifp;
 	struct ipw_softc *sc = ifp->if_softc;
+	IPW_LOCK_DECL;
 
-	device_printf(sc->sc_dev, "%s\n", __func__);
-	mtx_lock(&sc->sc_mtx);
+	IPW_LOCK(sc);
 	if (!(sc->flags & IPW_FLAG_SCANNING))
 		taskqueue_enqueue_fast(taskqueue_fast, &sc->sc_scan_task);
-	mtx_unlock(&sc->sc_mtx);
+	IPW_UNLOCK(sc);
 }
 
 static void
@@ -2777,17 +2796,20 @@
 {
 	struct ifnet *ifp = ic->ic_ifp;
 	struct ipw_softc *sc = ifp->if_softc;
+	IPW_LOCK_DECL;
 
-	device_printf(sc->sc_dev, "%s\n", __func__);
+	IPW_LOCK(sc);
+	if (ic->ic_opmode == IEEE80211_M_IBSS ||
+	    ic->ic_opmode == IEEE80211_M_MONITOR) {
+		ipw_setchannel(sc, ic->ic_curchan);
+	}
+	IPW_UNLOCK(sc);
 }
 
 static void
 ipw_scan_curchan(struct ieee80211com *ic, unsigned long maxdwell)
 {
-	struct ifnet *ifp = ic->ic_ifp;
-	struct ipw_softc *sc = ifp->if_softc;
-
-	device_printf(sc->sc_dev, "%s\n", __func__);
+	/* NB: all channels are scanned at once */
 }
 
 static void
@@ -2801,9 +2823,9 @@
 {
 	struct ifnet *ifp = ic->ic_ifp;
 	struct ipw_softc *sc = ifp->if_softc;
+	IPW_LOCK_DECL;
 
-	device_printf(sc->sc_dev, "%s\n", __func__);
-	mtx_lock(&sc->sc_mtx);
+	IPW_LOCK(sc);
 	sc->flags &= ~IPW_FLAG_SCANNING;
-	mtx_unlock(&sc->sc_mtx);
+	IPW_UNLOCK(sc);
 }

==== //depot/projects/wifi/sys/dev/ipw/if_ipwreg.h#8 (text+ko) ====


==== //depot/projects/wifi/sys/dev/ipw/if_ipwvar.h#10 (text+ko) ====

@@ -168,3 +168,18 @@
 #define sc_txtap	sc_txtapu.th
 	int				sc_txtap_len;
 };
+
+/*
+ * NB.: This models the only instance of async locking in ipw_init_locked
+ *	and must be kept in sync.
+ */
+#define	IPW_LOCK_DECL	int	__waslocked = 0
+#define IPW_LOCK(sc)	do {				\
+	if (!(__waslocked = mtx_owned(&(sc)->sc_mtx)))	\
+		mtx_lock(&sc->sc_mtx);			\
+} while (0)
+#define IPW_UNLOCK(sc)	do {				\
+	if (!__waslocked)				\
+		mtx_unlock(&sc->sc_mtx);		\
+} while (0)
+#define IPW_LOCK_ASSERT(sc)	mtx_assert(&(sc)->sc_mtx, MA_OWNED)

From owner-p4-projects@FreeBSD.ORG  Mon Oct  1 17:10:01 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 30CFD16A468; Mon,  1 Oct 2007 17:10:01 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DD95A16A420
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 17:10:00 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D928213C467
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 17:10:00 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l91HA0K6011367
	for <perforce@FreeBSD.org>; Mon, 1 Oct 2007 17:10:00 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l91HA02U011356
	for perforce@freebsd.org; Mon, 1 Oct 2007 17:10:00 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 1 Oct 2007 17:10:00 GMT
Message-Id: <200710011710.l91HA02U011356@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127064 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2007 17:10:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=127064

Change 127064 by hselasky@hselasky_laptop001 on 2007/10/01 17:09:40

	
	FYI: The comments follow the P4 diff from top to bottom.
	
	In general the changes in diff are about getting the OHCI HC
	driver up to date with the latest changes in the USB API. The
	changes follow the changes made to ehci.c and uhci.c. See
	change xxx and change xxx.
	
	- replace ADD_BYTES() by USBD_ADD_BYTES()
	
	- "xfer->frlengths[]" is not 32-bit unsigned
	
	- new function "ohci_non_isoc_done_sub()". The main puropose
	  of this function is to scan an USB BULK/INTERRUPT/CONTROL
	  descriptor chain and extract information. This function will
	  update "xfer->frlengths[]" to the actual transfer length.
	
	- update "ohci_non_isoc_done()" to use "ohci_non_isoc_done_sub()"
	  instead of scanning the TD chain by itself.
	
	- new function "ohci_check_transfer_sub()". The main purpose
	  of this function is to setup the next short incoming
	  transfer in case multiple short frames should be received.
	
	- update "ohci_check_transfer()" to use "ohci_check_transfer_sub()".
	
	- parts of "ohci_rhsc_enable()" has been factored out 
	  into "usbd_std_root_transfer()".
	
	- new function "ohci_setup_standard_chain_sub()". The main
	  purpose of this function is to build up DMA chains for BULK,
	  INTERRUPT and CONTROL transfers. This function will queue 4K
	  bytes worth of data per transfer descriptor.
	
	- changes to "ohci_setup_standard_chain()". The code is
	  doing exactly the same, just refactored a little bit.
	
	- use "xfer->max_frame_size" instead of "xfer->max_packet_size".
	  The two values should be identical for the OHCI HC driver.
	
	- "ohci_root_intr_done()" is doing the same like before, only
	  now using a temporary scratch buffer in the "struct ohci_softc"
	  which is called "sc->sc_hub_idata".
	
	- "usbd_transfer_done()" is now part of "usbd_transfer_dequeue()"
	
	- updated several "flags & XXX" to "flags{_int}.xxx".
	
	- substituted MS_TO_TICKS by USBD_MS_TO_TICKS.
	
	- "usbd_std_ctrl_enter()" is now obsolete and factored out
	  like a standard part of "usbd_start_hardware()".
	
	- check for "nframes == 0" has been factored out as a part of
	  "usbd_start_hardware()".
	
	- moved inversion operator outside of "htoleXX", hence a year
	  ago there was a bug in this macro that didn't handle this case
	  properly.
	
	- the new function "ohci_root_ctrl_task_td_sub()" does the
	  same as "ohci_root_ctrl_task_td()", but through the standard
	  root transfer framework.
	
	- major parts of "ohci_xfer_setup()" has been factored out and
	  only the OHCI specific part is left. Across all the Host
	  Controller Drivers this saves some code.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ohci.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.h#11 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/ohci.c#31 (text+ko) ====

@@ -76,7 +76,6 @@
 #include <dev/usb/usb_subr.h>
 #include <dev/usb/ohci.h>
 
-#define MS_TO_TICKS(ms) (((ms) * hz) / 1000)
 #define OHCI_BUS2SC(bus) ((ohci_softc_t *)(((u_int8_t *)(bus)) - \
    POINTER_TO_UNSIGNED(&(((ohci_softc_t *)0)->sc_bus))))
 
@@ -123,10 +122,25 @@
 static void ohci_root_ctrl_task_td(struct ohci_softc *sc, struct thread *ctd);
 static void ohci_do_poll(struct usbd_bus *bus);
 
+static usbd_std_root_transfer_func_t ohci_root_intr_done;
+static usbd_std_root_transfer_func_t ohci_root_ctrl_task_td_sub;
+
 #define SC_HW_PHYSADDR(sc,what) \
   ((sc)->sc_hw_page.physaddr + \
    POINTER_TO_UNSIGNED(&(((struct ohci_hw_softc *)0)->what)))
 
+struct ohci_std_temp {
+	struct usbd_page_cache *pc;
+	ohci_td_t *td;
+	ohci_td_t *td_next;
+	uint32_t average;
+	uint32_t td_flags;
+	uint32_t len;
+	uint16_t max_frame_size;
+	uint8_t shortpkt;
+	uint8_t setup_alt_next;
+};
+
 static usbd_status
 ohci_controller_init(ohci_softc_t *sc)
 {
@@ -734,8 +748,7 @@
 ohci_isoc_done(struct usbd_xfer *xfer)
 {
 	u_int8_t nframes;
-	u_int32_t actlen = 0;
-	u_int16_t *plen = xfer->frlengths;
+	uint32_t *plen = xfer->frlengths;
 	__volatile__ u_int16_t *olen;
 	u_int16_t len = 0;
 	ohci_itd_t *td = xfer->td_transfer_first;
@@ -782,7 +795,6 @@
 			}
 
 			*plen = len;
-			actlen += len;
 			plen++;
 			olen++;
 		}
@@ -796,7 +808,8 @@
 
 		td = td->obj_next;
 	}
-	xfer->actlen = actlen;
+
+	xfer->aframes = xfer->nframes;
 	ohci_device_done(xfer,USBD_NORMAL_COMPLETION);
 	return;
 }
@@ -827,98 +840,226 @@
 };
 #endif
 
+static usbd_status
+ohci_non_isoc_done_sub(struct usbd_xfer *xfer)
+{
+	ohci_td_t *td;
+	ohci_td_t *td_alt_next;
+	uint32_t temp;
+	uint32_t phy_start;
+	uint32_t phy_end;
+	uint32_t td_flags;
+	uint16_t cc;
+
+	td = xfer->td_transfer_cache;
+	td_alt_next = td->alt_next;
+	td_flags = 0;
+
+ 	while (1) {
+
+	    usbd_page_dma_exit(td->page);
+	    phy_start = le32toh(td->td_cbp);
+	    td_flags = le32toh(td->td_flags);
+	    cc = OHCI_TD_GET_CC(td_flags);
+
+	    if (phy_start) {
+		/* 
+		 * short transfer - compute the number of
+		 * remaining bytes in the hardware buffer:
+		 */
+		phy_end = le32toh(td->td_be);
+		temp = (OHCI_PAGE(phy_start ^ phy_end) ? 
+			(OHCI_PAGE_SIZE+1) : 0x0001);
+		temp += OHCI_PAGE_OFFSET(phy_end);
+		temp -= OHCI_PAGE_OFFSET(phy_start);
+
+		if (temp > td->len) {
+		    /* guard against corruption */
+		    td_flags = OHCI_TD_SET_CC(OHCI_CC_STALL);
+		} else if (xfer->aframes != xfer->nframes) {
+		    /* subtract remaining length from "frlengths[]" */
+		    xfer->frlengths[xfer->aframes] -= temp;
+		}
+	    }
+
+	    usbd_page_dma_enter(td->page);
+
+	    /* Check for last transfer */
+	    if (((void *)td) == xfer->td_transfer_last) {
+		td = NULL;
+		break;
+	    }
+
+	    /* Check transfer status */
+	    if (cc) {
+		/* the transfer is finished */
+		td = NULL;
+		break;
+	    }
+
+	    /* Check for short transfer */
+	    if (phy_start) {
+		if (xfer->flags_int.short_frames_ok) {
+		    /* follow alt next */
+		    td = td->alt_next;
+		} else {
+		    /* the transfer is finished */
+		    td = NULL;
+		}
+		break;
+	    }
+
+	    td = td->obj_next;
+
+	    if (td->alt_next != td_alt_next) {
+		/* this USB frame is complete */
+		break;
+	    }
+	}
+
+	/* update transfer cache */
+
+	xfer->td_transfer_cache = td;
+
+	DPRINTFN(15,("error cc=%d (%s)\n",
+	    cc, ohci_cc_strs[cc]));
+
+	return ((cc == 0) ? USBD_NORMAL_COMPLETION :
+		(cc == OHCI_CC_STALL) ? USBD_STALLED : USBD_IOERROR);
+}
+
 static void
 ohci_non_isoc_done(struct usbd_xfer *xfer)
 {
-	u_int16_t cc = 0;
-	u_int32_t actlen = 0;
-	u_int32_t len;
-	u_int32_t temp;
-	u_int32_t phy_start;
-	u_int32_t phy_end;
-	uint32_t td_flags;
-	ohci_td_t *td = xfer->td_transfer_first;
+	usbd_status err = 0;
 
 	DPRINTFN(12, ("xfer=%p pipe=%p transfer done\n",
 		      xfer, xfer->pipe));
 
 #ifdef USB_DEBUG
-	if(ohcidebug > 10)
-	{
-		ohci_dump_tds(td);
+	if (ohcidebug > 10) {
+		ohci_dump_tds(xfer->td_transfer_first);
 	}
 #endif
 
-	while(1)
-	{
-		if(td == NULL)
-		{
-			panic("%s:%d: out of TD's\n",
-			      __FUNCTION__, __LINE__);
-		}
+	/* reset scanner */
+
+	xfer->td_transfer_cache = xfer->td_transfer_first;
+
+	if (xfer->flags_int.control_xfr &&
+	    xfer->flags_int.control_hdr) {
+
+	    err = ohci_non_isoc_done_sub(xfer);
+
+	    xfer->aframes = 1;
+
+	    if (xfer->td_transfer_cache == NULL) {
+	        goto done;
+	    }
+	}
+
+	while (xfer->aframes != xfer->nframes) {
+
+	    if ((!xfer->flags_int.control_xfr) ||
+		(xfer->frlengths[xfer->aframes] > 0)) {
+
+	        err = ohci_non_isoc_done_sub(xfer);
+	    }
+
+	    xfer->aframes ++;
+
+	    if (xfer->td_transfer_cache == NULL) {
+	        goto done;
+	    }
+	}
+
+	if (xfer->flags_int.control_xfr &&
+	    !xfer->flags_int.control_act) {
 
-		usbd_page_dma_exit(td->page);
+	    err = ohci_non_isoc_done_sub(xfer);
+	}
 
-		phy_start = le32toh(td->td_cbp);
-		td_flags = le32toh(td->td_flags);
+ done:
+	ohci_device_done(xfer, err);
+	return;
+}
 
-		len = td->len;
-		if (phy_start) {
-			/* compute the number of remaining
-			 * bytes in the hardware buffer:
-			 */
-			phy_end = le32toh(td->td_be);
-			temp = (OHCI_PAGE(phy_start ^ phy_end) ? 
-				(OHCI_PAGE_SIZE+1) : 0x0001);
-			temp += OHCI_PAGE_OFFSET(phy_end);
-			temp -= OHCI_PAGE_OFFSET(phy_start);
+/*------------------------------------------------------------------------*
+ *	ohci_check_transfer_sub
+ *------------------------------------------------------------------------*/
+static void
+ohci_check_transfer_sub(struct usbd_xfer *xfer)
+{
+	ohci_td_t *td;
+	ohci_ed_t *ed;
+	uint32_t phy_start;
+	uint32_t td_flags;
+	uint32_t td_next;
+	uint16_t cc;
 
-			if (temp > len) {
-			    /* guard against corruption */
-			    len = 0;
-			} else {
-			    len -= temp;
-			}
-		}
+	td = xfer->td_transfer_cache;
 
-		usbd_page_dma_enter(td->page);
+ 	while (1) {
 
-		DPRINTFN(10, ("len=%d\n", len));
+	    usbd_page_dma_exit(td->page);
+	    phy_start = le32toh(td->td_cbp);
+	    td_flags = le32toh(td->td_flags);
+	    td_next = le32toh(td->td_next);
+	    usbd_page_dma_enter(td->page);
 
-		actlen += len;
+	    /* Check for last transfer */
+	    if (((void *)td) == xfer->td_transfer_last) {
+		/* the transfer is finished */
+		td = NULL;
+		break;
+	    }
 
-		cc = OHCI_TD_GET_CC(td_flags);
-		if (cc) {
-			DPRINTFN(15,("error cc=%d (%s)\n",
-				     cc, ohci_cc_strs[cc]));
-			break;
-		}
+	    /* Check transfer status */
+	    cc = OHCI_TD_GET_CC(td_flags);
+	    if (cc) {
+		/* the transfer is finished */
+		td = NULL;
+		break;
+	    }
 
-		if (phy_start) {
-			/* short transfer */
-			break;
-		}
+	    /*
+	     * Check if we reached the last packet
+	     * or if there is a short packet:
+	     */
 
-		if (((void *)td) == xfer->td_transfer_last) {
-			break;
-		}
+	    if (((td_next & (~0xF)) == OHCI_TD_NEXT_END) || phy_start) {
+		/* follow alt next */
+	        td = td->alt_next;
+	        break;
+	    }
 
-		td = td->obj_next;
+	    td = td->obj_next;
 	}
 
-	DPRINTFN(10, ("actlen=%d\n", actlen));
+	/* update transfer cache */
+
+	xfer->td_transfer_cache = td;
+
+	if (td) {
+
+	    ed = xfer->qh_start;
 
-	xfer->actlen = actlen;
+	    usbd_page_dma_exit(ed->page);
+	    ed->ed_headp = td->td_self;
+	    usbd_page_dma_enter(ed->page);
 
-	ohci_device_done(xfer, 
-			 (cc == 0) ? USBD_NORMAL_COMPLETION :
-			 (cc == OHCI_CC_STALL) ? USBD_STALLED : USBD_IOERROR);
+	    DPRINTFN(12, ("xfer=%p following alt next\n", xfer));
+	}
 	return;
 }
 
-/* returns one when transfer is finished 
- * and callback must be called; else zero
- */
+/*------------------------------------------------------------------------*
+ *	ohci_check_transfer
+ *
+ * Return values:
+ *    0: USB transfer is not finished
+ * Else: USB transfer is finished
+ *------------------------------------------------------------------------*/
 static u_int8_t
 ohci_check_transfer(struct usbd_xfer *xfer, struct thread *ctd)
 {
@@ -954,6 +1095,14 @@
 		}
 		else
 		{
+			if (xfer->flags_int.short_frames_ok) {
+			    ohci_check_transfer_sub(xfer);
+			    if (xfer->td_transfer_cache) {
+				/* not finished yet */
+				return 0;
+			    }
+			}
+
 			/* store data-toggle */
 			if (ed_headp & OHCI_TOGGLECARRY) {
 				xfer->pipe->toggle_next = 1;
@@ -974,14 +1123,8 @@
 static void
 ohci_rhsc_enable(ohci_softc_t *sc)
 {
-	struct thread *td;
-	struct usbd_xfer *xfer;
-	struct usbd_xfer *xlist[2];
-
 	DPRINTFN(4, ("\n"));
 
-	td = curthread;
-
 	mtx_assert(&sc->sc_bus.mtx, MA_OWNED);
 
 	sc->sc_eintrs |= OHCI_RHSC;
@@ -990,27 +1133,9 @@
 	/* acknowledge any RHSC interrupt */
 	OWRITE4(sc, OHCI_INTERRUPT_STATUS, OHCI_RHSC);
 
-	xfer = sc->sc_intrxfer;
-
- 	if(xfer)
-	{
-	    /* transfer is transferred */
-	    ohci_device_done(xfer, USBD_NORMAL_COMPLETION);
-
-	    /* queue callback */
-	    xlist[0] = xfer;
-	    xlist[1] = NULL;
-
-	    xfer->usb_thread = td;
-	    xfer->usb_root->memory_refcount++;
-
-	    mtx_unlock(&sc->sc_bus.mtx);
-
-	    usbd_do_callback(xlist, td);
-	}
-	else
-	{
-	    mtx_unlock(&sc->sc_bus.mtx);
+	if (usbd_std_root_transfer(&(sc->sc_root_intr), NULL,
+				   &ohci_root_intr_done)) {
+	    mtx_unlock(&(sc->sc_bus.mtx));
 	}
 	return;
 }
@@ -1133,20 +1258,6 @@
 	}
 	if(status & OHCI_RHSC)
 	{
-		xfer = sc->sc_intrxfer;
-
-		if(xfer)
-		{
-		    ohci_device_done(xfer, USBD_NORMAL_COMPLETION);
-
-		    /* queue callback */
-
-		    *(xptr++) = xfer;
-
-		    xfer->usb_thread = td;
-		    xfer->usb_root->memory_refcount++;
-		}
-
 		/*
 		 * Disable RHSC interrupt for now, because it will be
 		 * on until the port has been reset.
@@ -1154,6 +1265,11 @@
 		sc->sc_eintrs &= ~OHCI_RHSC;
 		OWRITE4(sc, OHCI_INTERRUPT_DISABLE, OHCI_RHSC);
 
+		if (!usbd_std_root_transfer(&(sc->sc_root_intr), ctd,
+					    &ohci_root_intr_done)) {
+		    mtx_lock(&(sc->sc_bus.mtx));
+		}
+
 		/* do not allow RHSC interrupts > 1 per second */
 		__callout_reset(&sc->sc_tmo_rhsc, hz,
 				(void *)(void *)ohci_rhsc_enable, sc);
@@ -1285,234 +1401,291 @@
 }
 
 static void
-ohci_setup_standard_chain(struct usbd_xfer *xfer, ohci_ed_t **ed_last)
+ohci_setup_standard_chain_sub(struct ohci_std_temp *temp)
 {
 	struct usbd_page_search buf_res;
-	/* the OHCI hardware can handle at most one 4k crossing per TD */
-	u_int32_t average = (OHCI_PAGE_SIZE - (OHCI_PAGE_SIZE % 
-					       xfer->max_packet_size));
-	u_int32_t td_flags;
-	uint32_t ed_flags;
-	u_int32_t buf_offset;
-	u_int32_t len;
-	u_int8_t isread;
-	u_int8_t shortpkt = 0;
-	u_int8_t force_short;
 	ohci_td_t *td;
-	ohci_td_t *td_last = NULL;
-	ohci_ed_t *ed;
+	ohci_td_t *td_next;
+	ohci_td_t *td_alt_next;
+	uint32_t buf_offset;
+	uint32_t average;
+	uint32_t len_old;
+	uint8_t shortpkt_old;
+	uint8_t precompute;
+
+	td_alt_next = NULL;
+	buf_offset = 0;
+	shortpkt_old = temp->shortpkt;
+	len_old = temp->len;
+	precompute = 1;
+
+	/* software is used to detect short incoming transfers */
+
+	if ((temp->td_flags & htole32(OHCI_TD_DP_MASK)) == htole32(OHCI_TD_IN)) {
+	    temp->td_flags |= htole32(OHCI_TD_R);
+	} else {
+	    temp->td_flags &= ~htole32(OHCI_TD_R);
+	}
+
+ restart:
+
+	td = temp->td;
+	td_next = temp->td_next;
+
+	while (1) {
+
+	    if (temp->len == 0) {
+
+		if (temp->shortpkt) {
+		    break;
+		}
+
+		/* send a Zero Length Packet, ZLP, last */
+
+		temp->shortpkt = 1;
+		average = 0;
+
+	    } else {
+
+		average = temp->average;
+
+		if (temp->len < average) {
+		    if (temp->len % temp->max_frame_size) {
+			temp->shortpkt = 1;
+		    }
+		    average = temp->len;
+		}
+	    }
+
+	    if (td_next == NULL) {
+	        panic("%s: out of OHCI transfer descriptors!", __FUNCTION__);
+	    }
+
+	    /* get next TD */
+
+	    td = td_next;
+	    td_next = td->obj_next;
 
-	DPRINTFN(8, ("addr=%d endpt=%d len=%d speed=%d\n", 
-		     xfer->address, UE_GET_ADDR(xfer->endpoint),
-		     xfer->length, xfer->udev->speed));
+	    /* check if we are pre-computing */
 
-	td = (xfer->td_transfer_first = xfer->td_start);
+	    if (precompute) {
 
-	buf_offset = 0;
-	usbd_get_page(&(xfer->buf_data), buf_offset, &buf_res);
+	        /* update remaining length */
 
-	force_short = (xfer->flags & USBD_FORCE_SHORT_XFER) ? 1 : 0;
+		temp->len -= average;
 
-	len = xfer->length;
+		continue;
+	    }
 
-	if(xfer->pipe->methods == &ohci_device_ctrl_methods)
-	{
-	    isread = xfer->control_isread;
+	    usbd_page_dma_exit(td->page);
 
-	    if (xfer->flags & USBD_DEV_CONTROL_HEADER) {
+	    /* fill out current TD */
+	    td->td_flags = temp->td_flags;
 
-		xfer->pipe->toggle_next = 1;
+	    /* the next TD uses TOGGLE_CARRY */
+	    temp->td_flags &= ~htole32(OHCI_TD_TOGGLE_MASK);
 
-		usbd_page_dma_exit(td->page);
+	    if (average == 0) {
 
-		/* SETUP message */
+		td->td_cbp = 0;
+		td->td_be = ~0;
+		td->len = 0;
 
-		td->td_flags = htole32(OHCI_TD_SETUP | OHCI_TD_NOCC |
-				       OHCI_TD_TOGGLE_0 | OHCI_TD_NOINTR);
+	    } else {
 
+		usbd_get_page(temp->pc, buf_offset, &buf_res);
 		td->td_cbp = htole32(buf_res.physaddr);
+		buf_offset += (average - 1);
 
-		buf_offset += (sizeof(usb_device_request_t) - 1);
-		usbd_get_page(&(xfer->buf_data), buf_offset, &buf_res);
-
+		usbd_get_page(temp->pc, buf_offset, &buf_res);
 		td->td_be = htole32(buf_res.physaddr);
-		td->len = sizeof(usb_device_request_t);
+		buf_offset ++;
 
-		buf_offset += 1;
-		usbd_get_page(&(xfer->buf_data), buf_offset, &buf_res);
+		td->len = average;
 
-		len -= sizeof(usb_device_request_t);
-		td_last = td;
-		td = td->obj_next;
+		/* update remaining length */
 
-		if (td) {
-		    /* link the last TD with the next one */
-		    td_last->td_next = td->td_self;
-		}
+		temp->len -= average;
+	    }
 
-		usbd_page_dma_enter(td_last->page);
+	    if ((td_next == td_alt_next) && temp->setup_alt_next) {
+	        /* we need to receive these frames one by one ! */
+	        td->td_flags &= htole32(~OHCI_TD_INTR_MASK);
+		td->td_flags |= htole32(OHCI_TD_SET_DI(1));
+		td->td_next = htole32(OHCI_TD_NEXT_END);
 	    } else {
-	        if (len == 0) {
-			/* When the length is zero we
-			 * queue a short packet!
-			 * This also makes "td_last"
-			 * non-zero.
-			 */
-			DPRINTFN(0, ("short transfer!\n"));
-		        force_short = 1;
+	        if (td_next) {
+		    /* link the current TD with the next one */
+		    td->td_next = td_next->td_self;
 		}
 	    }
+
+	    td->alt_next = td_alt_next;
+
+	    usbd_page_dma_enter(td->page);
 	}
-	else
-	{
-		isread = (UE_GET_DIR(xfer->endpoint) == UE_DIR_IN);
+
+	if (precompute) {
+	    precompute = 0;
 
-		if (len == 0) {
-			/* When the length is zero we
-			 * queue a short packet!
-			 * This also makes "td_last"
-			 * non-zero.
-			 */
-			DPRINTFN(0, ("short transfer!\n"));
-			force_short = 1;
-		}
+	    /* setup alt next pointer, if any */
+	    td_alt_next = td_next;
+	    
+	    /* restore */
+	    temp->shortpkt = shortpkt_old;
+	    temp->len = len_old;
+	    goto restart;
 	}
 
-	td_flags = htole32(OHCI_TD_NOCC | OHCI_TD_NOINTR);
+	temp->td = td;
+	temp->td_next = td_next;
+
+	return;
+}
+
+static void
+ohci_setup_standard_chain(struct usbd_xfer *xfer, ohci_ed_t **ed_last)
+{
+	struct ohci_std_temp temp;
+	struct usbd_pipe_methods *methods;
+	ohci_ed_t *ed;
+	ohci_td_t *td;
+	uint32_t ed_flags;
+	uint32_t x;
+
+	DPRINTFN(8, ("addr=%d endpt=%d sumlen=%d speed=%d\n", 
+		     xfer->address, UE_GET_ADDR(xfer->endpoint),
+		     xfer->sumlen, usbd_get_speed(xfer->udev)));
+
+	temp.average = xfer->max_usb_frame_size;
+	temp.max_frame_size = xfer->max_frame_size;
+
+	xfer->td_transfer_first = xfer->td_start;
+	xfer->td_transfer_cache = xfer->td_start;
+
+	temp.td = NULL;
+	temp.td_next = xfer->td_start;
+	temp.setup_alt_next = xfer->flags_int.short_frames_ok;
+
+	methods = xfer->pipe->methods;
+
+	x = 0;
+
+	/* check if we should prepend a setup message */
+
+	if (xfer->flags_int.control_xfr &&
+	    xfer->flags_int.control_hdr) {
+
+		temp.td_flags = htole32(OHCI_TD_SETUP | OHCI_TD_NOCC |
+			OHCI_TD_TOGGLE_0 | OHCI_TD_NOINTR);
+
+		temp.len = xfer->frlengths[0];
+		temp.pc = xfer->frbuffers + 0;
+		temp.shortpkt = temp.len ? 1 : 0;
+
+		ohci_setup_standard_chain_sub(&temp);
+
+		x = 1;
 
- 	if(xfer->flags & USBD_SHORT_XFER_OK)
-	{
-		td_flags |= htole32(OHCI_TD_R);
+		/*
+		 * XXX assume that the setup message is 
+		 * contained within one USB packet:
+		 */
+		xfer->pipe->toggle_next = 1;
 	}
-	if(xfer->pipe->toggle_next)
-	{
-		td_flags |= htole32(OHCI_TD_TOGGLE_1);
+
+	temp.td_flags = htole32(OHCI_TD_NOCC | OHCI_TD_NOINTR);
+
+	/* set data toggle */
+
+	if (xfer->pipe->toggle_next) {
+	    temp.td_flags |= htole32(OHCI_TD_TOGGLE_1);
+	} else {
+	    temp.td_flags |= htole32(OHCI_TD_TOGGLE_0);
 	}
-	else
-	{
-		td_flags |= htole32(OHCI_TD_TOGGLE_0);
-	}
-	if(isread)
-        {
-		td_flags |= htole32(OHCI_TD_IN);
-	}
-	else
-	{
-		td_flags |= htole32(OHCI_TD_OUT);
-	}
 
-	while(1)
-	{
-		if(len == 0)
-		{
-			if (force_short)
-			{
-				if(shortpkt)
-				{
-					break;
-				}
-			}
-			else
-			{
-				break;
-			}
-		}
+	/* set endpoint direction */
 
-		if(len < average)
-		{
-			if((len % xfer->max_packet_size) || 
-			   (len == 0))
-			{
-				shortpkt = 1;
-			}
+	if (UE_GET_DIR(xfer->endpoint) == UE_DIR_IN) {
+	    temp.td_flags |= htole32(OHCI_TD_IN);
+	} else {
+	    temp.td_flags |= htole32(OHCI_TD_OUT);
+	}
 
-			average = len;
-		}
+	while (x != xfer->nframes) {
 
-		if(td == NULL)
-		{
-			panic("%s: software wants to write more data "
-			      "than there is in the buffer!", __FUNCTION__);
-		}
+		/* DATA0 / DATA1 message */
 
-		usbd_page_dma_exit(td->page);
+		temp.len = xfer->frlengths[x];
+		temp.pc = xfer->frbuffers + x;
 
-		/* fill out TD */
+		x++;
 
-		td->td_flags = td_flags;
+		if (x == xfer->nframes) {
+		    temp.setup_alt_next = 0;
+		}
 
-		/* the next TD uses TOGGLE_CARRY */
-		td_flags &= htole32(~OHCI_TD_TOGGLE_MASK);
+		if (temp.len == 0) {
 
-		if(average == 0)
-		{
-			td->td_cbp = 0;
-			td->td_be = ~0;
-		}
-		else
-		{
-			td->td_cbp = htole32(buf_res.physaddr);
+		    /* make sure that we send an USB packet */
 
-			buf_offset += (average - 1);
-			usbd_get_page(&(xfer->buf_data), buf_offset, &buf_res);
+		    temp.shortpkt = 0;
 
-			td->td_be = htole32(buf_res.physaddr);
+		    if (xfer->flags_int.control_xfr) {
+		        /* we ignore zero length frames */
+		        continue;
+		    }
 
-			buf_offset += 1;
-			usbd_get_page(&(xfer->buf_data), buf_offset, &buf_res);
-		}
-		td->len = average;
+		} else {
 
-		len -= average;
-		td_last = td;
-		td = td->obj_next;
+		    /* regular data transfer */
 
-		if (td) {
-		    /* link the last TD with the next one */
-		    td_last->td_next = td->td_self;
+		    temp.shortpkt = (xfer->flags.force_short_xfer) ? 0 : 1;
 		}
 
-		usbd_page_dma_enter(td_last->page);
+		ohci_setup_standard_chain_sub(&temp);
 	}
 
-	if(xfer->pipe->methods == &ohci_device_ctrl_methods)
-	{
-	    if (xfer->control_remainder == 0) {
+	/* check if we should append a status stage */
+
+	if (xfer->flags_int.control_xfr &&
+	    !xfer->flags_int.control_act) {
 
-		usbd_page_dma_exit(td->page);
+		/* 
+		 * Send a DATA1 message and invert 
+		 * the current endpoint direction.
+		 */
 
-		/* STATUS message */
+		/* set endpoint direction and data toggle */
 
-		td_flags = (OHCI_TD_NOCC | OHCI_TD_TOGGLE_1 | 
-			    OHCI_TD_SET_DI(1));
-		if (isread) {
-			td_flags |= OHCI_TD_OUT;
+		if (UE_GET_DIR(xfer->endpoint) == UE_DIR_IN) {
+		    temp.td_flags = htole32(OHCI_TD_OUT |
+			OHCI_TD_NOCC | OHCI_TD_TOGGLE_1 | OHCI_TD_SET_DI(1));
 		} else {
-			td_flags |= OHCI_TD_IN;
+		    temp.td_flags = htole32(OHCI_TD_IN | 
+			OHCI_TD_NOCC | OHCI_TD_TOGGLE_1 | OHCI_TD_SET_DI(1));
 		}
 
-		td->td_flags = htole32(td_flags);
-		td->td_cbp = 0;
-		td->td_be = ~0;
-		td->len = 0;
+		temp.len = 0;
+		temp.pc = NULL;
+		temp.shortpkt = 0;
 
-		td_last = td;
+		ohci_setup_standard_chain_sub(&temp);
+	}
 
-		usbd_page_dma_enter(td_last->page);
-	    }
-	}
+	td = temp.td;
 
-	usbd_page_dma_exit(td_last->page);
+	usbd_page_dma_exit(td->page);
 
-	td_last->td_next = 0;
-	td_last->td_flags &= htole32(~OHCI_TD_INTR_MASK);
-	td_last->td_flags |= htole32(OHCI_TD_SET_DI(1));
+	td->td_next = htole32(OHCI_TD_NEXT_END);
+	td->td_flags &= ~htole32(OHCI_TD_INTR_MASK);
+	td->td_flags |= htole32(OHCI_TD_SET_DI(1));
 
-	usbd_page_dma_enter(td_last->page);
+	usbd_page_dma_enter(td->page);
 
 	/* must have at least one frame! */
 
-	xfer->td_transfer_last = td_last;
+	xfer->td_transfer_last = td;
 
 #ifdef USB_DEBUG
 	if(ohcidebug > 8)
@@ -1529,7 +1702,7 @@
 
 	ed_flags = (OHCI_ED_SET_FA(xfer->address)|
 		    OHCI_ED_SET_EN(UE_GET_ADDR(xfer->endpoint))|
-		    OHCI_ED_SET_MAXP(xfer->max_packet_size));
+		    OHCI_ED_SET_MAXP(xfer->max_frame_size));
 
 	ed_flags |= (OHCI_ED_FORMAT_GEN | OHCI_ED_DIR_TD);
 	
@@ -1545,13 +1718,13 @@
 
 	OHCI_APPEND_QH(ed, td->td_self, *ed_last);
 
-	if(xfer->pipe->methods == &ohci_device_bulk_methods)
+	if (methods == &ohci_device_bulk_methods)
 	{
 		ohci_softc_t *sc = xfer->usb_sc;
 		OWRITE4(sc, OHCI_COMMAND_STATUS, OHCI_BLF);
 	}

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon Oct  1 17:12:03 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8BF0616A420; Mon,  1 Oct 2007 17:12:03 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4452616A419
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 17:12:03 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 28C0E13C458
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 17:12:03 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l91HC2i9011658
	for <perforce@FreeBSD.org>; Mon, 1 Oct 2007 17:12:02 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l91HC238011655
	for perforce@freebsd.org; Mon, 1 Oct 2007 17:12:02 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 1 Oct 2007 17:12:02 GMT
Message-Id: <200710011712.l91HC238011655@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127065 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2007 17:12:03 -0000

http://perforce.freebsd.org/chv.cgi?CH=127065

Change 127065 by hselasky@hselasky_laptop001 on 2007/10/01 17:11:42

	
	Optimise: These variables are always set later in the code.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/uhci.c#33 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/uhci.c#33 (text+ko) ====

@@ -1091,8 +1091,6 @@
 
 	td = xfer->td_transfer_cache;
 	td_alt_next = td->alt_next;
-	status = UHCI_TD_STALLED;
-	token = 0;
 
 	if (xfer->aframes != xfer->nframes) {
 	    xfer->frlengths[xfer->aframes] = 0;

From owner-p4-projects@FreeBSD.ORG  Mon Oct  1 17:17:09 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DB4D916A4FF; Mon,  1 Oct 2007 17:17:08 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8B4AC16A417
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 17:17:08 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8795713C457
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 17:17:08 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l91HH8HI011810
	for <perforce@FreeBSD.org>; Mon, 1 Oct 2007 17:17:08 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l91HH8Bs011807
	for perforce@freebsd.org; Mon, 1 Oct 2007 17:17:08 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 1 Oct 2007 17:17:08 GMT
Message-Id: <200710011717.l91HH8Bs011807@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127066 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2007 17:17:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=127066

Change 127066 by hselasky@hselasky_laptop001 on 2007/10/01 17:16:23

	
	Optimise;
	 1) No need to preset the "status" variable.
	 2) No need to compute last data toggle at every iteration.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ehci.c#41 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/ehci.c#41 (text+ko) ====

@@ -1076,12 +1076,9 @@
 	ehci_qtd_t *td_alt_next;
 	uint32_t status;
 	uint16_t len;
-	uint8_t last_toggle;
 
 	td = xfer->td_transfer_cache;
 	td_alt_next = td->alt_next;
-	status = EHCI_QTD_HALTED;
-	last_toggle = 0;
 
 	while (1) {
 
@@ -1104,9 +1101,6 @@
 	        xfer->frlengths[xfer->aframes] -= len;
 	    }
 
-	    /* Make a copy of the data toggle */
-	    last_toggle = (status & EHCI_QTD_TOGGLE_MASK) ? 1 : 0;
-
 	    /* Check for last transfer */
 	    if (((void *)td) == xfer->td_transfer_last) {
 	        if (len == 0) {
@@ -1153,7 +1147,8 @@
 
 	/* update data toggle */
 
-	xfer->pipe->toggle_next = last_toggle;
+	xfer->pipe->toggle_next =
+	  (status & EHCI_QTD_TOGGLE_MASK) ? 1 : 0;
 
 #ifdef USB_DEBUG
 	if (status & EHCI_QTD_STATERRS) {

From owner-p4-projects@FreeBSD.ORG  Mon Oct  1 18:01:00 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4EFE316A420; Mon,  1 Oct 2007 18:01:00 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C472C16A417
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 18:00:59 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C2BE713C448
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 18:00:59 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l91I0xa6014004
	for <perforce@FreeBSD.org>; Mon, 1 Oct 2007 18:00:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l91I0xkk014001
	for perforce@freebsd.org; Mon, 1 Oct 2007 18:00:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 1 Oct 2007 18:00:59 GMT
Message-Id: <200710011800.l91I0xkk014001@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127068 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2007 18:01:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=127068

Change 127068 by hselasky@hselasky_laptop001 on 2007/10/01 18:00:52

	
	Update README to reflect the latest USB API changes.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/README#18 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/README#18 (text+ko) ====

@@ -1,14 +1,3 @@
-Hi,
-
-The OHCI and UHCI drivers do currently not compile due to ongoing
-work, which is expected to be complete by the end of week 39 2007.
-
-You can work around this by not including "device ohci" and "device
-uhci" in your kernel config file until furter. To use full/low speed
-devices, connect them through an external USB HUB.
-
---HPS
-
 DESCRIPTION OF THE NEW USB API
 
 The new USB 2.0 API consists of 4 functions. All transfer types are managed 
@@ -23,8 +12,8 @@
 |                                                              |
 |  "usbd_transfer_unsetup" -  This function will stop the USB  |
 |                             transfer, if it is currently     |
-|                             active and release all DMA       |
-|                             memory.                          |
+|                             active, release all DMA          |
+|                             memory and might sleep!          |
 |                                                              |
 |  "usbd_transfer_start"   -  This function will start a USB   |
 |                             transfer, if not already started.|
@@ -46,13 +35,6 @@
 
 Reference: /sys/dev/usb/usb_transfer.c 
 
-One must setup the USB transfer, struct usbd_xfer, from the 
-callback handler, which is required for non-blocking operation, in the end. 
-This behavior is also very practical when writing USB device drivers, because 
-it is easy to make a loop, starting the next transfer from the previous. 
-Simply reorder the labels! The callback's lock is locked by the caller. This 
-solves synchronization problems related to stopping USB transfers.
-
 /*
  * A simple USB callback state-machine:
  *
@@ -70,48 +52,60 @@
 void
 usbd_default_callback(struct usbd_xfer *xfer)
 {
-	/* NOTE: it is not allowed to return
+	/*
+	 * NOTE: it is not allowed to return
 	 * before "USBD_CHECK_STATUS()",
 	 * even if the system is tearing down!
 	 */
-        USBD_CHECK_STATUS(xfer);
+	USBD_CHECK_STATUS(xfer);
 
  tr_setup:
-       /* setup xfer->length, xfer->frlengths, xfer->nframes
-        * and write data to xfer->buffer if any
-        */
+	/*
+	 * Setup xfer->frlengths[], xfer->nframes
+	 * and write data to xfer->frbuffers[], if any
+	 */
 
-        /**/
-        usbd_start_hardware(xfer);
-        return;
+	/**/
+	usbd_start_hardware(xfer);
+	return;
 
  tr_transferred:
-        /* read data from xfer->buffer if any */
-        return;
+	/* 
+	 * Read data from xfer->frbuffers[], if any.
+	 * "xfer->frlengths[]" should now have been
+	 * updated to the actual length.
+	 */
+	return;
 
  tr_error:
-        /* print error message and clear stall for example */
-        return;
+	/* print error message and clear stall for example */
+	return;
 }
 
-NOTE for control endpoints: all of the control transfer now resides in the 
-buffer pointed to by "xfer->buffer", including the request. This is better and 
-saves memory. 
+NOTE: An USB control transfer has three parts. First the SETUP packet,
+then DATA packet(s) and then a STATUS packet. The SETUP packet is
+pointed to by "xfer->frbuffers[0]" and the length is stored in
+"xfer->frlengths[0]". Zero-length entries in the "xfer->frlengths[]" array
+will be ignored. Typically the DATA packet(s) are pointed to by
+"xfer->frbuffers[1]" and the length is stored in "xfer->frlengths[1]".
+The STATUS packet is automatically executed unless "xfer->flags.manual_status"
+is set. If "xfer->flags.manual_status" is set the STATUS packet will 
+be executed if the length of last USB frame is zero.
 
- 1) Something that one should be aware of is that, all USB callbacks support 
+ 1) Something that one should be aware of is that all USB callbacks support 
 recursation. That means one can start/stop whatever transfer from the callback 
 of another transfer one desires. Also the transfer that is currently called 
-back. Recursion is handled like this, that when the callback that wants to 
-recurse returns, it is called one more time. 
+back. Recursion is handled like this that when the callback that wants to 
+recurse returns it is called one more time. 
  
- 2) After that the "tr_setup" label has been jumped in the callback, one can 
-always depend on that "tr_error" or "tr_transferred" will get jumped 
-afterwards. Always! 
+ 2) After that the "usbd_start_hardware()" function has been called in
+the callback one can always depend on that "tr_error" or "tr_transferred"
+will get jumped afterwards. Always!
  
- 3) sleeping functions can only be called from the attach routine of the 
+ 3) Sleeping functions can only be called from the attach routine of the 
 driver. Else one should not use sleeping functions unless one has to. It is 
 very difficult with sleep, because one has to think that the device might have 
-detached when it returns from sleep. 
+detached when the thread returns from sleep. 
  
 USB device driver examples: 
 
@@ -230,26 +224,38 @@
   milliseconds. If the "timeout" field is zero and the transfer type
   is ISOCHRONOUS a timeout of 250ms will be used.
 
-- The "frames" field sets the number of isochronous frames, for 
-  "type" = UE_ISOCHRONOUS.
+- The "frames" field sets the maximum number of frames. If zero is
+  specified it will yield the following results:
+
+    UE_BULK)
+    UE_INTERRUPT)
+      xfer->nframes = 1;
+
+    UE_CONTROL)
+      xfer->nframes = 2;
+
+    UE_ISOCHRONOUS)
+      Not allowed. Will cause an error.
 
 - The "index" field allows one to give a number, in case more
   endpoints match the description, that selects which matching
   "index" should be used.
 
-- The "flags" field allows one to set flags for the transfer. Valid flags are:
-  USBD_FORCE_SHORT_XFER
+- The "flags" field has type "struct usbd_xfer_flags" and allows one
+  to set initial flags an USB transfer. Valid flags are:
+
+  force_short_xfer
 	This flag forces the last USB packet sent to be short. A short
 	packet has a length of less than "xfer->max_packet_size", which
 	derives from "wMaxPacketSize".
 
-  USBD_SHORT_XFER_OK
+  short_xfer_ok
 	This flag allows the transfer length, "xfer->actlen" to be
-	less than "xfer->length", upon completion of a transfer.
+	less than "xfer->sumlen" upon completion of a transfer.
 
-  USBD_USE_POLLING
+  use_polling
 	This flag can be used with any callback and will cause the
-	"usbd_transfer_start()" function to wait, using "DELAY()",
+	"usbd_transfer_start()" function to wait using "DELAY()",
 	without exiting any mutexes, until the transfer is finished or
 	has timed out.
 
@@ -257,15 +263,7 @@
 	NOTE: USBD_CANCELLED is returned in case of timeout
 	      instead of USBD_TIMEOUT!
 
-  USBD_USE_DMA
-	This flag will cause the USB host controller driver to not
-	allocate a second data buffer, "xfer->buffer". Instead of
-	transferring data using "xfer->buffer", data must be
-	transferred by a call to "usbd_copy_in(&(xfer->buf_data),
-	offset, src, len)" or "usbd_copy_out(&(xfer->buf_data),
-	offset, dst, len)". This saves an extra data copy.
-
-  USBD_PIPE_BOF
+  pipe_bof
 	This flag causes a failing USB transfer to remain first
 	in the PIPE queue except in the case of "xfer->error" equal
 	to "USBD_CANCELLED". No other USB transfers in the affected
@@ -288,9 +286,28 @@
 	USB transfers which use an endpoint that can be shared
 	between userland and kernel.
 
+  proxy_buffer
+	Setting this flag will cause that the total buffer size will
+	be rounded up to the nearest atomic hardware transfer
+	size. The maximum data length of any USB transfer is always
+	stored in the "xfer->max_data_length". For control transfers
+	the USB kernel will allocate additional space for the 8-bytes
+	of SETUP header. These 8-bytes are not counted by the
+	"xfer->max_data_length" variable.
+
+  ext_buffer
+	Setting this flag will cause that no DMA data buffer will be
+	allocated. Instead the USB client can use its own DMA buffer.
+
+  manual_status
+	Setting this flag causes that the STATUS stage of a control
+	transfer needs to be sent separately like a zero-length USB
+	frame. This flag has currently no effect on non-control
+	transfers. This flag is mostly useful for the USB device side.
+
 - The "bufsize" field sets the total buffer size in bytes. If
   this field is zero, "wMaxPacketSize" will be used, multiplied by the
-  "frames" field if the transfer type is isochronous. This is useful for
+  "frames" field if the transfer type is ISOCHRONOUS. This is useful for
   setting up interrupt pipes. This field is mandatory.
 
   NOTE: For control transfers "bufsize" includes
@@ -301,9 +318,8 @@
 MUTEX NOTE:
 ===========
 
-When you create a mutex, using "mtx_init()", don't forget to call
+When you create a mutex using "mtx_init()", don't forget to call
 "mtx_destroy()" at detach, else you can get "freed memory accessed"
 panics.
 
 --HPS
-

From owner-p4-projects@FreeBSD.ORG  Mon Oct  1 18:30:35 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 864D816A46B; Mon,  1 Oct 2007 18:30:35 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1AB8516A418
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 18:30:35 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 19D5513C4A6
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 18:30:35 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l91IUY7D017262
	for <perforce@FreeBSD.org>; Mon, 1 Oct 2007 18:30:34 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l91IUYtA017259
	for perforce@freebsd.org; Mon, 1 Oct 2007 18:30:34 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 1 Oct 2007 18:30:34 GMT
Message-Id: <200710011830.l91IUYtA017259@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127069 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2007 18:30:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=127069

Change 127069 by hselasky@hselasky_laptop001 on 2007/10/01 18:30:27

	
	Style change;
	
	  - substitute all "u_intXXX" by "uintXXX"
	
	Done by the following script kernel;
	
	[ -f src/$F ] && (((cat src/$F | sed -e "s/u_int32_t/uint32_t/g" | 
			sed -e "s/u_int16_t/uint16_t/g" |
			sed -e "s/u_int8_t/uint8_t/g" > temp) &&
			(diff -u src/$F temp > /dev/null)) || (cp temp src/$F))

Affected files ...

.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#17 edit
.. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#6 edit
.. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.h#6 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#16 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.h#5 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio_pcm.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.c#42 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.h#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/ubser.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/ucom.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/ucycom.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/ufm.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdi.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/ugensa.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.h#12 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/uhid.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/umass.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/umct.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/uplcom.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/urio.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.h#15 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#5 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#6 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#11 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#44 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/uvisor.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#23 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#14 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#8 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#9 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#17 (text) ====

@@ -52,30 +52,30 @@
 
 /* Command Block Wrapper */
 struct bbb_cbw {
-    u_int8_t	signature[4];
+    uint8_t	signature[4];
 #define		CBWSIGNATURE		0x43425355
 
-    u_int8_t	tag[4];
-    u_int8_t	transfer_length[4];
-    u_int8_t	flags;
+    uint8_t	tag[4];
+    uint8_t	transfer_length[4];
+    uint8_t	flags;
 #define		CBWFLAGS_OUT  		0x00
 #define		CBWFLAGS_IN  		0x80
 
-    u_int8_t	lun;
-    u_int8_t	length;
+    uint8_t	lun;
+    uint8_t	length;
 #define		CBWCDBLENGTH     	16
 
-    u_int8_t	cdb[CBWCDBLENGTH];
+    uint8_t	cdb[CBWCDBLENGTH];
 } UPACKED;
 
 /* Command Status Wrapper */
 struct bbb_csw {
-    u_int8_t	signature[4];
+    uint8_t	signature[4];
 #define		CSWSIGNATURE     	0x53425355
 
-    u_int8_t	tag[4];
-    u_int8_t	residue[4];
-    u_int8_t    status;
+    uint8_t	tag[4];
+    uint8_t	residue[4];
+    uint8_t    status;
 #define 	CSWSTATUS_GOOD   	0x0
 #define		CSWSTATUS_FAILED 	0x1
 #define		CSWSTATUS_PHASE  	0x2
@@ -108,16 +108,16 @@
     caddr_t		ata_data;
     device_t		dev;
 
-    u_int32_t		timeout;
-    u_int32_t		ata_donecount;
-    u_int32_t		ata_bytecount;
+    uint32_t		timeout;
+    uint32_t		ata_donecount;
+    uint32_t		ata_bytecount;
 
-    u_int8_t		last_xfer_no;
-    u_int8_t		usb_speed;
-    u_int8_t		intr_stalled;
-    u_int8_t		maxlun;
-    u_int8_t		iface_no;
-    u_int8_t		status_try;
+    uint8_t		last_xfer_no;
+    uint8_t		usb_speed;
+    uint8_t		intr_stalled;
+    uint8_t		maxlun;
+    uint8_t		iface_no;
+    uint8_t		status_try;
 };
 
 static const int atausbdebug = 0;
@@ -142,12 +142,12 @@
 static void atausb_cancel_request(struct atausb_softc *sc);
 
 static void
-atausb_transfer_start(struct atausb_softc *sc, u_int8_t xfer_no);
+atausb_transfer_start(struct atausb_softc *sc, uint8_t xfer_no);
 
 static void
 atausb_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer,
-				       u_int8_t next_xfer,
-				       u_int8_t stall_xfer);
+				       uint8_t next_xfer,
+				       uint8_t stall_xfer);
 static int
 ata_usbchannel_begin_transaction(struct ata_request *request);
 
@@ -325,9 +325,9 @@
     usb_interface_descriptor_t *id;
     const char *proto, *subclass;
     usb_device_request_t request;
-    u_int16_t i;
-    u_int8_t maxlun;
-    u_int8_t has_intr;
+    uint16_t i;
+    uint8_t maxlun;
+    uint8_t has_intr;
     int err;
 
     if (sc == NULL) {
@@ -462,7 +462,7 @@
 }
 
 static void
-atausb_transfer_start(struct atausb_softc *sc, u_int8_t xfer_no)
+atausb_transfer_start(struct atausb_softc *sc, uint8_t xfer_no)
 {
     if (atausbdebug) {
 	device_printf(sc->dev, "BBB transfer %d\n", xfer_no);
@@ -528,8 +528,8 @@
 
 static void
 atausb_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer, 
-				       u_int8_t next_xfer,
-				       u_int8_t stall_xfer)
+				       uint8_t next_xfer,
+				       uint8_t stall_xfer)
 {
     struct atausb_softc *sc = xfer->priv_sc;
 
@@ -556,7 +556,7 @@
     struct atausb_softc *sc = xfer->priv_sc;
     struct ata_request *request = sc->ata_request;
     struct ata_channel *ch;
-    u_int32_t tag;
+    uint32_t tag;
 
     USBD_CHECK_STATUS(xfer);
 
@@ -603,7 +603,7 @@
 atausb_t_bbb_data_read_callback(struct usbd_xfer *xfer)
 {
     struct atausb_softc *sc = xfer->priv_sc; 
-    u_int32_t max_bulk = xfer->max_data_length;
+    uint32_t max_bulk = xfer->max_data_length;
 
     USBD_CHECK_STATUS(xfer);
 
@@ -664,7 +664,7 @@
 atausb_t_bbb_data_write_callback(struct usbd_xfer *xfer)
 {
     struct atausb_softc *sc = xfer->priv_sc; 
-    u_int32_t max_bulk = xfer->max_data_length;
+    uint32_t max_bulk = xfer->max_data_length;
 
     USBD_CHECK_STATUS(xfer);
 
@@ -721,7 +721,7 @@
 {
     struct atausb_softc *sc = xfer->priv_sc; 
     struct ata_request *request = sc->ata_request;
-    u_int32_t residue;
+    uint32_t residue;
 
     USBD_CHECK_STATUS(xfer);
 
@@ -867,17 +867,17 @@
  * ATA backend part
  */
 struct atapi_inquiry {
-    u_int8_t    device_type;
-    u_int8_t    device_modifier;
-    u_int8_t    version;
-    u_int8_t    response_format;
-    u_int8_t    length;
-    u_int8_t    reserved[2];
-    u_int8_t    flags;
-    u_int8_t    vendor[8];
-    u_int8_t    product[16];
-    u_int8_t    revision[4];
- /* u_int8_t    crap[60]; */
+    uint8_t    device_type;
+    uint8_t    device_modifier;
+    uint8_t    version;
+    uint8_t    response_format;
+    uint8_t    length;
+    uint8_t    reserved[2];
+    uint8_t    flags;
+    uint8_t    vendor[8];
+    uint8_t    product[16];
+    uint8_t    revision[4];
+ /* uint8_t    crap[60]; */
 } UPACKED;
 
 static int
@@ -958,7 +958,7 @@
 	(request->u.atapi.ccb[0] == ATAPI_INQUIRY)) {
 	struct ata_device *atadev = device_get_softc(request->dev);
 	struct atapi_inquiry *inquiry = (struct atapi_inquiry *)request->data;
-	u_int16_t *ptr;
+	uint16_t *ptr;
 
 	/* convert inquiry data into simple ata_param like format */
 	atadev->param.config = ATA_PROTO_ATAPI | ATA_PROTO_ATAPI_12;
@@ -967,13 +967,13 @@
 	strncpy(atadev->param.model, inquiry->vendor, 8);
 	strcpy(atadev->param.model, "  ");
 	strncpy(atadev->param.model, inquiry->product, 16);
-	ptr = (u_int16_t*)(atadev->param.model + sizeof(atadev->param.model));
-	while (--ptr >= (u_int16_t*)atadev->param.model) {
+	ptr = (uint16_t*)(atadev->param.model + sizeof(atadev->param.model));
+	while (--ptr >= (uint16_t*)atadev->param.model) {
 	    *ptr = ntohs(*ptr);
 	}
 	strncpy(atadev->param.revision, inquiry->revision, 4);
-	ptr=(u_int16_t*)(atadev->param.revision+sizeof(atadev->param.revision));
-	while (--ptr >= (u_int16_t*)atadev->param.revision) {
+	ptr=(uint16_t*)(atadev->param.revision+sizeof(atadev->param.revision));
+	while (--ptr >= (uint16_t*)atadev->param.revision) {
 	    *ptr = ntohs(*ptr);
 	}
 	request->result = 0;

==== //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#6 (text+ko) ====

@@ -42,14 +42,14 @@
 	int hwvol_step;
 	int type;
 	device_t dev;
-	u_int32_t hwvol_mute_level;
-	u_int32_t devs;
-	u_int32_t recdevs;
-	u_int32_t recsrc;
-	u_int16_t level[32];
-	u_int8_t parent[32];
-	u_int32_t child[32];
-	u_int8_t realdev[32];
+	uint32_t hwvol_mute_level;
+	uint32_t devs;
+	uint32_t recdevs;
+	uint32_t recsrc;
+	uint16_t level[32];
+	uint8_t parent[32];
+	uint32_t child[32];
+	uint8_t realdev[32];
 	char name[MIXER_NAMELEN];
 	struct mtx *lock;
 	oss_mixer_enuminfo enuminfo;
@@ -61,7 +61,7 @@
 	int modify_counter;
 };
 
-static u_int16_t snd_mixerdefaults[SOUND_MIXER_NRDEVICES] = {
+static uint16_t snd_mixerdefaults[SOUND_MIXER_NRDEVICES] = {
 	[SOUND_MIXER_VOLUME]	= 75,
 	[SOUND_MIXER_BASS]	= 50,
 	[SOUND_MIXER_TREBLE]	= 50,
@@ -195,8 +195,8 @@
 {
 	struct snddev_info *d;
 	unsigned l, r, tl, tr;
-	u_int32_t parent = SOUND_MIXER_NONE, child = 0;
-	u_int32_t realdev;
+	uint32_t parent = SOUND_MIXER_NONE, child = 0;
+	uint32_t realdev;
 	int i, dropmtx;
 
 	if (m == NULL || dev >= SOUND_MIXER_NRDEVICES ||
@@ -281,7 +281,7 @@
 }
 
 static int
-mixer_setrecsrc(struct snd_mixer *mixer, u_int32_t src)
+mixer_setrecsrc(struct snd_mixer *mixer, uint32_t src)
 {
 	struct snddev_info *d;
 	int dropmtx;
@@ -387,7 +387,7 @@
 }
 
 void
-mix_setdevs(struct snd_mixer *m, u_int32_t v)
+mix_setdevs(struct snd_mixer *m, uint32_t v)
 {
 	struct snddev_info *d;
 	int i;
@@ -425,7 +425,7 @@
  * @param v	mask of recording devices
  */
 void
-mix_setrecdevs(struct snd_mixer *m, u_int32_t v)
+mix_setrecdevs(struct snd_mixer *m, uint32_t v)
 {
 	oss_mixer_enuminfo *ei;
 	char *loc;
@@ -475,9 +475,9 @@
 }
 
 void
-mix_setparentchild(struct snd_mixer *m, u_int32_t parent, u_int32_t childs)
+mix_setparentchild(struct snd_mixer *m, uint32_t parent, uint32_t childs)
 {
-	u_int32_t mask = 0;
+	uint32_t mask = 0;
 	int i;
 
 	if (m == NULL || parent >= SOUND_MIXER_NRDEVICES)
@@ -498,7 +498,7 @@
 }
 
 void
-mix_setrealdev(struct snd_mixer *m, u_int32_t dev, u_int32_t realdev)
+mix_setrealdev(struct snd_mixer *m, uint32_t dev, uint32_t realdev)
 {
 	if (m == NULL || dev >= SOUND_MIXER_NRDEVICES ||
 	    !(realdev == SOUND_MIXER_NONE || realdev < SOUND_MIXER_NRDEVICES))
@@ -506,29 +506,29 @@
 	m->realdev[dev] = realdev;
 }
 
-u_int32_t
-mix_getparent(struct snd_mixer *m, u_int32_t dev)
+uint32_t
+mix_getparent(struct snd_mixer *m, uint32_t dev)
 {
 	if (m == NULL || dev >= SOUND_MIXER_NRDEVICES)
 		return SOUND_MIXER_NONE;
 	return m->parent[dev];
 }
 
-u_int32_t
-mix_getchild(struct snd_mixer *m, u_int32_t dev)
+uint32_t
+mix_getchild(struct snd_mixer *m, uint32_t dev)
 {
 	if (m == NULL || dev >= SOUND_MIXER_NRDEVICES)
 		return 0;
 	return m->child[dev];
 }
 
-u_int32_t
+uint32_t
 mix_getdevs(struct snd_mixer *m)
 {
 	return m->devs;
 }
 
-u_int32_t
+uint32_t
 mix_getrecdevs(struct snd_mixer *m)
 {
 	return m->recdevs;
@@ -619,7 +619,7 @@
 {
 	struct snddev_info *snddev;
 	struct snd_mixer *m;
-	u_int16_t v;
+	uint16_t v;
 	struct cdev *pdev;
 	int i, unit, devunit, val;
 
@@ -633,7 +633,7 @@
 		if (resource_int_value(device_get_name(dev),
 		    device_get_unit(dev), snd_mixernames[i], &val) == 0) {
 			if (val >= 0 && val <= 100) {
-				v = (u_int16_t) val;
+				v = (uint16_t) val;
 			}
 		}
 
@@ -893,7 +893,7 @@
 }
 
 int
-mix_setrecsrc(struct snd_mixer *m, u_int32_t src)
+mix_setrecsrc(struct snd_mixer *m, uint32_t src)
 {
 	int ret;
 
@@ -906,10 +906,10 @@
 	return ((ret != 0) ? ENXIO : 0);
 }
 
-u_int32_t
+uint32_t
 mix_getrecsrc(struct snd_mixer *m)
 {
-	u_int32_t ret;
+	uint32_t ret;
 
 	KASSERT(m != NULL, ("NULL snd_mixer"));
 

==== //depot/projects/usb/src/sys/dev/sound/pcm/mixer.h#6 (text+ko) ====

@@ -43,18 +43,18 @@
 
 int mix_set(struct snd_mixer *m, u_int dev, u_int left, u_int right);
 int mix_get(struct snd_mixer *m, u_int dev);
-int mix_setrecsrc(struct snd_mixer *m, u_int32_t src);
-u_int32_t mix_getrecsrc(struct snd_mixer *m);
+int mix_setrecsrc(struct snd_mixer *m, uint32_t src);
+uint32_t mix_getrecsrc(struct snd_mixer *m);
 int mix_get_type(struct snd_mixer *m);
 
-void mix_setdevs(struct snd_mixer *m, u_int32_t v);
-void mix_setrecdevs(struct snd_mixer *m, u_int32_t v);
-u_int32_t mix_getdevs(struct snd_mixer *m);
-u_int32_t mix_getrecdevs(struct snd_mixer *m);
-void mix_setparentchild(struct snd_mixer *m, u_int32_t parent, u_int32_t childs);
-void mix_setrealdev(struct snd_mixer *m, u_int32_t dev, u_int32_t realdev);
-u_int32_t mix_getparent(struct snd_mixer *m, u_int32_t dev);
-u_int32_t mix_getchild(struct snd_mixer *m, u_int32_t dev);
+void mix_setdevs(struct snd_mixer *m, uint32_t v);
+void mix_setrecdevs(struct snd_mixer *m, uint32_t v);
+uint32_t mix_getdevs(struct snd_mixer *m);
+uint32_t mix_getrecdevs(struct snd_mixer *m);
+void mix_setparentchild(struct snd_mixer *m, uint32_t parent, uint32_t childs);
+void mix_setrealdev(struct snd_mixer *m, uint32_t dev, uint32_t realdev);
+uint32_t mix_getparent(struct snd_mixer *m, uint32_t dev);
+uint32_t mix_getchild(struct snd_mixer *m, uint32_t dev);
 void *mix_getdevinfo(struct snd_mixer *m);
 struct mtx * mixer_get_lock(struct snd_mixer *m);
 

==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#16 (text+ko) ====

@@ -84,9 +84,9 @@
 #define DPRINTF(...) do { } while (0)
 #endif
 
-static u_int32_t uaudio_default_rate = 96000;
-static u_int8_t  uaudio_default_bits = 32;
-static u_int8_t  uaudio_default_channels = 2;
+static uint32_t uaudio_default_rate = 96000;
+static uint8_t  uaudio_default_bits = 32;
+static uint8_t  uaudio_default_channels = 2;
 
 #define UAUDIO_NCHANBUFS        2 /* number of outstanding request */
 #define UAUDIO_NFRAMES         25 /* ms of sound in each request */
@@ -103,16 +103,16 @@
 	int32_t		maxval;
 #define MIX_MAX_CHAN 8
 	int32_t		wValue[MIX_MAX_CHAN]; /* using nchan */
-	u_int32_t	delta;
-	u_int32_t	mul;
-	u_int32_t	ctl;
+	uint32_t	delta;
+	uint32_t	mul;
+	uint32_t	ctl;
 
-	u_int16_t	wData[MIX_MAX_CHAN]; /* using nchan */
-	u_int16_t	wIndex;
+	uint16_t	wData[MIX_MAX_CHAN]; /* using nchan */
+	uint16_t	wIndex;
 
-	u_int8_t	update[(MIX_MAX_CHAN+7)/8];
-	u_int8_t	nchan;
-	u_int8_t	type;
+	uint8_t	update[(MIX_MAX_CHAN+7)/8];
+	uint8_t	nchan;
+	uint8_t	type;
 #define MIX_ON_OFF	1
 #define MIX_SIGNED_16	2
 #define MIX_UNSIGNED_16	3
@@ -124,8 +124,8 @@
 #define MIX_UNSIGNED(n) ((n) == MIX_UNSIGNED_16)
 
 #define MAX_SELECTOR_INPUT_PIN 256
-	u_int8_t	slctrtype[MAX_SELECTOR_INPUT_PIN];
-	u_int8_t	class;
+	uint8_t	slctrtype[MAX_SELECTOR_INPUT_PIN];
+	uint8_t	class;
 
 	struct uaudio_mixer_node *next;
 };
@@ -146,21 +146,21 @@
   const usb_endpoint_descriptor_audio_t *p_ed2;
   const struct uaudio_format *p_fmt;
 
-	u_int8_t * buf;		/* pointer to buffer */
-	u_int8_t * start;	/* upper layer buffer start */
-	u_int8_t * end;		/* upper layer buffer end */
-	u_int8_t * cur;		/* current position in upper layer buffer */
+	uint8_t * buf;		/* pointer to buffer */
+	uint8_t * start;	/* upper layer buffer start */
+	uint8_t * end;		/* upper layer buffer end */
+	uint8_t * cur;		/* current position in upper layer buffer */
 
-	u_int32_t block_size;
-	u_int32_t sample_rate;
-	u_int32_t format;
-	u_int32_t pcm_format[2];
+	uint32_t block_size;
+	uint32_t sample_rate;
+	uint32_t format;
+	uint32_t pcm_format[2];
 
-	u_int16_t bytes_per_frame;
+	uint16_t bytes_per_frame;
 
-	u_int8_t valid;
-	u_int8_t iface_index;
-	u_int8_t iface_alt_index;
+	uint8_t valid;
+	uint8_t iface_index;
+	uint8_t iface_alt_index;
 };
 
 #define UMIDI_N_TRANSFER    4 /* units */
@@ -169,10 +169,10 @@
 
 struct umidi_sub_chan {
     struct usb_cdev cdev;
-    u_int8_t * temp_cmd;
-    u_int8_t temp_0[4];
-    u_int8_t temp_1[4];
-    u_int8_t state;
+    uint8_t * temp_cmd;
+    uint8_t temp_0[4];
+    uint8_t temp_1[4];
+    uint8_t state;
 #define UMIDI_ST_UNKNOWN   0 /* scan for command */
 #define UMIDI_ST_1PARAM    1
 #define UMIDI_ST_2PARAM_1  2
@@ -181,9 +181,9 @@
 #define UMIDI_ST_SYSEX_1   5
 #define UMIDI_ST_SYSEX_2   6
 
-    u_int8_t read_open : 1;
-    u_int8_t write_open : 1;
-    u_int8_t unused : 6;
+    uint8_t read_open : 1;
+    uint8_t write_open : 1;
+    uint8_t unused : 6;
 };
 
 struct umidi_chan {
@@ -193,19 +193,19 @@
 
     struct usbd_xfer *xfer[UMIDI_N_TRANSFER];
 
-    u_int8_t iface_index;
-    u_int8_t iface_alt_index;
+    uint8_t iface_index;
+    uint8_t iface_alt_index;
 
-    u_int8_t flags;
+    uint8_t flags;
 #define UMIDI_FLAG_READ_STALL  0x01
 #define UMIDI_FLAG_WRITE_STALL 0x02
 
-    u_int8_t read_open_refcount;
-    u_int8_t write_open_refcount;
+    uint8_t read_open_refcount;
+    uint8_t write_open_refcount;
 
-    u_int8_t curr_cable;
-    u_int8_t max_cable;
-    u_int8_t valid;
+    uint8_t curr_cable;
+    uint8_t max_cable;
+    uint8_t valid;
 };
 
 struct uaudio_softc {
@@ -221,29 +221,29 @@
 	struct uaudio_mixer_node * sc_mixer_root;
 	struct uaudio_mixer_node * sc_mixer_curr;
 
-	u_int32_t	sc_buffer_size;
-	u_int32_t	sc_mix_info;
-	u_int32_t	sc_recsrc_info;
-	u_int32_t	sc_quirks;
+	uint32_t	sc_buffer_size;
+	uint32_t	sc_mix_info;
+	uint32_t	sc_recsrc_info;
+	uint32_t	sc_quirks;
 
-	u_int16_t	sc_audio_rev;
-	u_int16_t	sc_mixer_count;
+	uint16_t	sc_audio_rev;
+	uint16_t	sc_mixer_count;
 
-	u_int8_t	sc_sndstat_valid;
-	u_int8_t	sc_mixer_iface_index;
-	u_int8_t	sc_mixer_iface_no;
-	u_int8_t	sc_mixer_chan;
-	u_int8_t	sc_pcm_registered : 1;
-	u_int8_t	sc_mixer_init : 1;
-	u_int8_t	sc_unused : 6;
+	uint8_t	sc_sndstat_valid;
+	uint8_t	sc_mixer_iface_index;
+	uint8_t	sc_mixer_iface_no;
+	uint8_t	sc_mixer_chan;
+	uint8_t	sc_pcm_registered : 1;
+	uint8_t	sc_mixer_init : 1;
+	uint8_t	sc_unused : 6;
 };
 
 struct uaudio_search_result {
-	u_int8_t bit_input[(256+7)/8];
-	u_int8_t bit_output[(256+7)/8];
-	u_int8_t bit_visited[(256+7)/8];
-	u_int8_t recurse_level;
-	u_int8_t id_max;
+	uint8_t bit_input[(256+7)/8];
+	uint8_t bit_output[(256+7)/8];
+	uint8_t bit_visited[(256+7)/8];
+	uint8_t recurse_level;
+	uint8_t id_max;
 };
 
 struct uaudio_terminal_node {
@@ -262,9 +262,9 @@
 };
 
 struct uaudio_format {
-	u_int16_t wFormat;
-	u_int8_t  bPrecision;
-	u_int32_t freebsd_fmt;
+	uint16_t wFormat;
+	uint8_t  bPrecision;
+	uint32_t freebsd_fmt;
 	const char * description;
 };
 
@@ -319,8 +319,8 @@
 
 static void
 uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usbd_device *udev,
-			  u_int32_t rate, u_int16_t fps, u_int8_t channels, 
-			  u_int8_t bit_resolution);
+			  uint32_t rate, uint16_t fps, uint8_t channels, 
+			  uint8_t bit_resolution);
 
 static void
 uaudio_chan_fill_info(struct uaudio_softc *sc, struct usbd_device *udev);
@@ -343,9 +343,9 @@
 static void
 uaudio_mixer_add_selector(struct uaudio_softc *sc, 
 			  const struct uaudio_terminal_node *iot, int id);
-static u_int32_t
+static uint32_t
 uaudio_mixer_feature_get_bmaControls(const struct usb_audio_feature_unit *d, 
-				     u_int8_t index);
+				     uint8_t index);
 static void
 uaudio_mixer_add_feature(struct uaudio_softc *sc, 
 			 const struct uaudio_terminal_node *iot, int id);
@@ -360,65 +360,65 @@
 uaudio_mixer_add_extension(struct uaudio_softc *sc, 
 			   const struct uaudio_terminal_node *iot, int id);
 static const void *
-uaudio_mixer_verify_desc(const void *arg, u_int32_t len);
+uaudio_mixer_verify_desc(const void *arg, uint32_t len);
 
 #ifdef USB_DEBUG
 static void
-uaudio_mixer_dump_cluster(u_int8_t id, const struct uaudio_terminal_node *iot);
+uaudio_mixer_dump_cluster(uint8_t id, const struct uaudio_terminal_node *iot);
 #endif
 
 static struct usb_audio_cluster
-uaudio_mixer_get_cluster(u_int8_t id, const struct uaudio_terminal_node *iot);
+uaudio_mixer_get_cluster(uint8_t id, const struct uaudio_terminal_node *iot);
 
 #ifdef USB_DEBUG
 static const char *
-uaudio_mixer_get_terminal_name(u_int16_t terminal_type);
+uaudio_mixer_get_terminal_name(uint16_t terminal_type);
 #endif
 
-static u_int16_t
+static uint16_t
 uaudio_mixer_determine_class(const struct uaudio_terminal_node *iot, 
 			     struct uaudio_mixer_node *mix);
-static u_int16_t 
+static uint16_t 
 uaudio_mixer_feature_name(const struct uaudio_terminal_node *iot, 
 			  struct uaudio_mixer_node *mix);
 
 static const struct uaudio_terminal_node *
-uaudio_mixer_get_input(const struct uaudio_terminal_node *iot, u_int8_t index);
+uaudio_mixer_get_input(const struct uaudio_terminal_node *iot, uint8_t index);
 
 static const struct uaudio_terminal_node *
 uaudio_mixer_get_output(const struct uaudio_terminal_node *iot, 
-			u_int8_t index);
+			uint8_t index);
 static void
 uaudio_mixer_find_inputs_sub(struct uaudio_terminal_node *root, 
-			     const u_int8_t *p_id, u_int8_t n_id, 
+			     const uint8_t *p_id, uint8_t n_id, 
 			     struct uaudio_search_result *info);
 static void
-uaudio_mixer_find_outputs_sub(struct uaudio_terminal_node *root, u_int8_t id, 
-			      u_int8_t n_id,
+uaudio_mixer_find_outputs_sub(struct uaudio_terminal_node *root, uint8_t id, 
+			      uint8_t n_id,
 			      struct uaudio_search_result *info);
 static void
 uaudio_mixer_fill_info(struct uaudio_softc *sc, struct usbd_device *udev, 
 		       void *desc);
-static u_int16_t
-uaudio_mixer_get(struct usbd_device *udev, u_int8_t what,
+static uint16_t
+uaudio_mixer_get(struct usbd_device *udev, uint8_t what,
 		 struct uaudio_mixer_node *mc);
 static usbd_status
-uaudio_set_speed(struct usbd_device *udev, u_int8_t endpt, u_int32_t speed);
+uaudio_set_speed(struct usbd_device *udev, uint8_t endpt, uint32_t speed);
 
 static int
-uaudio_mixer_signext(u_int8_t type, int val);
+uaudio_mixer_signext(uint8_t type, int val);
 
 static int
 uaudio_mixer_bsd2value(struct uaudio_mixer_node *mc, int32_t val);
 
 static void
 uaudio_mixer_ctl_set(struct uaudio_softc *sc, struct uaudio_mixer_node *mc,
-		     u_int8_t chan, int32_t val);
+		     uint8_t chan, int32_t val);
 static void
 uaudio_mixer_init(struct uaudio_softc *sc);
 
-static u_int8_t
-umidi_convert_to_usb(struct umidi_sub_chan *sub, u_int8_t cn, u_int8_t b);
+static uint8_t
+umidi_convert_to_usb(struct umidi_sub_chan *sub, uint8_t cn, uint8_t b);
 
 static struct umidi_sub_chan *
 umidi_sub_by_cdev(struct usb_cdev *cdev);
@@ -556,7 +556,7 @@
 };
 
 static const
-u_int8_t umidi_cmd_to_len[16] = {
+uint8_t umidi_cmd_to_len[16] = {
     [0x0] = 0, /* reserved */
     [0x1] = 0, /* reserved */
     [0x2] = 2, /* bytes */
@@ -892,8 +892,8 @@
 
 static void
 uaudio_chan_fill_info_sub(struct uaudio_softc *sc, struct usbd_device *udev,
-			u_int32_t rate, u_int16_t fps, u_int8_t channels, 
-			u_int8_t bit_resolution)
+			uint32_t rate, uint16_t fps, uint8_t channels, 
+			uint8_t bit_resolution)
 {
 	usb_descriptor_t *desc = NULL;
 	const struct usb_audio_streaming_interface_descriptor *asid = NULL;
@@ -905,18 +905,18 @@
 	usb_interface_descriptor_t *id;
 	const struct uaudio_format *p_fmt;
 	struct uaudio_chan * chan;
-	u_int16_t curidx = 0xFFFF;
-	u_int16_t lastidx = 0xFFFF;
-	u_int16_t alt_index = 0;
-	u_int16_t wFormat;
-	u_int8_t ep_dir;
-	u_int8_t ep_type;
-	u_int8_t ep_sync;
-	u_int8_t bChannels;
-	u_int8_t bBitResolution;
-	u_int8_t x;
-	u_int8_t audio_if = 0;
-	u_int8_t sample_size;
+	uint16_t curidx = 0xFFFF;
+	uint16_t lastidx = 0xFFFF;
+	uint16_t alt_index = 0;
+	uint16_t wFormat;
+	uint8_t ep_dir;
+	uint8_t ep_type;
+	uint8_t ep_sync;
+	uint8_t bChannels;
+	uint8_t bBitResolution;
+	uint8_t x;
+	uint8_t audio_if = 0;
+	uint8_t sample_size;
 
 	while ((desc = usbd_desc_foreach(cd, desc))) {
 
@@ -1180,13 +1180,13 @@
 static void
 uaudio_chan_fill_info(struct uaudio_softc *sc, struct usbd_device *udev)
 {
-	u_int32_t rate = uaudio_default_rate;
-	u_int32_t z;
-	u_int16_t fps = (usbd_get_speed(udev) == USB_SPEED_HIGH) ? 8000 : 1000;
-	u_int8_t bits = uaudio_default_bits;
-	u_int8_t y;
-	u_int8_t channels = uaudio_default_channels;
-	u_int8_t x;
+	uint32_t rate = uaudio_default_rate;
+	uint32_t z;
+	uint16_t fps = (usbd_get_speed(udev) == USB_SPEED_HIGH) ? 8000 : 1000;
+	uint8_t bits = uaudio_default_bits;
+	uint8_t y;
+	uint8_t channels = uaudio_default_channels;
+	uint8_t x;
 
 	bits -= (bits % 8);
 	rate -= (rate % fps);
@@ -1222,8 +1222,8 @@
 {
 	struct uaudio_chan *ch = xfer->priv_sc;
 	uint32_t * p_len = xfer->frlengths;
-	u_int32_t n;
-	u_int32_t total = (ch->bytes_per_frame * xfer->nframes);
+	uint32_t n;
+	uint32_t total = (ch->bytes_per_frame * xfer->nframes);
 	uint32_t offset;
 
 	USBD_CHECK_STATUS(xfer);
@@ -1290,9 +1290,9 @@
 {
 	struct uaudio_chan *ch = xfer->priv_sc;
 	uint32_t * p_len = xfer->frlengths;
-	u_int32_t n;
-	u_int32_t m;
-	u_int32_t total = (xfer->nframes * ch->bytes_per_frame);
+	uint32_t n;
+	uint32_t m;
+	uint32_t total = (xfer->nframes * ch->bytes_per_frame);
 	uint32_t offset0;
 	uint32_t offset1;
 
@@ -1369,9 +1369,9 @@
 {
 	struct uaudio_chan *ch = ((dir == PCMDIR_PLAY) ? 
 				  &(sc->sc_play_chan) : &(sc->sc_rec_chan));
-	u_int8_t endpoint;
-	u_int8_t iface_index;
-	u_int8_t alt_index;
+	uint8_t endpoint;
+	uint8_t iface_index;
+	uint8_t alt_index;
 	usbd_status err;
 
 	ch->buf = malloc(sc->sc_buffer_size, M_DEVBUF, M_WAITOK | M_ZERO);
@@ -1475,7 +1475,7 @@
 }
 
 int
-uaudio_chan_set_param_blocksize(struct uaudio_chan *ch, u_int32_t blocksize)
+uaudio_chan_set_param_blocksize(struct uaudio_chan *ch, uint32_t blocksize)
 {
 	uint32_t max = sndbuf_getmaxsize(ch->pcm_buf);
 
@@ -1519,7 +1519,7 @@
 }
 
 int
-uaudio_chan_set_param_speed(struct uaudio_chan *ch, u_int32_t speed)
+uaudio_chan_set_param_speed(struct uaudio_chan *ch, uint32_t speed)
 {
 	if (speed != ch->sample_rate) {
 	    DPRINTF(0, "rate conversion required\n");
@@ -1540,7 +1540,7 @@
 }
 
 int
-uaudio_chan_set_param_format(struct uaudio_chan *ch, u_int32_t format)
+uaudio_chan_set_param_format(struct uaudio_chan *ch, uint32_t format)
 {
 	ch->format = format;
 	return 0;
@@ -1645,7 +1645,7 @@
 
 #ifdef USB_DEBUG
 	if (uaudio_debug > 2) {
-	    u_int8_t i;
+	    uint8_t i;
 	    for (i = 0; i < mc->nchan; i++) {
 	        DPRINTF(0, "[mix] wValue=%04x\n", mc->wValue[0]);
 	    }
@@ -1699,16 +1699,16 @@
 	const struct usb_audio_mixer_unit_0 *d0 = iot[id].u.mu;
 	const struct usb_audio_mixer_unit_1 *d1;
 
-	u_int32_t bno; /* bit number */
-	u_int32_t p; /* bit number accumulator */
-	u_int32_t mo; /* matching outputs */
-	u_int32_t mc; /* matching channels */
-	u_int32_t ichs; /* input channels */
-	u_int32_t ochs; /* output channels */
-	u_int32_t c;
-	u_int32_t chs;  /* channels */
-	u_int32_t i;
-	u_int32_t o;
+	uint32_t bno; /* bit number */
+	uint32_t p; /* bit number accumulator */
+	uint32_t mo; /* matching outputs */
+	uint32_t mc; /* matching channels */
+	uint32_t ichs; /* input channels */
+	uint32_t ochs; /* output channels */
+	uint32_t c;
+	uint32_t chs;  /* channels */
+	uint32_t i;
+	uint32_t o;
 
 	DPRINTF(2, "bUnitId=%d bNrInPins=%d\n",
 		d0->bUnitId, d0->bNrInPins);
@@ -1784,7 +1784,7 @@
 	const struct usb_audio_selector_unit *d = iot[id].u.su;
 	struct uaudio_mixer_node mix;
 	struct uaudio_mixer_node dummy;
-	u_int16_t i;
+	uint16_t i;
 
 	DPRINTF(2, "bUnitId=%d bNrInPins=%d\n",
 		d->bUnitId, d->bNrInPins);
@@ -1823,12 +1823,12 @@
 	return;
 }
 
-static u_int32_t
+static uint32_t
 uaudio_mixer_feature_get_bmaControls(const struct usb_audio_feature_unit *d, 
-				     u_int8_t index)
+				     uint8_t index)
 {
-	u_int32_t temp = 0;
-	u_int32_t offset = (index * d->bControlSize);
+	uint32_t temp = 0;
+	uint32_t offset = (index * d->bControlSize);
 
 	if (d->bControlSize > 0) {
 	    temp |= d->bmaControls[offset];
@@ -1851,14 +1851,14 @@
 {
 	const struct usb_audio_feature_unit *d = iot[id].u.fu;
 	struct uaudio_mixer_node mix;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon Oct  1 19:08:17 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B47A16A46B; Mon,  1 Oct 2007 19:08:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3DDBA16A417
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 19:08:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3DA5313C4A6
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 19:08:17 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l91J8HSE023418
	for <perforce@FreeBSD.org>; Mon, 1 Oct 2007 19:08:17 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l91J8GFB023415
	for perforce@freebsd.org; Mon, 1 Oct 2007 19:08:16 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 1 Oct 2007 19:08:16 GMT
Message-Id: <200710011908.l91J8GFB023415@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127071 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2007 19:08:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=127071

Change 127071 by hselasky@hselasky_laptop001 on 2007/10/01 19:08:00

	
	Style change (see "man style"):
	
	  - space after "if|while|for|return|switch"
	
	Done by the help of the following script kernel
	and the Norwegian character "ř":
	
	[ -f src/$F ] && (cat src/$F | \
	sed -E -e "s/[	 ](if|while|for|return|switch)[(]/&ř/g" | \
	sed -e "s/[(]ř/ (/g" > temp) && ((diff -u src/$F temp > /dev/null) || \
	(cp temp src/$F))

Affected files ...

.. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#7 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.c#43 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#30 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#28 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/uark.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/ucom.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/ucycom.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdi.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.c#35 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/uhub.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/uipaq.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/umass.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/umct.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#26 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#23 edit
.. //depot/projects/usb/src/sys/dev/usb/uplcom.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/urio.c#13 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#6 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_requests.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#45 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/uvisor.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#24 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#15 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#10 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#7 (text+ko) ====

@@ -129,12 +129,12 @@
 #define MIXER_SET_UNLOCK(x, y)		do {				\
 	if ((y) != 0)							\
 		snd_mtxunlock((x)->lock);				\
-} while(0)
+} while (0)
 
 #define MIXER_SET_LOCK(x, y)		do {				\
 	if ((y) != 0)							\
 		snd_mtxlock((x)->lock);					\
-} while(0)
+} while (0)
 
 static int
 mixer_set_softpcmvol(struct snd_mixer *m, struct snddev_info *d,

==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#17 (text+ko) ====

@@ -925,7 +925,7 @@
 
 	        id = (void *)desc;
 
-	        if(id->bInterfaceNumber != lastidx) {
+	        if (id->bInterfaceNumber != lastidx) {
 		    lastidx = id->bInterfaceNumber;
 		    curidx++;
 		    alt_index = 0;
@@ -2051,7 +2051,7 @@
 	    uaudio_mixer_add_ctl(sc, &mix);
 	}
 
-	switch(ptype) {
+	switch (ptype) {
 	case UPDOWNMIX_PROCESS:
 	    uaudio_mixer_add_processing_updown(sc, iot, id);
 	    break;
@@ -2591,7 +2591,7 @@
 	    return SOUND_MIXER_IMIX;
 	}
 
-	while(uat->terminal_type) {
+	while (uat->terminal_type) {
 	    if (uat->terminal_type == terminal_type) {
 	        break;
 	    }
@@ -2618,7 +2618,7 @@
 	        return (root + n);
 	    }
 	}
-    } while(n--);
+    } while (n--);
 
     return NULL;
 }
@@ -2636,7 +2636,7 @@
 	        return (root + n);
 	    }
 	}
-    } while(n--);
+    } while (n--);
 
     return NULL;
 }
@@ -2745,7 +2745,7 @@
 		    iot->usr.bit_output[j/8] |= (1 << (j % 8));
 		}
 	    }
-	} while(j--);
+	} while (j--);
 
 	return;
 }
@@ -2832,7 +2832,7 @@
 	i = ID_max;
 	do {
 	  uaudio_mixer_find_inputs_sub(iot, &i, 1, &((iot+i)->usr));
-	} while(i--);
+	} while (i--);
 
 	/*
 	 * determine outputs for
@@ -2841,7 +2841,7 @@
 	i = ID_max;
 	do {
 	  uaudio_mixer_find_outputs_sub(iot, i, ID_max, &((iot+i)->usr));
-	} while(i--);
+	} while (i--);
 
 	/* set "id_max" and "root" */
 
@@ -2849,7 +2849,7 @@
 	do {
 	    (iot + i)->usr.id_max = ID_max;
 	    (iot + i)->root = iot;
-	} while(i--);
+	} while (i--);
 
 #ifdef USB_DEBUG
 	i = ID_max;
@@ -2924,7 +2924,7 @@
 	      if (iot[i].usr.bit_input[j/8] & (1 << (j % 8))) {
 		  DPRINTF(0, "  -- ID=%d\n", j);
 	      }
-	    } while(j--);
+	    } while (j--);
 
 	    DPRINTF(0, "Outputs from this ID are:\n");
 
@@ -2933,9 +2933,9 @@
 	      if (iot[i].usr.bit_output[j/8] & (1 << (j % 8))) {
 		  DPRINTF(0, "  -- ID=%d\n", j);
 	      }
-	    } while(j--);
+	    } while (j--);
 
-	} while(i--);
+	} while (i--);
 #endif
 
 	/*
@@ -2993,7 +2993,7 @@
 		break;
 	    }
 
-	} while(i--);
+	} while (i--);
 
  done:
 	if (iot) {

==== //depot/projects/usb/src/sys/dev/usb/ehci.c#43 (text+ko) ====

@@ -89,8 +89,8 @@
 static void
 ehci_dump_sqh(ehci_qh_t *sqh);
 #else
-#define DPRINTF(x) do { } while(0)
-#define DPRINTFN(n,x) do { } while(0)
+#define DPRINTF(x) do { } while (0)
+#define DPRINTFN(n,x) do { } while (0)
 #endif
 
 #define EHCI_INTR_ENDPT 1
@@ -151,7 +151,7 @@
 			   CALLOUT_RETURNUNLOCKED);
 
 #ifdef USB_DEBUG
-	if(ehcidebug > 2)
+	if (ehcidebug > 2)
 	{
 		ehci_dump_regs(sc);
 	}
@@ -170,7 +170,7 @@
 	cparams = EREAD4(sc, EHCI_HCCPARAMS);
 	DPRINTF(("cparams=0x%x\n", cparams));
 
-	if(EHCI_HCC_64BIT(cparams))
+	if (EHCI_HCC_64BIT(cparams))
 	{
 		DPRINTF(("HCC uses 64-bit structures\n"));
 
@@ -185,11 +185,11 @@
 	EOWRITE4(sc, EHCI_USBCMD, 0);	/* Halt controller */
 	DELAY(1000*1);
 	EOWRITE4(sc, EHCI_USBCMD, EHCI_CMD_HCRESET);
-	for(i = 0; i < 100; i++)
+	for (i = 0; i < 100; i++)
 	{
 		DELAY(1000*1);
 		hcr = EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_HCRESET;
-		if(!hcr)
+		if (!hcr)
 		{
 			break;
 		}
@@ -208,7 +208,7 @@
 	 * 2:  256*4 bytes
 	 * 3:      unknown
 	 */
-	if(EHCI_CMD_FLS(EOREAD4(sc, EHCI_USBCMD)) == 3)
+	if (EHCI_CMD_FLS(EOREAD4(sc, EHCI_USBCMD)) == 3)
 	{
 		device_printf(sc->sc_bus.bdev, "invalid frame-list-size\n");
 		err = USBD_IOERROR;
@@ -222,7 +222,7 @@
 
 	usbd_page_dma_exit(&(sc->sc_hw_page));
 
-	for(i = 0; i < EHCI_VIRTUAL_FRAMELIST_COUNT; i++)
+	for (i = 0; i < EHCI_VIRTUAL_FRAMELIST_COUNT; i++)
 	{
 		hw_ptr->intr_start[i].qh_self = 
 		  htole32(SC_HW_PHYSADDR(sc,intr_start[i])|EHCI_LINK_QH);
@@ -252,10 +252,10 @@
 	 * powers of 2 times 1ms
 	 */
 	bit = EHCI_VIRTUAL_FRAMELIST_COUNT/2;
-	while(bit)
+	while (bit)
 	{
 		x = bit;
-		while(x & bit)
+		while (x & bit)
 		{
 			y = (x ^ bit)|(bit/2);
 
@@ -272,7 +272,7 @@
 	/* the last (1ms) QH terminates */
 	hw_ptr->intr_start[0].qh_link = htole32(EHCI_LINK_TERMINATE);
 
-	for(i = 0; i < EHCI_VIRTUAL_FRAMELIST_COUNT; i++)
+	for (i = 0; i < EHCI_VIRTUAL_FRAMELIST_COUNT; i++)
 	{
 		/* initialize full speed isochronous */
 
@@ -312,7 +312,7 @@
 	 * pframes -> high speed isochronous -> 
 	 *    full speed isochronous -> interrupt QH's
 	 */
-	for(i = 0; i < EHCI_FRAMELIST_COUNT; i++)
+	for (i = 0; i < EHCI_FRAMELIST_COUNT; i++)
 	{
 		hw_ptr->pframes[i] = hw_ptr->isoc_hs_start
 		  [i & (EHCI_VIRTUAL_FRAMELIST_COUNT-1)].itd_self;
@@ -349,7 +349,7 @@
 	usbd_page_dma_enter(&(sc->sc_hw_page));
 
 #ifdef USB_DEBUG
-	if(ehcidebug)
+	if (ehcidebug)
 	{
 		ehci_dump_sqh(&(hw_ptr->async_start));
 	}
@@ -373,11 +373,11 @@
 	/* Take over port ownership */
 	EOWRITE4(sc, EHCI_CONFIGFLAG, EHCI_CONF_CF);
 
-	for(i = 0; i < 100; i++)
+	for (i = 0; i < 100; i++)
 	{
 		DELAY(1000*1);
 		hcr = EOREAD4(sc, EHCI_USBSTS) & EHCI_STS_HCH;
-		if(!hcr)
+		if (!hcr)
 		{
 			break;
 		}
@@ -431,10 +431,10 @@
 
 	mtx_lock(&sc->sc_bus.mtx);
 
-	for(i = 1; i <= sc->sc_noport; i++)
+	for (i = 1; i <= sc->sc_noport; i++)
 	{
 		cmd = EOREAD4(sc, EHCI_PORTSC(i));
-		if(((cmd & EHCI_PS_PO) == 0) &&
+		if (((cmd & EHCI_PS_PO) == 0) &&
 		   ((cmd & EHCI_PS_PE) == EHCI_PS_PE))
 		{
 			EOWRITE4(sc, EHCI_PORTSC(i),
@@ -447,12 +447,12 @@
 	cmd = sc->sc_cmd & ~(EHCI_CMD_ASE | EHCI_CMD_PSE);
 	EOWRITE4(sc, EHCI_USBCMD, cmd);
 
-	for(i = 0; i < 100; i++)
+	for (i = 0; i < 100; i++)
 	{
 		hcr = EOREAD4(sc, EHCI_USBSTS) &
 		  (EHCI_STS_ASS | EHCI_STS_PSS);
 
-		if(hcr == 0)
+		if (hcr == 0)
 		{
 			break;
 		}
@@ -460,7 +460,7 @@
 		DELAY(1000*1);
 	}
 
-	if(hcr != 0)
+	if (hcr != 0)
 	{
 		device_printf(sc->sc_bus.bdev, "reset timeout\n");
 	}
@@ -506,10 +506,10 @@
 	EOWRITE4(sc, EHCI_USBINTR, sc->sc_eintrs);
 
 	hcr = 0;
-	for(i = 1; i <= sc->sc_noport; i++)
+	for (i = 1; i <= sc->sc_noport; i++)
 	{
 	    cmd = EOREAD4(sc, EHCI_PORTSC(i));
-	    if(((cmd & EHCI_PS_PO) == 0) &&
+	    if (((cmd & EHCI_PS_PO) == 0) &&
 	       ((cmd & EHCI_PS_SUSP) == EHCI_PS_SUSP))
 	    {
 	        EOWRITE4(sc, EHCI_PORTSC(i),
@@ -518,14 +518,14 @@
 	    }
 	}
 
-	if(hcr)
+	if (hcr)
 	{
 		DELAY(1000*USB_RESUME_WAIT);
 
-		for(i = 1; i <= sc->sc_noport; i++)
+		for (i = 1; i <= sc->sc_noport; i++)
 		{
 			cmd = EOREAD4(sc, EHCI_PORTSC(i));
-			if(((cmd & EHCI_PS_PO) == 0) &&
+			if (((cmd & EHCI_PS_PO) == 0) &&
 			   ((cmd & EHCI_PS_SUSP) == EHCI_PS_SUSP))
 			{
 				EOWRITE4(sc, EHCI_PORTSC(i),
@@ -536,17 +536,17 @@
 
 	EOWRITE4(sc, EHCI_USBCMD, sc->sc_cmd);
 
-	for(i = 0; i < 100; i++)
+	for (i = 0; i < 100; i++)
 	{
 		hcr = EOREAD4(sc, EHCI_USBSTS) & EHCI_STS_HCH;
-		if(hcr != EHCI_STS_HCH)
+		if (hcr != EHCI_STS_HCH)
 		{
 			break;
 		}
 
 		DELAY(1000*1);
 	}
-	if(hcr == EHCI_STS_HCH)
+	if (hcr == EHCI_STS_HCH)
 	{
 		device_printf(sc->sc_bus.bdev, "config timeout\n");
 	}
@@ -583,62 +583,62 @@
 	i = EOREAD4(sc, EHCI_USBCMD);
 	printf("cmd=0x%08x\n", i);
 
-	if(i &  EHCI_CMD_ITC_1)
+	if (i &  EHCI_CMD_ITC_1)
 	  printf(" EHCI_CMD_ITC_1\n");
-	if(i &  EHCI_CMD_ITC_2)
+	if (i &  EHCI_CMD_ITC_2)
 	  printf(" EHCI_CMD_ITC_2\n");
-	if(i &  EHCI_CMD_ITC_4)
+	if (i &  EHCI_CMD_ITC_4)
 	  printf(" EHCI_CMD_ITC_4\n");
-	if(i &  EHCI_CMD_ITC_8)
+	if (i &  EHCI_CMD_ITC_8)
 	  printf(" EHCI_CMD_ITC_8\n");
-	if(i &  EHCI_CMD_ITC_16)
+	if (i &  EHCI_CMD_ITC_16)
 	  printf(" EHCI_CMD_ITC_16\n");
-	if(i &  EHCI_CMD_ITC_32)
+	if (i &  EHCI_CMD_ITC_32)
 	  printf(" EHCI_CMD_ITC_32\n");
-	if(i &  EHCI_CMD_ITC_64)
+	if (i &  EHCI_CMD_ITC_64)
 	  printf(" EHCI_CMD_ITC_64\n");
-	if(i & EHCI_CMD_ASPME)
+	if (i & EHCI_CMD_ASPME)
 	  printf(" EHCI_CMD_ASPME\n");
-	if(i & EHCI_CMD_ASPMC)
+	if (i & EHCI_CMD_ASPMC)
 	  printf(" EHCI_CMD_ASPMC\n");
-	if(i & EHCI_CMD_LHCR)
+	if (i & EHCI_CMD_LHCR)
 	  printf(" EHCI_CMD_LHCR\n");
-	if(i & EHCI_CMD_IAAD)
+	if (i & EHCI_CMD_IAAD)
 	  printf(" EHCI_CMD_IAAD\n");
-	if(i & EHCI_CMD_ASE)
+	if (i & EHCI_CMD_ASE)
 	  printf(" EHCI_CMD_ASE\n");
-	if(i & EHCI_CMD_PSE)
+	if (i & EHCI_CMD_PSE)
 	  printf(" EHCI_CMD_PSE\n");
-	if(i & EHCI_CMD_FLS_M)
+	if (i & EHCI_CMD_FLS_M)
 	  printf(" EHCI_CMD_FLS_M\n");
-	if(i & EHCI_CMD_HCRESET)
+	if (i & EHCI_CMD_HCRESET)
 	  printf(" EHCI_CMD_HCRESET\n");
-	if(i & EHCI_CMD_RS)
+	if (i & EHCI_CMD_RS)
 	  printf(" EHCI_CMD_RS\n");
 
 	i = EOREAD4(sc, EHCI_USBSTS);
 
 	printf("sts=0x%08x\n", i);
 
-	if(i & EHCI_STS_ASS)
+	if (i & EHCI_STS_ASS)
 	  printf(" EHCI_STS_ASS\n");
-	if(i & EHCI_STS_PSS)
+	if (i & EHCI_STS_PSS)
 	  printf(" EHCI_STS_PSS\n");
-	if(i & EHCI_STS_REC)
+	if (i & EHCI_STS_REC)
 	  printf(" EHCI_STS_REC\n");
-	if(i & EHCI_STS_HCH)
+	if (i & EHCI_STS_HCH)
 	  printf(" EHCI_STS_HCH\n");
-	if(i & EHCI_STS_IAA)
+	if (i & EHCI_STS_IAA)
 	  printf(" EHCI_STS_IAA\n");
-	if(i & EHCI_STS_HSE)
+	if (i & EHCI_STS_HSE)
 	  printf(" EHCI_STS_HSE\n");
-	if(i & EHCI_STS_FLR)
+	if (i & EHCI_STS_FLR)
 	  printf(" EHCI_STS_FLR\n");
-	if(i & EHCI_STS_PCD)
+	if (i & EHCI_STS_PCD)
 	  printf(" EHCI_STS_PCD\n");
-	if(i & EHCI_STS_ERRINT)
+	if (i & EHCI_STS_ERRINT)
 	  printf(" EHCI_STS_ERRINT\n");
-	if(i & EHCI_STS_INT)
+	if (i & EHCI_STS_INT)
 	  printf(" EHCI_STS_INT\n");
 
 	printf("ien=0x%08x\n",
@@ -648,7 +648,7 @@
 	       EOREAD4(sc, EHCI_CTRLDSSEGMENT),
 	       EOREAD4(sc, EHCI_PERIODICLISTBASE),
 	       EOREAD4(sc, EHCI_ASYNCLISTADDR));
-	for(i = 1; i <= sc->sc_noport; i++)
+	for (i = 1; i <= sc->sc_noport; i++)
 	{
 		printf("port %d status=0x%08x\n", i,
 		       EOREAD4(sc, EHCI_PORTSC(i)));
@@ -701,12 +701,12 @@
 	       (s & EHCI_QTD_SPLITXSTATE) ? "-SPLIT" : "",
 	       (s & EHCI_QTD_PINGSTATE) ? "-PING" : "");
 
-	for(s = 0; s < 5; s++)
+	for (s = 0; s < 5; s++)
 	{
 		printf("  buffer[%d]=0x%08x\n", s, 
 		       le32toh(qtd->qtd_buffer[s]));
 	}
-	for(s = 0; s < 5; s++)
+	for (s = 0; s < 5; s++)
 	{
 		printf("  buffer_hi[%d]=0x%08x\n", s, 
 		       le32toh(qtd->qtd_buffer_hi[s]));
@@ -733,11 +733,11 @@
 	uint8_t stop;
 
 	stop = 0;
-	for(i = 0; sqtd && (i < 20) && !stop; sqtd = sqtd->obj_next, i++)
+	for (i = 0; sqtd && (i < 20) && !stop; sqtd = sqtd->obj_next, i++)
 	{
 		stop = ehci_dump_sqtd(sqtd);
 	}
-	if(sqtd)
+	if (sqtd)
 	{
 		printf("dump aborted, too many TDs\n");
 	}
@@ -868,13 +868,13 @@
 	itd = sc->sc_isoc_hs_p_last[pos];
 	sitd = sc->sc_isoc_fs_p_last[pos];
 
-	while(itd && max && max--)
+	while (itd && max && max--)
 	{
 		ehci_dump_itd(itd);
 		itd = itd->prev;
 	}
 
-	while(sitd && max && max--)
+	while (sitd && max && max--)
 	{
 		ehci_dump_sitd(sitd);
 		sitd = sitd->prev;
@@ -909,7 +909,7 @@
 
 	usbd_page_dma_enter(last->page);
 
-	return(std);
+	return (std);
 }
 
 #define EHCI_APPEND_HS_TD(std,last) (last) = _ehci_append_hs_td(std,last)
@@ -938,7 +938,7 @@
 
 	usbd_page_dma_enter(last->page);
 
-	return(std);
+	return (std);
 }
 
 #define EHCI_APPEND_QH(sqh,last) (last) = _ehci_append_qh(sqh,last)
@@ -969,13 +969,13 @@
 	usbd_page_dma_enter(last->page);
 
 #ifdef USB_DEBUG
-	if(ehcidebug > 5)
+	if (ehcidebug > 5)
 	{
 		printf("%s:\n", __FUNCTION__);
 		ehci_dump_sqh(sqh);
 	}
 #endif
-	return(sqh);
+	return (sqh);
 }
 
 #define EHCI_REMOVE_FS_TD(std,last) (last) = _ehci_remove_fs_td(std,last)
@@ -993,13 +993,13 @@
 
 	usbd_page_dma_enter(std->prev->page);
 
-	if(std->next)
+	if (std->next)
 	{
 		usbd_page_dma_exit(std->next->page);
 		std->next->prev = std->prev;
 		usbd_page_dma_enter(std->next->page);
 	}
-	return((last == std) ? std->prev : last);
+	return ((last == std) ? std->prev : last);
 }
 
 #define EHCI_REMOVE_HS_TD(std,last) (last) = _ehci_remove_hs_td(std,last)
@@ -1017,13 +1017,13 @@
 
 	usbd_page_dma_enter(std->prev->page);
 
-	if(std->next)
+	if (std->next)
 	{
 		usbd_page_dma_exit(std->next->page);
 		std->next->prev = std->prev;
 		usbd_page_dma_enter(std->next->page);
 	}
-	return((last == std) ? std->prev : last);
+	return ((last == std) ? std->prev : last);
 }
 
 #define EHCI_REMOVE_QH(sqh,last) (last) = _ehci_remove_qh(sqh,last)
@@ -1035,7 +1035,7 @@
 	/* (sc->sc_bus.mtx) must be locked */
 
 	/* only remove if not removed from a queue */
-	if(sqh->prev)
+	if (sqh->prev)
 	{
 		usbd_page_dma_exit(sqh->prev->page);
 
@@ -1044,7 +1044,7 @@
 
 		usbd_page_dma_enter(sqh->prev->page);
 
-		if(sqh->next)
+		if (sqh->next)
 		{
 			usbd_page_dma_exit(sqh->next->page);
 			sqh->next->prev = sqh->prev;
@@ -1066,7 +1066,7 @@
 
 		sqh->prev = 0;
 	}
-	return(last);
+	return (last);
 }
 
 static usbd_status
@@ -1243,7 +1243,7 @@
 
 	uint32_t status;
 
-	if(xfer->usb_thread != ctd)
+	if (xfer->usb_thread != ctd)
 	{
 	    /* cannot call this transfer 
 	     * back due to locking !
@@ -1253,7 +1253,7 @@
 
 	DPRINTFN(12, ("xfer=%p checking transfer\n", xfer));
 
-	if(methods == &ehci_device_isoc_fs_methods)
+	if (methods == &ehci_device_isoc_fs_methods)
 	{
 		ehci_sitd_t *td = xfer->td_transfer_last;
 
@@ -1270,7 +1270,7 @@
 			goto transferred;
 		}
 	}
-	else if(methods == &ehci_device_isoc_hs_methods)
+	else if (methods == &ehci_device_isoc_hs_methods)
 	{
 		ehci_itd_t *td = xfer->td_transfer_last;
 
@@ -1406,12 +1406,12 @@
 	 * we need to squelch the unwanted interrupts until we're
 	 * ready for them.
 	 */
-	if(sc->sc_bus.bdev == NULL)
+	if (sc->sc_bus.bdev == NULL)
 	{
 		goto done;
 	}
 
-	if(ctd)
+	if (ctd)
 	{
 		/* the poll thread should not read
 		 * any status registers that will
@@ -1426,7 +1426,7 @@
 		     device_get_nameunit(sc->sc_bus.bdev)));
 
 #ifdef USB_DEBUG
-	if(ehcidebug > 15)
+	if (ehcidebug > 15)
 	{
 		DPRINTF(("%s\n", device_get_nameunit(sc->sc_bus.bdev)));
 		ehci_dump_regs(sc);
@@ -1434,13 +1434,13 @@
 #endif
 
 	status = EHCI_STS_INTRS(EOREAD4(sc, EHCI_USBSTS));
-	if(status == 0)
+	if (status == 0)
 	{
 		/* the interrupt was not for us */
 		goto done;
 	}
 
-	if(!(status & sc->sc_eintrs))
+	if (!(status & sc->sc_eintrs))
 	{
 		goto done;
 	}
@@ -1449,13 +1449,13 @@
 
 	status &= sc->sc_eintrs;
 
-	if(status & EHCI_STS_IAA)
+	if (status & EHCI_STS_IAA)
 	{
 		DPRINTF(("door bell\n"));
 		wakeup(&sc->sc_async_p_last);
 	}
 
-	if(status & EHCI_STS_HSE)
+	if (status & EHCI_STS_HSE)
 	{
 		device_printf(sc->sc_bus.bdev, "unrecoverable error, "
 			      "controller halted\n");
@@ -1465,7 +1465,7 @@
 #endif
 	}
 
-	if(status & EHCI_STS_PCD)
+	if (status & EHCI_STS_PCD)
 	{
 		/*
 		 * Disable PCD interrupt for now, because it will be
@@ -1486,7 +1486,7 @@
 
 	status &= ~(EHCI_STS_INT | EHCI_STS_ERRINT | EHCI_STS_PCD | EHCI_STS_IAA);
 
-	if(status != 0)
+	if (status != 0)
 	{
 		/* block unprocessed interrupts */
 		sc->sc_eintrs &= ~status;
@@ -1501,7 +1501,7 @@
 		/* check if transfer is
 		 * transferred 
 		 */
-		if(ehci_check_transfer(xfer, ctd))
+		if (ehci_check_transfer(xfer, ctd))
 		{
 		    /* queue callback */
 
@@ -1527,7 +1527,7 @@
 
 	usbd_do_callback(xlist, td);
 
-	if(need_repeat)
+	if (need_repeat)
 	{
 		xptr = xlist;
 
@@ -1598,7 +1598,7 @@
 static void
 ehci_remove_interrupt_info(struct usbd_xfer *xfer)
 {
-	if((xfer)->interrupt_list.le_prev)
+	if ((xfer)->interrupt_list.le_prev)
 	{
 		LIST_REMOVE((xfer), interrupt_list);
 		(xfer)->interrupt_list.le_prev = NULL;
@@ -1942,7 +1942,7 @@
 	xfer->td_transfer_last = td;
 
 #ifdef USB_DEBUG
-	if(ehcidebug > 8)
+	if (ehcidebug > 8)
 	{
 		DPRINTF(("nexttog=%d; data before transfer:\n",
 			 xfer->pipe->toggle_next));
@@ -2080,21 +2080,21 @@
 	DPRINTFN(12, ("xfer=%p pipe=%p transfer done\n",
 		      xfer, xfer->pipe));
 
-	while(nframes--)
+	while (nframes--)
 	{
-	  if(td == NULL)
+	  if (td == NULL)
 	  {
 		panic("%s:%d: out of TD's\n",
 		      __FUNCTION__, __LINE__);
 	  }
 
-	  if(pp_last >= &sc->sc_isoc_fs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT])
+	  if (pp_last >= &sc->sc_isoc_fs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT])
 	  {
 		pp_last = &sc->sc_isoc_fs_p_last[0];
 	  }
 
 #ifdef USB_DEBUG
-	  if(ehcidebug > 15)
+	  if (ehcidebug > 15)
 	  {
 		DPRINTFN(15,("isoc FS-TD\n"));
 		ehci_dump_sitd(td);
@@ -2111,7 +2111,7 @@
 
 	  len = EHCI_SITD_GET_LEN(status);
 
-	  if(*plen >= len)
+	  if (*plen >= len)
 	  {
 		len = *plen - len;
 	  }
@@ -2150,21 +2150,21 @@
 	DPRINTFN(12, ("xfer=%p pipe=%p transfer done\n",
 		      xfer, xfer->pipe));
 
-	while(nframes--)
+	while (nframes--)
 	{
-	  if(td == NULL)
+	  if (td == NULL)
 	  {
 		panic("%s:%d: out of TD's\n",
 		      __FUNCTION__, __LINE__);
 	  }
 
-	  if(pp_last >= &sc->sc_isoc_hs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT])
+	  if (pp_last >= &sc->sc_isoc_hs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT])
 	  {
 		pp_last = &sc->sc_isoc_hs_p_last[0];
 	  }
 
 #ifdef USB_DEBUG
-	  if(ehcidebug > 15)
+	  if (ehcidebug > 15)
 	  {
 		DPRINTFN(15,("isoc HS-TD\n"));
 		ehci_dump_itd(td);
@@ -2181,7 +2181,7 @@
 
 	  len = EHCI_ITD_GET_LEN(status);
 
-	  if(*plen >= len)
+	  if (*plen >= len)
 	  {
 		len = *plen - len;
 	  }
@@ -2195,7 +2195,7 @@
 	  plen++;
 	  td_no++;
 
-	  if((td_no == 8) || (nframes == 0))
+	  if ((td_no == 8) || (nframes == 0))
 	  {
 		/* remove HS-TD from schedule */
 		EHCI_REMOVE_HS_TD(td, *pp_last);
@@ -2230,7 +2230,7 @@
 	/* ... could check for not-completed transfers, 
 	 * instead of setting need_delay ...
 	 */
-	if((error == USBD_CANCELLED) ||
+	if ((error == USBD_CANCELLED) ||
 	   (error == USBD_TIMEOUT))
 	{
 		if (xfer->flags_int.transferring) {
@@ -2242,7 +2242,7 @@
 	    (methods == &ehci_device_ctrl_methods))
 	{
 #ifdef USB_DEBUG
-		if(ehcidebug > 8)
+		if (ehcidebug > 8)
 		{
 			DPRINTF(("nexttog=%d; data after transfer:\n",
 				 xfer->pipe->toggle_next));
@@ -2262,12 +2262,12 @@
 	 * Only finish isochronous transfers once
 	 * which will update "xfer->frlengths".
 	 */
-	if(xfer->td_transfer_first &&
+	if (xfer->td_transfer_first &&
 	   xfer->td_transfer_last)
 	{
 		if (methods == &ehci_device_isoc_fs_methods)
 		{
-			if(ehci_isoc_fs_done(sc, xfer))
+			if (ehci_isoc_fs_done(sc, xfer))
 			{
 				need_delay = 1;
 			}
@@ -2275,7 +2275,7 @@
 
 		if (methods == &ehci_device_isoc_hs_methods)
 		{
-			if(ehci_isoc_hs_done(sc, xfer))
+			if (ehci_isoc_hs_done(sc, xfer))
 			{
 				need_delay = 1;
 			}
@@ -2294,7 +2294,7 @@
 	if ((methods != &ehci_root_ctrl_methods) &&
 	    (methods != &ehci_root_intr_methods)) {
 
-	  if(((methods == &ehci_device_ctrl_methods) ||
+	  if (((methods == &ehci_device_ctrl_methods) ||
 	      (methods == &ehci_device_bulk_methods)) &&
 	     (sc->sc_doorbell_disable == 0)) {
 
@@ -2322,9 +2322,9 @@
 		EOWRITE4(sc, EHCI_USBCMD, 
 			 EOREAD4(sc, EHCI_USBCMD) | EHCI_CMD_IAAD);
 
-		while(EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_IAAD)
+		while (EOREAD4(sc, EHCI_USBCMD) & EHCI_CMD_IAAD)
 		{
-		    if(!to--)
+		    if (!to--)
 		    {
 		        printf("%s: doorbell timeout "
 			       "(disabling)\n", __FUNCTION__);
@@ -2391,7 +2391,7 @@
 	/**/
 	ehci_add_interrupt_info(sc, xfer);
 
-	if(xfer->timeout && (!xfer->flags.use_polling))
+	if (xfer->timeout && (!xfer->flags.use_polling))
 	{
 		__callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
 				(void *)(void *)ehci_timeout, xfer);
@@ -2442,7 +2442,7 @@
 	/**/
 	ehci_add_interrupt_info(sc, xfer);
 
-	if(xfer->timeout && (!xfer->flags.use_polling))
+	if (xfer->timeout && (!xfer->flags.use_polling))
 	{
 		__callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
 				(void *)(void *)ehci_timeout, xfer);
@@ -2491,15 +2491,15 @@
 
 	best = 0;
 	bit = EHCI_VIRTUAL_FRAMELIST_COUNT/2;
-	while(bit)
+	while (bit)
 	{
-		if(xfer->interval >= bit)
+		if (xfer->interval >= bit)
 		{
 			x = bit;
 			best = bit;
-			while(x & bit)
+			while (x & bit)
 			{
-				if(sc->sc_intr_stat[x] < 
+				if (sc->sc_intr_stat[x] < 
 				   sc->sc_intr_stat[best])
 				{
 					best = x;
@@ -2553,7 +2553,7 @@
 	/**/
 	ehci_add_interrupt_info(sc, xfer);
 
-	if(xfer->timeout && (!xfer->flags.use_polling))
+	if (xfer->timeout && (!xfer->flags.use_polling))
 	{
 		__callout_reset(&xfer->timeout_handle, USBD_MS_TO_TICKS(xfer->timeout),
 				(void *)(void *)ehci_timeout, xfer);
@@ -2584,7 +2584,7 @@
 	  EHCI_SITD_SET_HUBA(xfer->udev->hs_hub_addr)|
 	  EHCI_SITD_SET_PORT(xfer->udev->hs_port_no);
 
-	if(UE_GET_DIR(xfer->endpoint) == UE_DIR_IN)
+	if (UE_GET_DIR(xfer->endpoint) == UE_DIR_IN)
 	{
 		sitd_portaddr |= EHCI_SITD_SET_DIR_IN;
 	}
@@ -2593,7 +2593,7 @@
 
 	/* initialize all TD's */
 
-	for(td = xfer->td_start; td; td = td->obj_next)
+	for (td = xfer->td_start; td; td = td->obj_next)
 	{
 		usbd_page_dma_exit(td->page);
 
@@ -2703,15 +2703,15 @@
 
 	fss = fss_start + (xfer->qh_pos % USB_ISOC_TIME_MAX);
 
-	while(nframes--)
+	while (nframes--)
 	{
-		if(td == NULL)
+		if (td == NULL)
 		{
 			panic("%s:%d: out of TD's\n",
 			      __FUNCTION__, __LINE__);
 		}
 
-		if(pp_last >= &sc->sc_isoc_fs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT])
+		if (pp_last >= &sc->sc_isoc_fs_p_last[EHCI_VIRTUAL_FRAMELIST_COUNT])
 		{
 			pp_last = &sc->sc_isoc_fs_p_last[0];
 		}
@@ -2722,10 +2722,10 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon Oct  1 19:24:36 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 87FE516A420; Mon,  1 Oct 2007 19:24:36 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2809916A417
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 19:24:36 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 28C2213C44B
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 19:24:36 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l91JOZcm024418
	for <perforce@FreeBSD.org>; Mon, 1 Oct 2007 19:24:35 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l91JOYrG024414
	for perforce@freebsd.org; Mon, 1 Oct 2007 19:24:34 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 1 Oct 2007 19:24:34 GMT
Message-Id: <200710011924.l91JOYrG024414@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127072 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2007 19:24:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=127072

Change 127072 by hselasky@hselasky_laptop001 on 2007/10/01 19:23:59

	
	Style change;
	
	  - Put a single tab character between the #define and the macro name.
	    (See "man style")
	
	The changes result from the following script kernel and 
	the three Norwegian characters; "ćřĺ"
	
	[ -f src/$F ] && (cat src/$F | sed -E -e "s/#[	 ]*define[ 	]*/&ćřĺ/g" | \
	sed -e "s/[ 	]*ćřĺ/	/g" > temp) && ((diff -u src/$F temp > /dev/null) || \
	(cp temp src/$F))

Affected files ...

.. //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#4 edit
.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#18 edit
.. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#8 edit
.. //depot/projects/usb/src/sys/dev/sound/pcm/mixer.h#7 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#18 edit
.. //depot/projects/usb/src/sys/dev/sound/usb/uaudioreg.h#4 edit
.. //depot/projects/usb/src/sys/dev/usb/dsbr100io.h#6 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.c#44 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci.h#16 edit
.. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#31 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#32 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#15 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cdcereg.h#12 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#11 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#29 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kuefw.h#5 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rum.c#10 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rumreg.h#3 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rumvar.h#3 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/if_uralreg.h#14 edit
.. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#18 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#16 edit
.. //depot/projects/usb/src/sys/dev/usb/if_zydreg.h#4 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.c#34 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.h#12 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci_pci.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/rio500_usb.h#6 edit
.. //depot/projects/usb/src/sys/dev/usb/uark.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/ubsa.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/ubser.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/ucom.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/ucomvar.h#13 edit
.. //depot/projects/usb/src/sys/dev/usb/ucycom.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/udbp.h#7 edit
.. //depot/projects/usb/src/sys/dev/usb/ufm.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ufoma.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdi.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/uftdireg.h#5 edit
.. //depot/projects/usb/src/sys/dev/usb/ugen.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/ugensa.c#9 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.c#36 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.h#13 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci_pci.c#21 edit
.. //depot/projects/usb/src/sys/dev/usb/uhid.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/uhub.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/uipaq.c#8 edit
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#22 edit
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/umass.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/umct.c#18 edit
.. //depot/projects/usb/src/sys/dev/usb/umodem.c#27 edit
.. //depot/projects/usb/src/sys/dev/usb/umoscom.c#6 edit
.. //depot/projects/usb/src/sys/dev/usb/ums.c#24 edit
.. //depot/projects/usb/src/sys/dev/usb/uplcom.c#25 edit
.. //depot/projects/usb/src/sys/dev/usb/urio.c#14 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/usb.h#16 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#4 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_cdev.c#17 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.c#7 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_hid.h#7 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_port.h#17 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_quirks.c#12 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_rdesc.h#3 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#46 edit
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#33 edit
.. //depot/projects/usb/src/sys/dev/usb/usbdevs#14 edit
.. //depot/projects/usb/src/sys/dev/usb/uvisor.c#20 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#25 edit
.. //depot/projects/usb/src/sys/modules/ukbd/Makefile#3 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#9 edit
.. //depot/projects/usb/src/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#11 edit
.. //depot/projects/usb/src/sys/sys/videodev.h#4 edit
.. //depot/projects/usb/src/sys/sys/videokern.h#3 edit

Differences ...

==== //depot/projects/usb/src/sys/arm/at91/ohci_atmelarm.c#4 (text) ====

@@ -42,7 +42,7 @@
 
 #include <arm/at91/at91_pmcvar.h>
 
-#define MEM_RID	0
+#define	MEM_RID	0
 
 static device_probe_t ohci_atmelarm_probe;
 static device_attach_t ohci_atmelarm_attach;

==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#18 (text) ====

@@ -48,22 +48,22 @@
 #include <dev/ata/ata-all.h>
 #include <ata_if.h>
 
-#define ATAUSB_BULK_SIZE (1<<17) /* don't set this lower than (1 << 16) */
+#define	ATAUSB_BULK_SIZE (1<<17) /* don't set this lower than (1 << 16) */
 
 /* Command Block Wrapper */
 struct bbb_cbw {
     uint8_t	signature[4];
-#define		CBWSIGNATURE		0x43425355
+#define	CBWSIGNATURE		0x43425355
 
     uint8_t	tag[4];
     uint8_t	transfer_length[4];
     uint8_t	flags;
-#define		CBWFLAGS_OUT  		0x00
-#define		CBWFLAGS_IN  		0x80
+#define	CBWFLAGS_OUT  		0x00
+#define	CBWFLAGS_IN  		0x80
 
     uint8_t	lun;
     uint8_t	length;
-#define		CBWCDBLENGTH     	16
+#define	CBWCDBLENGTH     	16
 
     uint8_t	cdb[CBWCDBLENGTH];
 } UPACKED;
@@ -71,14 +71,14 @@
 /* Command Status Wrapper */
 struct bbb_csw {
     uint8_t	signature[4];
-#define		CSWSIGNATURE     	0x53425355
+#define	CSWSIGNATURE     	0x53425355
 
     uint8_t	tag[4];
     uint8_t	residue[4];
     uint8_t    status;
-#define 	CSWSTATUS_GOOD   	0x0
-#define		CSWSTATUS_FAILED 	0x1
-#define		CSWSTATUS_PHASE  	0x2
+#define	CSWSTATUS_GOOD   	0x0
+#define	CSWSTATUS_FAILED 	0x1
+#define	CSWSTATUS_PHASE  	0x2
 } UPACKED;
 
 /* USB-ATA 'controller' softc */
@@ -91,18 +91,18 @@
     struct ata_channel *restart_ch;
     struct ata_request *ata_request;
 
-#define ATAUSB_T_BBB_RESET1        0
-#define ATAUSB_T_BBB_RESET2        1
-#define ATAUSB_T_BBB_RESET3        2
-#define ATAUSB_T_BBB_COMMAND       3
-#define ATAUSB_T_BBB_DATA_READ     4
-#define ATAUSB_T_BBB_DATA_RD_CS    5
-#define ATAUSB_T_BBB_DATA_WRITE    6
-#define ATAUSB_T_BBB_DATA_WR_CS    7
-#define ATAUSB_T_BBB_STATUS        8
-#define ATAUSB_T_BBB_MAX           9
+#define	ATAUSB_T_BBB_RESET1        0
+#define	ATAUSB_T_BBB_RESET2        1
+#define	ATAUSB_T_BBB_RESET3        2
+#define	ATAUSB_T_BBB_COMMAND       3
+#define	ATAUSB_T_BBB_DATA_READ     4
+#define	ATAUSB_T_BBB_DATA_RD_CS    5
+#define	ATAUSB_T_BBB_DATA_WRITE    6
+#define	ATAUSB_T_BBB_DATA_WR_CS    7
+#define	ATAUSB_T_BBB_STATUS        8
+#define	ATAUSB_T_BBB_MAX           9
 
-#define ATAUSB_T_MAX ATAUSB_T_BBB_MAX
+#define	ATAUSB_T_MAX ATAUSB_T_BBB_MAX
 
     struct usbd_xfer *  xfer[ATAUSB_T_MAX];
     caddr_t		ata_data;

==== //depot/projects/usb/src/sys/dev/sound/pcm/mixer.c#8 (text+ko) ====

@@ -32,7 +32,7 @@
 
 MALLOC_DEFINE(M_MIXER, "mixer", "mixer");
 
-#define MIXER_NAMELEN	16
+#define	MIXER_NAMELEN	16
 struct snd_mixer {
 	KOBJ_FIELDS;
 	void *devinfo;
@@ -126,12 +126,12 @@
 }
 #endif
 
-#define MIXER_SET_UNLOCK(x, y)		do {				\
+#define	MIXER_SET_UNLOCK(x, y)		do {				\
 	if ((y) != 0)							\
 		snd_mtxunlock((x)->lock);				\
 } while (0)
 
-#define MIXER_SET_LOCK(x, y)		do {				\
+#define	MIXER_SET_LOCK(x, y)		do {				\
 	if ((y) != 0)							\
 		snd_mtxlock((x)->lock);					\
 } while (0)

==== //depot/projects/usb/src/sys/dev/sound/pcm/mixer.h#7 (text+ko) ====

@@ -60,17 +60,17 @@
 
 extern int mixer_count;
 
-#define MIXER_CMD_DIRECT	0	/* send command within driver   */
-#define MIXER_CMD_CDEV		1	/* send command from cdev/ioctl */
+#define	MIXER_CMD_DIRECT	0	/* send command within driver   */
+#define	MIXER_CMD_CDEV		1	/* send command from cdev/ioctl */
 
-#define MIXER_TYPE_PRIMARY	0	/* mixer_init()   */
-#define MIXER_TYPE_SECONDARY	1	/* mixer_create() */
+#define	MIXER_TYPE_PRIMARY	0	/* mixer_init()   */
+#define	MIXER_TYPE_SECONDARY	1	/* mixer_create() */
 
 /*
  * this is a kludge to allow hiding of the struct snd_mixer definition
  * 512 should be enough for all architectures
  */
-#define MIXER_SIZE	(512 + sizeof(struct kobj) +		\
+#define	MIXER_SIZE	(512 + sizeof(struct kobj) +		\
 			    sizeof(oss_mixer_enuminfo))
 
-#define MIXER_DECLARE(name) static DEFINE_CLASS(name, name ## _methods, MIXER_SIZE)
+#define	MIXER_DECLARE(name) static DEFINE_CLASS(name, name ## _methods, MIXER_SIZE)

==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#18 (text+ko) ====

@@ -72,7 +72,7 @@
 #include <dev/sound/usb/uaudio.h>
 
 #ifdef USB_DEBUG
-#define DPRINTF(n,fmt,...)	\
+#define	DPRINTF(n,fmt,...)	\
   do { if (uaudio_debug > (n)) {		\
       printf("%s: " fmt, __FUNCTION__,## __VA_ARGS__); } } while (0)
 
@@ -81,27 +81,27 @@
 SYSCTL_INT(_hw_usb_uaudio, OID_AUTO, debug, CTLFLAG_RW,
 	   &uaudio_debug, 0, "uaudio debug level");
 #else
-#define DPRINTF(...) do { } while (0)
+#define	DPRINTF(...) do { } while (0)
 #endif
 
 static uint32_t uaudio_default_rate = 96000;
 static uint8_t  uaudio_default_bits = 32;
 static uint8_t  uaudio_default_channels = 2;
 
-#define UAUDIO_NCHANBUFS        2 /* number of outstanding request */
-#define UAUDIO_NFRAMES         25 /* ms of sound in each request */
-#define UAUDIO_RECURSE_LIMIT   24 /* rounds */
-#define UAUDIO_DEFAULT_BUFSZ  (16*1024) /* bytes */
+#define	UAUDIO_NCHANBUFS        2 /* number of outstanding request */
+#define	UAUDIO_NFRAMES         25 /* ms of sound in each request */
+#define	UAUDIO_RECURSE_LIMIT   24 /* rounds */
+#define	UAUDIO_DEFAULT_BUFSZ  (16*1024) /* bytes */
 
 
 
-#define MAKE_WORD(h,l) (((h) << 8) | (l))
-#define BIT_TEST(bm,bno) (((bm)[(bno) / 8] >> (7 - ((bno) % 8))) & 1)
+#define	MAKE_WORD(h,l) (((h) << 8) | (l))
+#define	BIT_TEST(bm,bno) (((bm)[(bno) / 8] >> (7 - ((bno) % 8))) & 1)
 
 struct uaudio_mixer_node {
 	int32_t		minval;
 	int32_t		maxval;
-#define MIX_MAX_CHAN 8
+#define	MIX_MAX_CHAN 8
 	int32_t		wValue[MIX_MAX_CHAN]; /* using nchan */
 	uint32_t	delta;
 	uint32_t	mul;
@@ -113,17 +113,17 @@
 	uint8_t	update[(MIX_MAX_CHAN+7)/8];
 	uint8_t	nchan;
 	uint8_t	type;
-#define MIX_ON_OFF	1
-#define MIX_SIGNED_16	2
-#define MIX_UNSIGNED_16	3
-#define MIX_SIGNED_8	4
-#define MIX_SELECTOR	5
-#define MIX_UNKNOWN     6
-#define MIX_SIZE(n) ((((n) == MIX_SIGNED_16) || \
+#define	MIX_ON_OFF	1
+#define	MIX_SIGNED_16	2
+#define	MIX_UNSIGNED_16	3
+#define	MIX_SIGNED_8	4
+#define	MIX_SELECTOR	5
+#define	MIX_UNKNOWN     6
+#define	MIX_SIZE(n) ((((n) == MIX_SIGNED_16) || \
 		      ((n) == MIX_UNSIGNED_16)) ? 2 : 1)
-#define MIX_UNSIGNED(n) ((n) == MIX_UNSIGNED_16)
+#define	MIX_UNSIGNED(n) ((n) == MIX_UNSIGNED_16)
 
-#define MAX_SELECTOR_INPUT_PIN 256
+#define	MAX_SELECTOR_INPUT_PIN 256
 	uint8_t	slctrtype[MAX_SELECTOR_INPUT_PIN];
 	uint8_t	class;
 
@@ -163,9 +163,9 @@
 	uint8_t iface_alt_index;
 };
 
-#define UMIDI_N_TRANSFER    4 /* units */
-#define UMIDI_CABLES_MAX   16 /* units */
-#define UMIDI_BULK_SIZE  1024 /* bytes */
+#define	UMIDI_N_TRANSFER    4 /* units */
+#define	UMIDI_CABLES_MAX   16 /* units */
+#define	UMIDI_BULK_SIZE  1024 /* bytes */
 
 struct umidi_sub_chan {
     struct usb_cdev cdev;
@@ -173,13 +173,13 @@
     uint8_t temp_0[4];
     uint8_t temp_1[4];
     uint8_t state;
-#define UMIDI_ST_UNKNOWN   0 /* scan for command */
-#define UMIDI_ST_1PARAM    1
-#define UMIDI_ST_2PARAM_1  2
-#define UMIDI_ST_2PARAM_2  3
-#define UMIDI_ST_SYSEX_0   4
-#define UMIDI_ST_SYSEX_1   5
-#define UMIDI_ST_SYSEX_2   6
+#define	UMIDI_ST_UNKNOWN   0 /* scan for command */
+#define	UMIDI_ST_1PARAM    1
+#define	UMIDI_ST_2PARAM_1  2
+#define	UMIDI_ST_2PARAM_2  3
+#define	UMIDI_ST_SYSEX_0   4
+#define	UMIDI_ST_SYSEX_1   5
+#define	UMIDI_ST_SYSEX_2   6
 
     uint8_t read_open : 1;
     uint8_t write_open : 1;
@@ -197,8 +197,8 @@
     uint8_t iface_alt_index;
 
     uint8_t flags;
-#define UMIDI_FLAG_READ_STALL  0x01
-#define UMIDI_FLAG_WRITE_STALL 0x02
+#define	UMIDI_FLAG_READ_STALL  0x01
+#define	UMIDI_FLAG_WRITE_STALL 0x02
 
     uint8_t read_open_refcount;
     uint8_t write_open_refcount;
@@ -286,11 +286,11 @@
     {0,0,0,NULL}
 };
 
-#define UAC_OUTPUT	0
-#define UAC_INPUT	1
-#define UAC_EQUAL	2
-#define UAC_RECORD	3
-#define UAC_NCLASSES	4
+#define	UAC_OUTPUT	0
+#define	UAC_INPUT	1
+#define	UAC_EQUAL	2
+#define	UAC_RECORD	3
+#define	UAC_NCLASSES	4
 
 #ifdef USB_DEBUG
 static const char *uac_names[] = {

==== //depot/projects/usb/src/sys/dev/sound/usb/uaudioreg.h#4 (text+ko) ====

@@ -38,21 +38,21 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#define UAUDIO_VERSION		0x100
+#define	UAUDIO_VERSION		0x100
 
-#define UDESC_CS_CONFIG		0x22
-#define UDESC_CS_STRING		0x23
-#define UDESC_CS_INTERFACE	0x24
-#define UDESC_CS_ENDPOINT	0x25
+#define	UDESC_CS_CONFIG		0x22
+#define	UDESC_CS_STRING		0x23
+#define	UDESC_CS_INTERFACE	0x24
+#define	UDESC_CS_ENDPOINT	0x25
 
-#define UDESCSUB_AC_HEADER	1
-#define UDESCSUB_AC_INPUT	2
-#define UDESCSUB_AC_OUTPUT	3
-#define UDESCSUB_AC_MIXER	4
-#define UDESCSUB_AC_SELECTOR	5
-#define UDESCSUB_AC_FEATURE	6
-#define UDESCSUB_AC_PROCESSING	7
-#define UDESCSUB_AC_EXTENSION	8
+#define	UDESCSUB_AC_HEADER	1
+#define	UDESCSUB_AC_INPUT	2
+#define	UDESCSUB_AC_OUTPUT	3
+#define	UDESCSUB_AC_MIXER	4
+#define	UDESCSUB_AC_SELECTOR	5
+#define	UDESCSUB_AC_FEATURE	6
+#define	UDESCSUB_AC_PROCESSING	7
+#define	UDESCSUB_AC_EXTENSION	8
 
 /* The first fields are identical to usb_endpoint_descriptor_t */
 typedef struct {
@@ -97,9 +97,9 @@
 	uByte		bDescriptorType;
 	uByte		bDescriptorSubtype;
 	uByte		bmAttributes;
-#define UA_SED_FREQ_CONTROL	0x01
-#define UA_SED_PITCH_CONTROL	0x02
-#define UA_SED_MAXPACKETSONLY	0x80
+#define	UA_SED_FREQ_CONTROL	0x01
+#define	UA_SED_PITCH_CONTROL	0x02
+#define	UA_SED_MAXPACKETSONLY	0x80
 	uByte		bLockDelayUnits;
 	uWord		wLockDelay;
 } UPACKED;
@@ -113,13 +113,13 @@
 	uByte		bSubFrameSize;
 	uByte		bBitResolution;
 	uByte		bSamFreqType;
-#define UA_SAMP_CONTNUOUS 0
+#define	UA_SAMP_CONTNUOUS 0
 	uByte		tSamFreq[0];
-#define UA_GETSAMP(p, n) (((p)->tSamFreq[((n)*3)+0]) |	    \
+#define	UA_GETSAMP(p, n) (((p)->tSamFreq[((n)*3)+0]) |	    \
 			  ((p)->tSamFreq[((n)*3)+1] << 8) | \
 			  ((p)->tSamFreq[((n)*3)+2] << 16))
-#define UA_SAMP_LO(p) UA_GETSAMP(p, 0)
-#define UA_SAMP_HI(p) UA_GETSAMP(p, 1)
+#define	UA_SAMP_LO(p) UA_GETSAMP(p, 0)
+#define	UA_SAMP_HI(p) UA_GETSAMP(p, 1)
 } UPACKED;
 
 struct usb_audio_cluster {
@@ -232,7 +232,7 @@
 	uByte		iChannelNames;
 	uByte		bControlSize;
 	uByte		bmControls[0]; /* [bControlSize] */
-#define UA_PROC_ENABLE_MASK 1
+#define	UA_PROC_ENABLE_MASK 1
 } UPACKED;
 
 struct usb_audio_processing_unit_updown {
@@ -258,149 +258,149 @@
 	uByte		iChannelNames;
 	uByte		bControlSize;
 	uByte		bmControls[0]; /* [bControlSize] */
-#define UA_EXT_ENABLE_MASK 1
-#define UA_EXT_ENABLE 1
+#define	UA_EXT_ENABLE_MASK 1
+#define	UA_EXT_ENABLE 1
 	/*uByte		iExtension;*/
 } UPACKED;
 
 /* USB terminal types */
-#define UAT_UNDEFINED		0x0100
-#define UAT_STREAM		0x0101
-#define UAT_VENDOR		0x01ff
+#define	UAT_UNDEFINED		0x0100
+#define	UAT_STREAM		0x0101
+#define	UAT_VENDOR		0x01ff
 /* input terminal types */
-#define UATI_UNDEFINED		0x0200
-#define UATI_MICROPHONE		0x0201
-#define UATI_DESKMICROPHONE	0x0202
-#define UATI_PERSONALMICROPHONE	0x0203
-#define UATI_OMNIMICROPHONE	0x0204
-#define UATI_MICROPHONEARRAY	0x0205
-#define UATI_PROCMICROPHONEARR	0x0206
+#define	UATI_UNDEFINED		0x0200
+#define	UATI_MICROPHONE		0x0201
+#define	UATI_DESKMICROPHONE	0x0202
+#define	UATI_PERSONALMICROPHONE	0x0203
+#define	UATI_OMNIMICROPHONE	0x0204
+#define	UATI_MICROPHONEARRAY	0x0205
+#define	UATI_PROCMICROPHONEARR	0x0206
 /* output terminal types */
-#define UATO_UNDEFINED		0x0300
-#define UATO_SPEAKER		0x0301
-#define UATO_HEADPHONES		0x0302
-#define UATO_DISPLAYAUDIO	0x0303
-#define UATO_DESKTOPSPEAKER	0x0304
-#define UATO_ROOMSPEAKER	0x0305
-#define UATO_COMMSPEAKER	0x0306
-#define UATO_SUBWOOFER		0x0307
+#define	UATO_UNDEFINED		0x0300
+#define	UATO_SPEAKER		0x0301
+#define	UATO_HEADPHONES		0x0302
+#define	UATO_DISPLAYAUDIO	0x0303
+#define	UATO_DESKTOPSPEAKER	0x0304
+#define	UATO_ROOMSPEAKER	0x0305
+#define	UATO_COMMSPEAKER	0x0306
+#define	UATO_SUBWOOFER		0x0307
 /* bidir terminal types */
-#define UATB_UNDEFINED		0x0400
-#define UATB_HANDSET		0x0401
-#define UATB_HEADSET		0x0402
-#define UATB_SPEAKERPHONE	0x0403
-#define UATB_SPEAKERPHONEESUP	0x0404
-#define UATB_SPEAKERPHONEECANC	0x0405
+#define	UATB_UNDEFINED		0x0400
+#define	UATB_HANDSET		0x0401
+#define	UATB_HEADSET		0x0402
+#define	UATB_SPEAKERPHONE	0x0403
+#define	UATB_SPEAKERPHONEESUP	0x0404
+#define	UATB_SPEAKERPHONEECANC	0x0405
 /* telephony terminal types */
-#define UATT_UNDEFINED		0x0500
-#define UATT_PHONELINE		0x0501
-#define UATT_TELEPHONE		0x0502
-#define UATT_DOWNLINEPHONE	0x0503
+#define	UATT_UNDEFINED		0x0500
+#define	UATT_PHONELINE		0x0501
+#define	UATT_TELEPHONE		0x0502
+#define	UATT_DOWNLINEPHONE	0x0503
 /* external terminal types */
-#define UATE_UNDEFINED		0x0600
-#define UATE_ANALOGCONN		0x0601
-#define UATE_DIGITALAUIFC	0x0602
-#define UATE_LINECONN		0x0603
-#define UATE_LEGACYCONN		0x0604
-#define UATE_SPDIF		0x0605
-#define UATE_1394DA		0x0606
-#define UATE_1394DV		0x0607
+#define	UATE_UNDEFINED		0x0600
+#define	UATE_ANALOGCONN		0x0601
+#define	UATE_DIGITALAUIFC	0x0602
+#define	UATE_LINECONN		0x0603
+#define	UATE_LEGACYCONN		0x0604
+#define	UATE_SPDIF		0x0605
+#define	UATE_1394DA		0x0606
+#define	UATE_1394DV		0x0607
 /* embedded function terminal types */
-#define UATF_UNDEFINED		0x0700
-#define UATF_CALIBNOISE		0x0701
-#define UATF_EQUNOISE		0x0702
-#define UATF_CDPLAYER		0x0703
-#define UATF_DAT		0x0704
-#define UATF_DCC		0x0705
-#define UATF_MINIDISK		0x0706
-#define UATF_ANALOGTAPE		0x0707
-#define UATF_PHONOGRAPH		0x0708
-#define UATF_VCRAUDIO		0x0709
-#define UATF_VIDEODISCAUDIO	0x070a
-#define UATF_DVDAUDIO		0x070b
-#define UATF_TVTUNERAUDIO	0x070c
-#define UATF_SATELLITE		0x070d
-#define UATF_CABLETUNER		0x070e
-#define UATF_DSS		0x070f
-#define UATF_RADIORECV		0x0710
-#define UATF_RADIOXMIT		0x0711
-#define UATF_MULTITRACK		0x0712
-#define UATF_SYNTHESIZER	0x0713
+#define	UATF_UNDEFINED		0x0700
+#define	UATF_CALIBNOISE		0x0701
+#define	UATF_EQUNOISE		0x0702
+#define	UATF_CDPLAYER		0x0703
+#define	UATF_DAT		0x0704
+#define	UATF_DCC		0x0705
+#define	UATF_MINIDISK		0x0706
+#define	UATF_ANALOGTAPE		0x0707
+#define	UATF_PHONOGRAPH		0x0708
+#define	UATF_VCRAUDIO		0x0709
+#define	UATF_VIDEODISCAUDIO	0x070a
+#define	UATF_DVDAUDIO		0x070b
+#define	UATF_TVTUNERAUDIO	0x070c
+#define	UATF_SATELLITE		0x070d
+#define	UATF_CABLETUNER		0x070e
+#define	UATF_DSS		0x070f
+#define	UATF_RADIORECV		0x0710
+#define	UATF_RADIOXMIT		0x0711
+#define	UATF_MULTITRACK		0x0712
+#define	UATF_SYNTHESIZER	0x0713
 
 
-#define SET_CUR 0x01
-#define GET_CUR 0x81
-#define SET_MIN 0x02
-#define GET_MIN 0x82
-#define SET_MAX 0x03
-#define GET_MAX 0x83
-#define SET_RES 0x04
-#define GET_RES 0x84
-#define SET_MEM 0x05
-#define GET_MEM 0x85
-#define GET_STAT 0xff
+#define	SET_CUR 0x01
+#define	GET_CUR 0x81
+#define	SET_MIN 0x02
+#define	GET_MIN 0x82
+#define	SET_MAX 0x03
+#define	GET_MAX 0x83
+#define	SET_RES 0x04
+#define	GET_RES 0x84
+#define	SET_MEM 0x05
+#define	GET_MEM 0x85
+#define	GET_STAT 0xff
 
-#define MUTE_CONTROL	0x01
-#define VOLUME_CONTROL	0x02
-#define BASS_CONTROL	0x03
-#define MID_CONTROL	0x04
-#define TREBLE_CONTROL	0x05
-#define GRAPHIC_EQUALIZER_CONTROL	0x06
-#define AGC_CONTROL	0x07
-#define DELAY_CONTROL	0x08
-#define BASS_BOOST_CONTROL 0x09
-#define LOUDNESS_CONTROL 0x0a
+#define	MUTE_CONTROL	0x01
+#define	VOLUME_CONTROL	0x02
+#define	BASS_CONTROL	0x03
+#define	MID_CONTROL	0x04
+#define	TREBLE_CONTROL	0x05
+#define	GRAPHIC_EQUALIZER_CONTROL	0x06
+#define	AGC_CONTROL	0x07
+#define	DELAY_CONTROL	0x08
+#define	BASS_BOOST_CONTROL 0x09
+#define	LOUDNESS_CONTROL 0x0a
 
-#define FU_MASK(u) (1 << ((u)-1))
+#define	FU_MASK(u) (1 << ((u)-1))
 
-#define MASTER_CHAN	0
+#define	MASTER_CHAN	0
 
-#define AS_GENERAL	1
-#define FORMAT_TYPE	2
-#define FORMAT_SPECIFIC 3
+#define	AS_GENERAL	1
+#define	FORMAT_TYPE	2
+#define	FORMAT_SPECIFIC 3
 
-#define UA_FMT_PCM	1
-#define UA_FMT_PCM8	2
-#define UA_FMT_IEEE_FLOAT 3
-#define UA_FMT_ALAW	4
-#define UA_FMT_MULAW	5
-#define UA_FMT_MPEG	0x1001
-#define UA_FMT_AC3	0x1002
+#define	UA_FMT_PCM	1
+#define	UA_FMT_PCM8	2
+#define	UA_FMT_IEEE_FLOAT 3
+#define	UA_FMT_ALAW	4
+#define	UA_FMT_MULAW	5
+#define	UA_FMT_MPEG	0x1001
+#define	UA_FMT_AC3	0x1002
 
-#define SAMPLING_FREQ_CONTROL	0x01
-#define PITCH_CONTROL		0x02
+#define	SAMPLING_FREQ_CONTROL	0x01
+#define	PITCH_CONTROL		0x02
 
-#define FORMAT_TYPE_UNDEFINED 0
-#define FORMAT_TYPE_I 1
-#define FORMAT_TYPE_II 2
-#define FORMAT_TYPE_III 3
+#define	FORMAT_TYPE_UNDEFINED 0
+#define	FORMAT_TYPE_I 1
+#define	FORMAT_TYPE_II 2
+#define	FORMAT_TYPE_III 3
 
-#define UA_PROC_MASK(n) (1<< ((n)-1))
-#define PROCESS_UNDEFINED		0
-#define  XX_ENABLE_CONTROL			1
-#define UPDOWNMIX_PROCESS		1
-#define  UD_ENABLE_CONTROL			1
-#define  UD_MODE_SELECT_CONTROL			2
-#define DOLBY_PROLOGIC_PROCESS		2
-#define  DP_ENABLE_CONTROL			1
-#define  DP_MODE_SELECT_CONTROL			2
-#define P3D_STEREO_EXTENDER_PROCESS	3
-#define  P3D_ENABLE_CONTROL			1
-#define  P3D_SPACIOUSNESS_CONTROL		2
-#define REVERBATION_PROCESS		4
-#define  RV_ENABLE_CONTROL			1
-#define  RV_LEVEL_CONTROL			2
-#define  RV_TIME_CONTROL			3
-#define  RV_FEEDBACK_CONTROL			4
-#define CHORUS_PROCESS			5
-#define  CH_ENABLE_CONTROL			1
-#define  CH_LEVEL_CONTROL			2
-#define  CH_RATE_CONTROL			3
-#define  CH_DEPTH_CONTROL			4
-#define DYN_RANGE_COMP_PROCESS		6
-#define  DR_ENABLE_CONTROL			1
-#define  DR_COMPRESSION_RATE_CONTROL		2
-#define  DR_MAXAMPL_CONTROL			3
-#define  DR_THRESHOLD_CONTROL			4
-#define  DR_ATTACK_TIME_CONTROL			5
-#define  DR_RELEASE_TIME_CONTROL		6
+#define	UA_PROC_MASK(n) (1<< ((n)-1))
+#define	PROCESS_UNDEFINED		0
+#define	XX_ENABLE_CONTROL			1
+#define	UPDOWNMIX_PROCESS		1
+#define	UD_ENABLE_CONTROL			1
+#define	UD_MODE_SELECT_CONTROL			2
+#define	DOLBY_PROLOGIC_PROCESS		2
+#define	DP_ENABLE_CONTROL			1
+#define	DP_MODE_SELECT_CONTROL			2
+#define	P3D_STEREO_EXTENDER_PROCESS	3
+#define	P3D_ENABLE_CONTROL			1
+#define	P3D_SPACIOUSNESS_CONTROL		2
+#define	REVERBATION_PROCESS		4
+#define	RV_ENABLE_CONTROL			1
+#define	RV_LEVEL_CONTROL			2
+#define	RV_TIME_CONTROL			3
+#define	RV_FEEDBACK_CONTROL			4
+#define	CHORUS_PROCESS			5
+#define	CH_ENABLE_CONTROL			1
+#define	CH_LEVEL_CONTROL			2
+#define	CH_RATE_CONTROL			3
+#define	CH_DEPTH_CONTROL			4
+#define	DYN_RANGE_COMP_PROCESS		6
+#define	DR_ENABLE_CONTROL			1
+#define	DR_COMPRESSION_RATE_CONTROL		2
+#define	DR_MAXAMPL_CONTROL			3
+#define	DR_THRESHOLD_CONTROL			4
+#define	DR_ATTACK_TIME_CONTROL			5
+#define	DR_RELEASE_TIME_CONTROL		6

==== //depot/projects/usb/src/sys/dev/usb/dsbr100io.h#6 (text+ko) ====

@@ -32,8 +32,8 @@
 
 #include <sys/ioccom.h>
 
-#define FM_SET_FREQ	_IOWR('U', 200, int)
-#define FM_GET_FREQ	_IOWR('U', 201, int)
-#define FM_START	_IOWR('U', 202, int)
-#define FM_STOP		_IOWR('U', 203, int)
-#define FM_GET_STAT	_IOWR('U', 204, int)
+#define	FM_SET_FREQ	_IOWR('U', 200, int)
+#define	FM_GET_FREQ	_IOWR('U', 201, int)
+#define	FM_START	_IOWR('U', 202, int)
+#define	FM_STOP		_IOWR('U', 203, int)
+#define	FM_GET_STAT	_IOWR('U', 204, int)

==== //depot/projects/usb/src/sys/dev/usb/ehci.c#44 (text+ko) ====

@@ -62,22 +62,22 @@
 #include <sys/lock.h>
 #include <sys/malloc.h>
 
-#define INCLUDE_PCIXXX_H
-#define usbd_config_td_cc ehci_config_copy
-#define usbd_config_td_softc ehci_softc
+#define	INCLUDE_PCIXXX_H
+#define	usbd_config_td_cc ehci_config_copy
+#define	usbd_config_td_softc ehci_softc
 
 #include <dev/usb/usb_port.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usb_subr.h>
 #include <dev/usb/ehci.h>
 
-#define EHCI_BUS2SC(bus) ((ehci_softc_t *)(((uint8_t *)(bus)) - \
+#define	EHCI_BUS2SC(bus) ((ehci_softc_t *)(((uint8_t *)(bus)) - \
    POINTER_TO_UNSIGNED(&(((ehci_softc_t *)0)->sc_bus))))
 
 #ifdef USB_DEBUG
-#define DPRINTF(x)	do { if (ehcidebug) { printf("%s: ", __FUNCTION__); \
+#define	DPRINTF(x)	do { if (ehcidebug) { printf("%s: ", __FUNCTION__); \
 			       printf x ; } } while (0)
-#define DPRINTFN(n,x)	do { if (ehcidebug > (n)) { printf("%s: ", __FUNCTION__); \
+#define	DPRINTFN(n,x)	do { if (ehcidebug > (n)) { printf("%s: ", __FUNCTION__); \
 			       printf x ; } } while (0)
 int ehcidebug = 0;
 SYSCTL_NODE(_hw_usb, OID_AUTO, ehci, CTLFLAG_RW, 0, "USB ehci");
@@ -89,11 +89,11 @@
 static void
 ehci_dump_sqh(ehci_qh_t *sqh);
 #else
-#define DPRINTF(x) do { } while (0)
-#define DPRINTFN(n,x) do { } while (0)
+#define	DPRINTF(x) do { } while (0)
+#define	DPRINTFN(n,x) do { } while (0)
 #endif
 
-#define EHCI_INTR_ENDPT 1
+#define	EHCI_INTR_ENDPT 1
 
 extern struct usbd_bus_methods ehci_bus_methods;
 extern struct usbd_pipe_methods ehci_device_bulk_methods;
@@ -111,7 +111,7 @@
 static usbd_std_root_transfer_func_t ehci_root_intr_done;
 static usbd_std_root_transfer_func_t ehci_root_ctrl_task_td_sub;
 
-#define SC_HW_PHYSADDR(sc,what) \
+#define	SC_HW_PHYSADDR(sc,what) \
   ((sc)->sc_hw_page.physaddr +	\
    POINTER_TO_UNSIGNED(&(((struct ehci_hw_softc *)0)->what)))
 
@@ -883,7 +883,7 @@
 }
 #endif
 
-#define EHCI_APPEND_FS_TD(std,last) (last) = _ehci_append_fs_td(std,last)
+#define	EHCI_APPEND_FS_TD(std,last) (last) = _ehci_append_fs_td(std,last)
 static ehci_sitd_t *
 _ehci_append_fs_td(ehci_sitd_t *std, ehci_sitd_t *last)
 {
@@ -912,7 +912,7 @@
 	return (std);
 }
 
-#define EHCI_APPEND_HS_TD(std,last) (last) = _ehci_append_hs_td(std,last)
+#define	EHCI_APPEND_HS_TD(std,last) (last) = _ehci_append_hs_td(std,last)
 static ehci_itd_t *
 _ehci_append_hs_td(ehci_itd_t *std, ehci_itd_t *last)
 {
@@ -941,7 +941,7 @@
 	return (std);
 }
 
-#define EHCI_APPEND_QH(sqh,last) (last) = _ehci_append_qh(sqh,last)
+#define	EHCI_APPEND_QH(sqh,last) (last) = _ehci_append_qh(sqh,last)
 static ehci_qh_t *
 _ehci_append_qh(ehci_qh_t *sqh, ehci_qh_t *last)
 {
@@ -978,7 +978,7 @@
 	return (sqh);
 }
 
-#define EHCI_REMOVE_FS_TD(std,last) (last) = _ehci_remove_fs_td(std,last)
+#define	EHCI_REMOVE_FS_TD(std,last) (last) = _ehci_remove_fs_td(std,last)
 static ehci_sitd_t *
 _ehci_remove_fs_td(ehci_sitd_t *std, ehci_sitd_t *last)
 {
@@ -1002,7 +1002,7 @@
 	return ((last == std) ? std->prev : last);
 }
 
-#define EHCI_REMOVE_HS_TD(std,last) (last) = _ehci_remove_hs_td(std,last)
+#define	EHCI_REMOVE_HS_TD(std,last) (last) = _ehci_remove_hs_td(std,last)
 static ehci_itd_t *
 _ehci_remove_hs_td(ehci_itd_t *std, ehci_itd_t *last)
 {
@@ -1026,7 +1026,7 @@
 	return ((last == std) ? std->prev : last);
 }
 
-#define EHCI_REMOVE_QH(sqh,last) (last) = _ehci_remove_qh(sqh,last)
+#define	EHCI_REMOVE_QH(sqh,last) (last) = _ehci_remove_qh(sqh,last)
 static ehci_qh_t *
 _ehci_remove_qh(ehci_qh_t *sqh, ehci_qh_t *last)
 {
@@ -1592,7 +1592,7 @@
 	return;
 }
 
-#define ehci_add_interrupt_info(sc, xfer) \
+#define	ehci_add_interrupt_info(sc, xfer) \
 	LIST_INSERT_HEAD(&(sc)->sc_interrupt_list_head, (xfer), interrupt_list)
 
 static void
@@ -3347,7 +3347,7 @@
 		    std->req.bmRequestType, std->req.bRequest,
 		    UGETW(std->req.wLength), value, index));
 
-#define C(x,y) ((x) | ((y) << 8))
+#define	C(x,y) ((x) | ((y) << 8))
 	switch (C(std->req.bRequest, std->req.bmRequestType)) {
 	case C(UR_CLEAR_FEATURE, UT_WRITE_DEVICE):
 	case C(UR_CLEAR_FEATURE, UT_WRITE_INTERFACE):

==== //depot/projects/usb/src/sys/dev/usb/ehci.h#16 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #ifndef _EHCI_H_
-#define _EHCI_H_
+#define	_EHCI_H_
 
 /* PCI config registers */
 #define	PCI_CBMEM		0x10	/* configuration base MEM */
@@ -112,7 +112,7 @@
 #define	EHCI_STS_INT		0x00000001 /* RWC interrupt */
 #define	EHCI_STS_INTRS(x)	((x) & 0x3f)
 
-#define EHCI_NORMAL_INTRS	(/* EHCI_STS_IAA | */ EHCI_STS_HSE |	\
+#define	EHCI_NORMAL_INTRS	(/* EHCI_STS_IAA | */ EHCI_STS_HSE |	\
 				EHCI_STS_PCD | EHCI_STS_ERRINT | EHCI_STS_INT)
 
 #define	EHCI_USBINTR		0x08	/* RW Interrupt register */
@@ -222,7 +222,7 @@
 #define	EHCI_ITD_SET_ADDR(x)	(x)
 #define	EHCI_ITD_GET_ADDR(x)	(((x) >> 0) & 0x7F)
 #define	EHCI_ITD_SET_ENDPT(x)	((x) << 8)
-#define EHCI_ITD_GET_ENDPT(x)	(((x) >> 8) & 0xF)
+#define	EHCI_ITD_GET_ENDPT(x)	(((x) >> 8) & 0xF)
 	/* itd_bp[1] */
 #define	EHCI_ITD_SET_DIR_IN	(1 << 11)
 #define	EHCI_ITD_SET_DIR_OUT	(0 << 11)

==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#22 (text+ko) ====

@@ -62,28 +62,28 @@
 #include <sys/lock.h>
 #include <sys/malloc.h>
 
-#define INCLUDE_PCIXXX_H
+#define	INCLUDE_PCIXXX_H
 
 #include <dev/usb/usb_port.h>
 #include <dev/usb/usb.h>
 #include <dev/usb/usb_subr.h>
 #include <dev/usb/ehci.h> 
 
-#define PCI_EHCI_VENDORID_ACERLABS	0x10b9
-#define PCI_EHCI_VENDORID_AMD		0x1022
-#define PCI_EHCI_VENDORID_APPLE		0x106b
-#define PCI_EHCI_VENDORID_ATI		0x1002
-#define PCI_EHCI_VENDORID_CMDTECH	0x1095
-#define PCI_EHCI_VENDORID_INTEL		0x8086
-#define PCI_EHCI_VENDORID_NEC		0x1033
-#define PCI_EHCI_VENDORID_OPTI		0x1045
-#define PCI_EHCI_VENDORID_PHILIPS	0x1131
-#define PCI_EHCI_VENDORID_SIS		0x1039
-#define PCI_EHCI_VENDORID_NVIDIA	0x12D2
-#define PCI_EHCI_VENDORID_NVIDIA2	0x10DE
-#define PCI_EHCI_VENDORID_VIA		0x1106
+#define	PCI_EHCI_VENDORID_ACERLABS	0x10b9
+#define	PCI_EHCI_VENDORID_AMD		0x1022
+#define	PCI_EHCI_VENDORID_APPLE		0x106b
+#define	PCI_EHCI_VENDORID_ATI		0x1002
+#define	PCI_EHCI_VENDORID_CMDTECH	0x1095
+#define	PCI_EHCI_VENDORID_INTEL		0x8086
+#define	PCI_EHCI_VENDORID_NEC		0x1033
+#define	PCI_EHCI_VENDORID_OPTI		0x1045
+#define	PCI_EHCI_VENDORID_PHILIPS	0x1131
+#define	PCI_EHCI_VENDORID_SIS		0x1039
+#define	PCI_EHCI_VENDORID_NVIDIA	0x12D2
+#define	PCI_EHCI_VENDORID_NVIDIA2	0x10DE
+#define	PCI_EHCI_VENDORID_VIA		0x1106
 
-#define PCI_EHCI_BASE_REG	0x10
+#define	PCI_EHCI_BASE_REG	0x10
 
 static void ehci_pci_givecontroller(device_t self);
 static void ehci_pci_takecontroller(device_t self);

==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#31 (text+ko) ====

@@ -85,8 +85,8 @@
 
 #include <net/bpf.h>
 
-#define usbd_config_td_cc aue_config_copy
-#define usbd_config_td_softc aue_softc
+#define	usbd_config_td_cc aue_config_copy
+#define	usbd_config_td_softc aue_softc
 
 #include <dev/usb/usb_port.h>
 #include <dev/usb/usb.h>
@@ -107,7 +107,7 @@
 MODULE_DEPEND(aue, miibus, 1, 1, 1);
 
 #ifdef USB_DEBUG
-#define DPRINTF(sc,n,fmt,...)	\
+#define	DPRINTF(sc,n,fmt,...)	\
   do { if (aue_debug > (n)) {	     \
       printf("%s:%s: " fmt, (sc)->sc_name, \
 	     __FUNCTION__,## __VA_ARGS__); } } while (0)
@@ -117,7 +117,7 @@
 SYSCTL_INT(_hw_usb_aue, OID_AUTO, debug, CTLFLAG_RW, &aue_debug, 0,
 	   "aue debug level");
 #else
-#define DPRINTF(...)
+#define	DPRINTF(...)
 #endif
 
 /*
@@ -198,7 +198,7 @@
  {{ USB_VENDOR_SOHOWARE,	USB_PRODUCT_SOHOWARE_NUB100},	  0 },
  {{ USB_VENDOR_SOHOWARE,	USB_PRODUCT_SOHOWARE_NUB110},	  AUE_FLAG_PII },
 };
-#define aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p))
+#define	aue_lookup(v, p) ((const struct aue_type *)usb_lookup(aue_devs, v, p))
 
 /* prototypes */
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Mon Oct  1 19:31:45 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BD63D16A46B; Mon,  1 Oct 2007 19:31:44 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4AF1216A421
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 19:31:44 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D69E13C447
	for <perforce@FreeBSD.org>; Mon,  1 Oct 2007 19:31:44 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l91JViIp026551
	for <perforce@FreeBSD.org>; Mon, 1 Oct 2007 19:31:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l91JViwF026548
	for perforce@freebsd.org; Mon, 1 Oct 2007 19:31:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Mon, 1 Oct 2007 19:31:44 GMT
Message-Id: <200710011931.l91JViwF026548@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127073 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 01 Oct 2007 19:31:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=127073

Change 127073 by hselasky@hselasky_laptop001 on 2007/10/01 19:31:37

	
	Remove misleading comments.
	
	There is no limitation on the buffer size 
	hence we are using the "proxy_buffer" flag.

Affected files ...

.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#19 edit
.. //depot/projects/usb/src/sys/dev/usb/umass.c#25 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#19 (text) ====

@@ -48,7 +48,7 @@
 #include <dev/ata/ata-all.h>
 #include <ata_if.h>
 
-#define	ATAUSB_BULK_SIZE (1<<17) /* don't set this lower than (1 << 16) */
+#define	ATAUSB_BULK_SIZE (1<<17)
 
 /* Command Block Wrapper */
 struct bbb_cbw {

==== //depot/projects/usb/src/sys/dev/usb/umass.c#25 (text+ko) ====

@@ -156,7 +156,7 @@
 #define	DPRINTF(...) do { } while (0)
 #endif
 
-#define	UMASS_BULK_SIZE (1 << 17) /* bytes, must not be less than (1<<16) */
+#define	UMASS_BULK_SIZE (1 << 17)
 #define	UMASS_CBI_DIAGNOSTIC_CMDLEN 12 /* bytes */
 #define	UMASS_MAX_CMDLEN MAX(12, CAM_MAX_CDBLEN) /* bytes */
 

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 00:27:13 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A6E5916A419; Tue,  2 Oct 2007 00:27:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5D1F516A417
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 00:27:13 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 62CB813C4A3
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 00:27:13 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l920RDiX057145
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 00:27:13 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l920RB09057142
	for perforce@freebsd.org; Tue, 2 Oct 2007 00:27:11 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 2 Oct 2007 00:27:11 GMT
Message-Id: <200710020027.l920RB09057142@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127076 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 00:27:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=127076

Change 127076 by jb@jb_freebsd1 on 2007/10/02 00:26:47

	IFC
	
	Are we there yet?
	
	Homer?

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#7 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#38 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/catalog#2 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#2 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#25 integrate
.. //depot/projects/dtrace/ports/LEGAL#20 integrate
.. //depot/projects/dtrace/ports/MOVED#41 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.perl.mk#3 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.php.mk#10 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.port.mk#11 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.wx.mk#6 integrate
.. //depot/projects/dtrace/ports/UIDs#14 integrate
.. //depot/projects/dtrace/ports/UPDATING#33 integrate
.. //depot/projects/dtrace/src/Makefile.inc1#29 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#22 integrate
.. //depot/projects/dtrace/src/UPDATING#16 integrate
.. //depot/projects/dtrace/src/cddl/lib/Makefile#7 integrate
.. //depot/projects/dtrace/src/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/usr.bin/Makefile#4 integrate
.. //depot/projects/dtrace/src/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#3 integrate
.. //depot/projects/dtrace/src/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/dtrace/src/include/Makefile#11 integrate
.. //depot/projects/dtrace/src/lib/libc/Makefile#10 integrate
.. //depot/projects/dtrace/src/lib/libpthread/Makefile#7 integrate
.. //depot/projects/dtrace/src/lib/libthr/Makefile#10 integrate
.. //depot/projects/dtrace/src/libexec/atrun/Makefile#5 integrate
.. //depot/projects/dtrace/src/sbin/ggate/Makefile#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/pci.4#5 integrate
.. //depot/projects/dtrace/src/share/man/man9/pci.9#4 integrate
.. //depot/projects/dtrace/src/share/misc/committers-src.dot#3 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.libnames.mk#8 integrate
.. //depot/projects/dtrace/src/share/mk/bsd.prog.mk#7 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/legacy.c#5 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/legacyvar.h#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/pci/pci_bus.c#7 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i80321/i80321_pci.c#8 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/ixp425_pci.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_pci.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_pcib_acpi.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/bge/if_bge.c#20 integrate
.. //depot/projects/dtrace/src/sys/dev/cardbus/cardbus.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbb_pci.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/pccbb/pccbbvar.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci.c#18 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci_pci.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci_private.h#9 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pci_user.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pcib_private.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/pci/pcivar.h#10 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/legacy.c#5 integrate
.. //depot/projects/dtrace/src/sys/i386/include/legacyvar.h#4 integrate
.. //depot/projects/dtrace/src/sys/i386/pci/pci_bus.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#19 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_asconf.c#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_constants.h#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_indata.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_input.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_output.c#7 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_output.h#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_pcb.c#9 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_timer.c#6 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_usrreq.c#8 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctp_var.h#4 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctputil.c#9 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powermac/grackle.c#5 integrate
.. //depot/projects/dtrace/src/sys/powerpc/powermac/uninorth.c#6 integrate
.. //depot/projects/dtrace/src/sys/sparc64/pci/apb.c#4 integrate
.. //depot/projects/dtrace/src/sys/sparc64/pci/ofw_pcibus.c#8 integrate
.. //depot/projects/dtrace/src/sys/sparc64/pci/psycho.c#7 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/hv_pci.c#7 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#18 integrate
.. //depot/projects/dtrace/src/sys/sys/pciio.h#4 integrate
.. //depot/projects/dtrace/src/tools/build/make_check/Makefile#4 integrate
.. //depot/projects/dtrace/src/tools/build/mk/OptionalObsoleteFiles.inc#8 integrate
.. //depot/projects/dtrace/src/tools/make_libdeps.sh#6 integrate
.. //depot/projects/dtrace/src/tools/tools/pciroms/pciroms.c#2 integrate
.. //depot/projects/dtrace/src/usr.bin/Makefile#9 integrate
.. //depot/projects/dtrace/src/usr.sbin/Makefile#18 integrate
.. //depot/projects/dtrace/src/usr.sbin/bluetooth/bthidd/Makefile#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/config/Makefile#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/cron/cron/Makefile#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/ngctl/Makefile#7 integrate
.. //depot/projects/dtrace/src/usr.sbin/pciconf/pciconf.8#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/pciconf/pciconf.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/pmcstat/Makefile#5 integrate
.. //depot/projects/dtrace/www/en/donations/wantlist.sgml#23 integrate
.. //depot/projects/dtrace/www/en/gnome/images/Makefile#7 integrate
.. //depot/projects/dtrace/www/en/gnome/images/ss220-1-tn.png#1 branch
.. //depot/projects/dtrace/www/en/gnome/images/ss220-1.png#1 branch
.. //depot/projects/dtrace/www/en/gnome/images/ss220-2-tn.png#1 branch
.. //depot/projects/dtrace/www/en/gnome/images/ss220-2.png#1 branch
.. //depot/projects/dtrace/www/en/gnome/screenshots.sgml#8 integrate
.. //depot/projects/dtrace/www/en/snapshots/index.sgml#16 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/portbuild/article.sgml#7 (text+ko) ====

@@ -11,7 +11,7 @@
       <corpauthor>The &os; Ports Management Team</corpauthor>
     </authorgroup>
 
-    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.21 2007/09/14 02:00:59 linimon Exp $</pubdate>
+    <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/portbuild/article.sgml,v 1.22 2007/10/01 05:55:01 linimon Exp $</pubdate>
 
     <copyright>
       <year>2003</year>
@@ -640,6 +640,15 @@
       <filename><replaceable>${arch}</replaceable>/<replaceable>${branch}</replaceable>/wrkdirs</filename>.
     </para>
 
+    <para>If you find that the system is looping trying to build the
+      same package over and over again, you may be able to fix the
+      problem by rebuilding the offending package by hand.</para>
+
+    <para>If all the builds start failing with complaints that they
+      cannot load the dependent packages, check to see that
+      <application>httpd</application> is still running, and restart
+      it if not.</para>
+
     <para>Keep an eye on &man.df.1; output.  If the
       <filename>/var/portbuild</filename> file system becomes full
       then <trademark>Bad Things</trademark> happen.

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#38 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.872 2007/09/22 01:30:25 trhodes Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.874 2007/09/30 13:24:14 marius Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -680,7 +680,7 @@
 	  <command>autoconf</command> to regenerate
 	  <command>configure</command>, do not take the diffs of
 	  <command>configure</command> (it often grows to a few thousand
-	  lines!); define <literal>USE_AUTOTOOLS=autoconf:253</literal> and take the
+	  lines!); define <literal>USE_AUTOTOOLS=autoconf:261</literal> and take the
 	  diffs of <filename>configure.in</filename>.</para>
 
 	<para>If you had to delete a file, then you can do it in the
@@ -11560,6 +11560,11 @@
 		      include/i4b.</entry>
 		    <entry>700052</entry>
 		  </row>
+		  <row>
+		    <entry>7.0-CURRENT after the addition of support for
+		      PCI domains</entry>
+		    <entry>700053</entry>
+		  </row>
 
 		</tbody>
 	      </tgroup>

==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/catalog#2 (text+ko) ====

@@ -4,7 +4,7 @@
   -- ...................................................................... --
   -- Hungarian specific ...................................................... --
   
-  -- $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/catalog,v 1.1 2007/04/15 15:23:55 gabor Exp $ --
+  -- $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/catalog,v 1.2 2007/10/01 13:37:44 gabor Exp $ --
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//HU"
 	"articles.ent"
@@ -12,12 +12,15 @@
 PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN"
 	"books.ent"
 
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN"
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
         "freebsd.dsl"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//HU"
 	"freebsd.dsl"
 
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//HU"
+        "freebsd.dsl"
+
 PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent"
 

==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#2 (text+ko) ====

@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl,v 1.1 2007/04/15 15:23:55 gabor Exp $
+	$FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl,v 1.2 2007/10/01 13:37:44 gabor Exp $
 	The FreeBSD Hungarian Documentation Project
 	Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
 	Original revision: 1.20
@@ -8,7 +8,7 @@
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
 
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//HU">
+<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
 %freebsd.l10n;
 
 <!ENTITY % output.html  "IGNORE"> 

==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#25 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.55 2007/09/28 15:42:39 kaiw Exp $
+     $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.56 2007/10/01 13:19:12 jkois Exp $
 -->
 
     <sect2 id="pgpkey-ariff">
@@ -769,7 +769,7 @@
       &pgpkey.sat;
     </sect2>
 
-    <sect2 id="pgpkey-rpaulo"
+    <sect2 id="pgpkey-rpaulo">
       <title>&a.rpaulo;</title>
       &pgpkey.rpaulo;
     </sect2>

==== //depot/projects/dtrace/ports/LEGAL#20 (text+ko) ====

@@ -1,5 +1,5 @@
 # Creator:  Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.551 2007/09/24 08:39:17 rafan Exp $
+# $FreeBSD: ports/LEGAL,v 1.552 2007/10/01 12:37:23 tabthorpe Exp $
 
    **********************************************************************
    ***                      NOTE TO COMMITTERS                        ***
@@ -97,17 +97,9 @@
 citrix_ica-*		japanese/citrix_ica	License prohibits redistribution
 citrix_ica-*		net/citrix_ica		License prohibits redistribution
 cfs-*			security/cfs		Crypto; export-controlled
-clibpdf*.tar.gz		print/clibpdf		Needs a license to bundle with
-						other products
 code2000-*/CODE2000.ZIP	x11-fonts/code2000	Only unmodified original
 						package can be distributed
 collections*.zip	java/collections	See the license
-clibpdf*		print/clibpdf		License required for bundling
-						with other products.  Only
-						free for non-profit personal
-						use, and use by educational,
-						non-profit, and government
-						organizations
 contool-*		sysutils/contool	Do not incorporate the source
 						code into a product which is
 						subsequently sold

==== //depot/projects/dtrace/ports/MOVED#41 (text+ko) ====

@@ -1,7 +1,7 @@
 #
 # MOVED - a list of (recently) moved or removed ports
 #
-# $FreeBSD: ports/MOVED,v 1.1486 2007/09/27 20:23:44 tabthorpe Exp $
+# $FreeBSD: ports/MOVED,v 1.1489 2007/10/01 12:37:23 tabthorpe Exp $
 #
 # Each entry consists of a single line containing the following four
 # fields in the order named, separated with the pipe (`|') character:
@@ -3246,3 +3246,25 @@
 print/ghostscript-afpl-nox11|print/ghostscript-gpl-nox11|2007-09-24|Replaced by print/ghostscript-gpl-nox11
 misc/mango||2007-09-27|Has expired: Depends on broken package qextmdi
 lang/f2py||2007-09-27|Has expired: Replaced by py-numpy
+games/halflifeserver||2007-09-29|Has expired: unfetchable
+games/hlserver-admin||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-cs||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-dod||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-esf||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-existence||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-fa||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-flf||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-glbwar||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-heroes||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-ns||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-opfor||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-psychostats||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-si||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-ts||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-vs||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-wasteland||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+games/hlserver-wizwars||2007-09-29|Has expired: dependency of removed port games/halflifeserver
+devel/autoconf253|devel/autoconf261|2007-09-29|Autotools cleanup
+devel/autoconf259|devel/autoconf261|2007-09-29|Autotools cleanup
+print/clibpdf||2007-10-01|Has expired: distfile and homepage disappeared
+print/ruby-clibpdf||2007-10-01|Has expired: required port print/clibpdf deprecated

==== //depot/projects/dtrace/ports/Mk/bsd.perl.mk#3 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.perl.mk,v 1.6 2007/09/26 00:36:44 linimon Exp $
+# $FreeBSD: ports/Mk/bsd.perl.mk,v 1.7 2007/09/29 03:46:06 linimon Exp $
 #
 # bsd.perl.mk - Support for Perl-based ports.
 #
@@ -213,7 +213,7 @@
 # Disable AutoInstall from attempting to install from CPAN directly in
 # the case of missing dependencies.  This causes the build to loop on
 # the build cluster asking for interactive input.
-CONFIGURE_ENV+= "PERL_EXTUTILS_AUTOINSTALL=--skipdeps"
+CONFIGURE_ENV+= PERL_EXTUTILS_AUTOINSTALL="--skipdeps"
 .if defined(BATCH) && !defined(IS_INTERACTIVE)
 CONFIGURE_ENV+=	PERL_MM_USE_DEFAULT="YES"
 .endif # defined(BATCH) && !defined(IS_INTERACTIVE)

==== //depot/projects/dtrace/ports/Mk/bsd.php.mk#10 (text+ko) ====

@@ -7,7 +7,7 @@
 # Please send all suggested changes to the maintainer instead of committing
 # them to CVS yourself.
 #
-# $FreeBSD: ports/Mk/bsd.php.mk,v 1.42 2007/07/09 18:37:35 ale Exp $
+# $FreeBSD: ports/Mk/bsd.php.mk,v 1.43 2007/09/30 04:46:32 linimon Exp $
 #
 # Adding 'USE_PHP=yes' to a port includes this Makefile after bsd.ports.pre.mk.
 # If the port requires a predefined set of PHP extensions, they can be
@@ -148,7 +148,7 @@
 .if defined(USE_PHPIZE) || defined(USE_PHPEXT)
 BUILD_DEPENDS+=	phpize:${PHP_PORT}
 GNU_CONFIGURE=	YES
-USE_AUTOTOOLS+=	autoconf:259:env
+USE_AUTOTOOLS+=	autoconf:261:env
 CONFIGURE_ARGS+=--with-php-config=${LOCALBASE}/bin/php-config
 
 configure-message: phpize-message do-phpize

==== //depot/projects/dtrace/ports/Mk/bsd.port.mk#11 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.port.mk,v 1.586 2007/09/24 08:39:17 rafan Exp $
+# $FreeBSD: ports/Mk/bsd.port.mk,v 1.587 2007/09/30 04:01:39 linimon Exp $
 #	$NetBSD: $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -4774,6 +4774,10 @@
 .if !defined(NO_DEPENDS)
 	@for i in `${ECHO_CMD} "${${deptype}_DEPENDS}"`; do \
 		prog=`${ECHO_CMD} $$i | ${SED} -e 's/:.*//'`; \
+		if [ -z "$$prog" ]; then \
+			${ECHO_MSG} "Error: there is an empty port dependency in ${deptype}_DEPENDS."; \
+			break; \
+		fi; \
 		dir=`${ECHO_CMD} $$i | ${SED} -e 's/[^:]*://'`; \
 		if ${EXPR} "$$dir" : '.*:' > /dev/null; then \
 			target=`${ECHO_CMD} $$dir | ${SED} -e 's/.*://'`; \

==== //depot/projects/dtrace/ports/Mk/bsd.wx.mk#6 (text+ko) ====

@@ -1,7 +1,7 @@
 #-*- mode: makefile; tab-width: 4; -*-
 # ex:ts=4
 #
-# $FreeBSD: ports/Mk/bsd.wx.mk,v 1.10 2007/01/04 13:02:26 alepulver Exp $
+# $FreeBSD: ports/Mk/bsd.wx.mk,v 1.11 2007/09/29 17:54:38 alepulver Exp $
 #
 # bsd.wx.mk - Support for wxWidgets based ports.
 #
@@ -34,9 +34,9 @@
 #				  The available components are:
 #				  wx			- The wxWidgets library.
 #				  contrib		- The wxWidgets contributed libraries.
-#				  python		- The wxWidgets API for Python (for 2.4-2.6).
-#				  mozilla		- WxMozilla (for 2.4).
-#				  svg			- WxSVG (for 2.6).
+#				  python		- The wxWidgets API for Python.
+#				  mozilla		- WxMozilla (only for 2.4).
+#				  svg			- WxSVG (only for 2.6).
 #				  The available dependency types are:
 #				  build			- Requires component for building.
 #				  lib			- Requires component for building and running.
@@ -178,6 +178,9 @@
 _WX_PORT_contrib_2.8=	x11-toolkits/wxgtk28${_WX_UCL}-contrib
 _WX_LIB_contrib_2.8=	wx_gtk2${_WX_UC}_fl-2.8
 
+_WX_PORT_python_2.8=	x11-toolkits/py-wxPython28${_WX_UCL}
+_WX_FILE_python_2.8=	${PYTHON_SITELIBDIR}/wx-2.8-gtk2${_WX_PYSUFX}/wx/__init__.py
+
 # Set _WX_SHVER_comp_ver to 0 and _WX_FILE_comp_ver for libs appropiately.
 # Set _WX_DEPTYPE_comp_ver for "python" to "run", and others to "lib".
 

==== //depot/projects/dtrace/ports/UIDs#14 (text+ko) ====

@@ -1,26 +1,26 @@
-$FreeBSD: ports/UIDs,v 1.51 2007/09/09 07:09:21 edwin Exp $
+$FreeBSD: ports/UIDs,v 1.52 2007/09/30 07:19:48 edwin Exp $
 # Please keep this file sorted by UID!
 smmsp:*:25:25:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
-bind:*:53:53:Bind Sandbox:/:/sbin/nologin
+bind:*:53:53:Bind Sandbox:/:/usr/sbin/nologin
 majordom:*:54:54:Majordomo Pseudo User:/usr/local/majordomo:/nonexistent
 rdfdb:*:55:55:rdfDB Daemon:/var/db/rdfdb:/bin/sh
-spamd:*:58:58:SpamAssassin user:/var/spool/spamd:/sbin/nologin
+spamd:*:58:58:SpamAssassin user:/var/spool/spamd:/usr/sbin/nologin
 cyrus:*:60:60:the cyrus mail server:/nonexistent:/nonexistent
 gnats:*:61:1:GNATS database owner:/usr/local/share/gnats/gnats-db:/bin/sh
 proxy:*:62:62:Packet Filter pseudo-user:/nonexistent:/nonexistent
 uucp:*:66:66:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico
 xten:*:67:67:X-10 daemon:/usr/local/xten:/nonexistent
-pop:*:68:6:Post Office Owner (popper):/nonexistent:/sbin/nologin
+pop:*:68:6:Post Office Owner (popper):/nonexistent:/usr/sbin/nologin
 wnn:*:69:7:Wnn:/nonexistent:/nonexistent
 pgsql:*:70:70:PostgreSQL pseudo-user:/usr/local/pgsql:/bin/sh
-oracle:*:71:71:Oracle:/usr/local/oracle7:/sbin/nologin
+oracle:*:71:71:Oracle:/usr/local/oracle7:/usr/sbin/nologin
 ircd:*:72:72:IRC daemon:/nonexistent:/nonexistent
 ircservices:*:73:73:IRC services:/nonexistent:/nonexistent
-simscan:*:74:74:Simscan User:/nonexistent:/sbin/nologin
+simscan:*:74:74:Simscan User:/nonexistent:/usr/sbin/nologin
 ifmail:*:75:66:Ifmail user:/nonexistent:/nonexistent
-hybserv:*:76:76:HybServ Daemon:/nonexistent:/sbin/nologin
+hybserv:*:76:76:HybServ Daemon:/nonexistent:/usr/sbin/nologin
 virtuoso:*:79:79:Virtuoso Universal Server:/usr/local/virtuoso:/bin/sh
-www:*:80:80:World Wide Web Owner:/nonexistent:/sbin/nologin
+www:*:80:80:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
 alias:*:81:81:QMail user:/var/qmail/alias:/nonexistent
 qmaild:*:82:81:QMail user:/var/qmail:/nonexistent
 qmaill:*:83:81:QMail user:/var/qmail:/nonexistent
@@ -28,101 +28,101 @@
 qmailq:*:85:82:QMail user:/var/qmail:/nonexistent
 qmailr:*:86:82:QMail user:/var/qmail:/nonexistent
 qmails:*:87:82:QMail user:/var/qmail:/nonexistent
-mysql:*:88:88:MySQL Daemon:/var/db/mysql:/sbin/nologin
+mysql:*:88:88:MySQL Daemon:/var/db/mysql:/usr/sbin/nologin
 vpopmail:*:89:89:VPop Mail User:/usr/local/vpopmail:/nonexistent
 firebird:*:90:90:Firebird Database Administrator:/var/db/firebird:/bin/sh
-mailman:*:91:91:Mailman User:/usr/local/mailman:/sbin/nologin
-gdm:*:92:92:GDM Sandbox:/:/sbin/nologin
+mailman:*:91:91:Mailman User:/usr/local/mailman:/usr/sbin/nologin
+gdm:*:92:92:GDM Sandbox:/:/usr/sbin/nologin
 jabber:*:93:93:Jabber Daemon:/nonexistent:/nonexistent
-p4admin:*:94:94:Perforce admin:/usr/local/perforce:/sbin/nologin
-interch:*:95:95:Interchange user:/usr/local/interchange:/sbin/nologin
+p4admin:*:94:94:Perforce admin:/usr/local/perforce:/usr/sbin/nologin
+interch:*:95:95:Interchange user:/usr/local/interchange:/usr/sbin/nologin
 squeuer:*:96:96:SQueuer Owner:/nonexistent:/bin/sh
 mud:*:97:97:MUD Owner:/nonexistent:/bin/sh
 msql:*:98:98:mSQL-2 pseudo-user:/var/db/msqldb:/bin/sh
 rscsi:*:99:99:Remote SCSI:/usr/local/rscsi:/usr/local/sbin/rscsi
-squid:*:100:100:squid caching-proxy pseudo user:/usr/local/squid:/sbin/nologin
-quagga:*:101:101:Quagga route daemon pseudo user:/usr/local/etc/quagga:/sbin/nologin
-ganglia:*:102:102:Ganglia User:/nonexistent:/sbin/nologin
-sgeadmin:*:103:103:Sun Grid Engine Admin:/nonexistent:/sbin/nologin
-slimserv:*:104:104:Slim Devices SlimServer pseudo-user:/nonexistent:/sbin/nologin
-dnetc:*:105:105:distributed.net client and proxy pseudo-user:/nonexistent:/sbin/nologin
-clamav:*:106:106:Clamav Antivirus:/nonexistent:/sbin/nologin
-cacti:*:107:107:Cacti Sandbox:/nonexistent:/sbin/nologin
+squid:*:100:100:squid caching-proxy pseudo user:/usr/local/squid:/usr/sbin/nologin
+quagga:*:101:101:Quagga route daemon pseudo user:/usr/local/etc/quagga:/usr/sbin/nologin
+ganglia:*:102:102:Ganglia User:/nonexistent:/usr/sbin/nologin
+sgeadmin:*:103:103:Sun Grid Engine Admin:/nonexistent:/usr/sbin/nologin
+slimserv:*:104:104:Slim Devices SlimServer pseudo-user:/nonexistent:/usr/sbin/nologin
+dnetc:*:105:105:distributed.net client and proxy pseudo-user:/nonexistent:/usr/sbin/nologin
+clamav:*:106:106:Clamav Antivirus:/nonexistent:/usr/sbin/nologin
+cacti:*:107:107:Cacti Sandbox:/nonexistent:/usr/sbin/nologin
 webkit:*:108:108:WebKit Default User:/usr/local/www/webkit:/bin/sh
-quickml:*:109:109:quickml Server:/nonexistent:/sbin/nologin
+quickml:*:109:109:quickml Server:/nonexistent:/usr/sbin/nologin
 vscan:*:110:110:Scanning Virus Account:/var/amavis:/bin/sh
 fido:*:111:111:Fido System:/usr/local/fido:/bin/sh
-dcc:*:112:112:Distributed Checksum Clearinghouse:/nonexistent:/sbin/nologin
-amavis:*:113:113:Amavis-stats Account:/nonexistent:/sbin/nologin
-dhis:*:114:114:DHIS Daemon:/nonexistent:/sbin/nologin
-_symon:*:115:115:Symon Account:/var/empty:/sbin/nologin
-hplip:*:116:116:HPLIP Server:/nonexistent:/sbin/nologin
-smokeping:*:117:117:SmokePing Daemon:/nonexistent:/sbin/nologin
-ircproxyd:*:118:118:Night Light IRC Proxy:/nonexistent:/sbin/nologin
+dcc:*:112:112:Distributed Checksum Clearinghouse:/nonexistent:/usr/sbin/nologin
+amavis:*:113:113:Amavis-stats Account:/nonexistent:/usr/sbin/nologin
+dhis:*:114:114:DHIS Daemon:/nonexistent:/usr/sbin/nologin
+_symon:*:115:115:Symon Account:/var/empty:/usr/sbin/nologin
+hplip:*:116:116:HPLIP Server:/nonexistent:/usr/sbin/nologin
+smokeping:*:117:117:SmokePing Daemon:/nonexistent:/usr/sbin/nologin
+ircproxyd:*:118:118:Night Light IRC Proxy:/nonexistent:/usr/sbin/nologin
 mythtv:*:119:119:MythTV pseudo-user:/home/mythtv:/bin/sh
-pdns_recursor:*:120:120:pdns_recursor pseudo-user:/nonexistent:/sbin/nologin
+pdns_recursor:*:120:120:pdns_recursor pseudo-user:/nonexistent:/usr/sbin/nologin
 otrs:*:121:121:OTRS Administrator:/usr/local/otrs:/bin/csh
-zabbix:*:122:122:Zabbix NMS:/nonexistent:/sbin/nologin
-_ntp:*:123:123:NTP Daemon:/var/empty:/sbin/nologin
-fetchmail:*:124:124:Fetchmail mail-retrieval daemon:/nonexistent:/sbin/nologin
-postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/sbin/nologin
-navcron:*:127:127:Network Administration Visualized:/usr/local/nav:/sbin/nologin
-vchat:*:128:128:VChat Conferencing System:/nonexistent:/sbin/nologin
-_bgpd:*:130:130:BGP Daemon:/var/empty:/sbin/nologin
-_ospfd:*:131:131:OSPF Daemon:/var/empty:/sbin/nologin
+zabbix:*:122:122:Zabbix NMS:/nonexistent:/usr/sbin/nologin
+_ntp:*:123:123:NTP Daemon:/var/empty:/usr/sbin/nologin
+fetchmail:*:124:124:Fetchmail mail-retrieval daemon:/nonexistent:/usr/sbin/nologin
+postfix:*:125:125:Postfix Mail System:/var/spool/postfix:/usr/sbin/nologin
+navcron:*:127:127:Network Administration Visualized:/usr/local/nav:/usr/sbin/nologin
+vchat:*:128:128:VChat Conferencing System:/nonexistent:/usr/sbin/nologin
+_bgpd:*:130:130:BGP Daemon:/var/empty:/usr/sbin/nologin
+_ospfd:*:131:131:OSPF Daemon:/var/empty:/usr/sbin/nologin
 _spamd:*:132:132::0:0:Spam Daemon:/var/empty:/usr/sbin/nologin
-dovecot:*:143:143:Dovecot User:/var/empty:/sbin/nologin
-rbldns:*:153:153:rbldnsd pseudo-user:/nonexistent:/sbin/nologin
-sfs:*:171:171:Self-Certifying File System:/nonexistent:/sbin/nologin
+dovecot:*:143:143:Dovecot User:/var/empty:/usr/sbin/nologin
+rbldns:*:153:153:rbldnsd pseudo-user:/nonexistent:/usr/sbin/nologin
+sfs:*:171:171:Self-Certifying File System:/nonexistent:/usr/sbin/nologin
 agk:*:172:172:AquaGateKeeper:/nonexistent:/nonexistent
-polipo:*:173:173:polipo web cache:/nonexistent:/sbin/nologin
-flowtools:*:174:174:Flow-tools collector pseudo-user:/nonexistent:/sbin/nologin
-nagios:*:181:181:Nagios pseudo-user:/var/spool/nagios:/sbin/nologin
-moinmoin:*:192:192:MoinMoin User:/nonexistent:/sbin/nologin
-cups:*:193:193:Cups Owner:/nonexistent:/sbin/nologin
-sympa:*:200:200:Sympa Owner:/nonexistent:/sbin/nologin
-privoxy:*:201:201:Privoxy proxy user:/nonexistent:/sbin/nologin
-dspam:*:202:202:Dspam:/nonexistent:/sbin/nologin
+polipo:*:173:173:polipo web cache:/nonexistent:/usr/sbin/nologin
+flowtools:*:174:174:Flow-tools collector pseudo-user:/nonexistent:/usr/sbin/nologin
+nagios:*:181:181:Nagios pseudo-user:/var/spool/nagios:/usr/sbin/nologin
+moinmoin:*:192:192:MoinMoin User:/nonexistent:/usr/sbin/nologin
+cups:*:193:193:Cups Owner:/nonexistent:/usr/sbin/nologin
+sympa:*:200:200:Sympa Owner:/nonexistent:/usr/sbin/nologin
+privoxy:*:201:201:Privoxy proxy user:/nonexistent:/usr/sbin/nologin
+dspam:*:202:202:Dspam:/nonexistent:/usr/sbin/nologin
 shoutcast:*:210:210:Shoutcast sandbox:/nonexistent:/bin/sh
 bs:*:220:220:Big Sister:/usr/local/bigsister:/bin/sh
-postgrey:*:225:225:Postgrey Owner:/nonexistent:/sbin/nologin
-fcron:*:247:247:fcron pseudo-user:/nonexistent:/sbin/nologin
+postgrey:*:225:225:Postgrey Owner:/nonexistent:/usr/sbin/nologin
+fcron:*:247:247:fcron pseudo-user:/nonexistent:/usr/sbin/nologin
 _tor:*:256:256:Tor anonymising router:/var/db/tor:/bin/sh
-_dns-proxy-tor:*:257:257:dns-proxy-tor user:/nonexistent:/sbin/nologin
-_trans-proxy-tor:*:258:258:dns-proxy-tor user:/nonexistent:/sbin/nologin
+_dns-proxy-tor:*:257:257:dns-proxy-tor user:/nonexistent:/usr/sbin/nologin
+_trans-proxy-tor:*:258:258:dns-proxy-tor user:/nonexistent:/usr/sbin/nologin
 meta1s:*:260:260:MeTA1 SMTPS:/nonexistent:/usr/sbin/nologin
 meta1q:*:261:261:MeTA1 QMGR:/nonexistent:/usr/sbin/nologin
 meta1c:*:262:262:MeTA1 SMTPC:/nonexistent:/usr/sbin/nologin
 meta1m:*:263:263:MeTA1 misc:/nonexistent:/usr/sbin/nologin
 meta1:*:264:264: X other:/nonexistent:/usr/sbin/nologin
-hacluster:*:275:275:Heartbeat cluster user:/nonexistent:/sbin/nologin
-mrtg:*:279:279:MRTG daemon:/nonexistent:/sbin/nologin
-prelude:*:281:281:Prelude user:/nonexistent:/sbin/nologin
-_sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/sbin/nologin
-dkfilter:*:325:325:DK Filter Owner:/nonexistent:/sbin/nologin
-wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/sbin/nologin
-stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/sbin/nologin
-ldap:*:389:389:OpenLDAP Server:/nonexistent:/sbin/nologin
+hacluster:*:275:275:Heartbeat cluster user:/nonexistent:/usr/sbin/nologin
+mrtg:*:279:279:MRTG daemon:/nonexistent:/usr/sbin/nologin
+prelude:*:281:281:Prelude user:/nonexistent:/usr/sbin/nologin
+_sphinx:*:312:312::0:0:Sphinxsearch Owner:/nonexistent:/usr/sbin/nologin
+dkfilter:*:325:325:DK Filter Owner:/nonexistent:/usr/sbin/nologin
+wildfire:*:340:340::0:0:Wildfire Daemon:/nonexistent:/usr/sbin/nologin
+stunnel:*:341:341::0:0:Stunnel Daemon:/nonexistent:/usr/sbin/nologin
+ldap:*:389:389:OpenLDAP Server:/nonexistent:/usr/sbin/nologin
 tiarra:*:398:398:Tiarra IRC Proxy:/nonexistent:/usr/sbin/nologin
-drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/sbin/nologin
-courier:*:465:465:Courier Mail Server:/nonexistent:/sbin/nologin
+drweb:*:426:426:Dr.Web Mail Scanner:/nonexistent:/usr/sbin/nologin
+courier:*:465:465:Courier Mail Server:/nonexistent:/usr/sbin/nologin
 _bbstored:*:505:505:BoxBackup Store Daemon:/nonexistent:/bin/sh
 nullmail:*:522:522:Nullmailer Mail System:/var/spool/nullmailer:/bin/sh
-dkimproxy:*:525:525:DKIM Proxy Owner:/nonexistent:/sbin/nologin
+dkimproxy:*:525:525:DKIM Proxy Owner:/nonexistent:/usr/sbin/nologin
 ejabberd:*:544:544:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh
-qtss:*:554:554:Darwin Streaming Server:/nonexistent:/sbin/nologin
+qtss:*:554:554:Darwin Streaming Server:/nonexistent:/usr/sbin/nologin
 ircdru:*:555:555:Russian hybrid IRC server:/nonexistent:/bin/sh
-messagebus:*:556:556:D-BUS Daemon User:/nonexistent:/sbin/nologin
-avahi:*:558:558:Avahi Daemon User:/nonexistent:/sbin/nologin
-tacacs:*:559:559:TACACS+ Daemon User:/nonexistent:/sbin/nologin
-distcc:*:561:561:Distcc user:/nonexistent:/sbin/nologin
-polkit:*:562:562:PolicyKit User:/nonexistent:/sbin/nologin
-pulse:*:563:563:PulseAudio System User:/nonexistent:/sbin/nologin
-_xsi:*:600:600:XMLSysInfo User:/nonexistent:/sbin/nologin
-bnetd:*:700:700:Bnetd user:/nonexistent:/sbin/nologin
+messagebus:*:556:556:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin
+avahi:*:558:558:Avahi Daemon User:/nonexistent:/usr/sbin/nologin
+tacacs:*:559:559:TACACS+ Daemon User:/nonexistent:/usr/sbin/nologin
+distcc:*:561:561:Distcc user:/nonexistent:/usr/sbin/nologin
+polkit:*:562:562:PolicyKit User:/nonexistent:/usr/sbin/nologin
+pulse:*:563:563:PulseAudio System User:/nonexistent:/usr/sbin/nologin
+_xsi:*:600:600:XMLSysInfo User:/nonexistent:/usr/sbin/nologin
+bnetd:*:700:700:Bnetd user:/nonexistent:/usr/sbin/nologin
 bopm:*:717:717:Blitzed Open Proxy Monitor:/nonexistent:/bin/sh
 openxpki:*:777:777:OpenXPKI Owner:/nonexistent:/usr/sbin/nologin
 netdisco:*:840:840:netdisco daemon:/nonexistent:/usr/sbin/nologin
-bacula:*:910:910:Bacula Daemon:/var/db/bacula:/sbin/nologin
-iserv:*:911:911:Iserv Daemon:/nonexistent:/sbin/nologin
-_sj3:*:912:912:SJ3 Daemon:/nonexistent:/sbin/nologin
+bacula:*:910:910:Bacula Daemon:/var/db/bacula:/usr/sbin/nologin
+iserv:*:911:911:Iserv Daemon:/nonexistent:/usr/sbin/nologin
+_sj3:*:912:912:SJ3 Daemon:/nonexistent:/usr/sbin/nologin

==== //depot/projects/dtrace/ports/UPDATING#33 (text+ko) ====

@@ -6,6 +6,17 @@
 time you update your ports collection, before attempting any port
 upgrades.
 
+20070930:
+  AFFECTS: everyone
+  AUTHOR: Mark Linimon <linimon@FreeBSD.org>
+
+  The ports tree has been migrated to the latest version of autoconf,
+  2.61.  Versions 2.53 and 2.59 were declared obsolete and removed.
+
+  m4 was also updated to 1.10, but this proved to be incompatible and
+  was rolled back to 1.9.  If you are experiencing 'Makefile: not found'
+  errors, make sure you are not using 1.10.
+
 20070928:
   AFFECTS: users of irc/ratbox-services
   AUTHOR: Lewis <moggie@elasticmind.net>
@@ -5693,4 +5704,4 @@
   2) Update all p5-* modules.
 	portupgrade -f p5-\*
 
-$FreeBSD: ports/UPDATING,v 1.550 2007/09/28 01:03:38 edwin Exp $
+$FreeBSD: ports/UPDATING,v 1.551 2007/10/01 04:33:00 linimon Exp $

==== //depot/projects/dtrace/src/Makefile.inc1#29 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.586 2007/10/01 18:24:46 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -344,8 +344,7 @@
 .endfor
 .for _dir in \
     lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc \
-    usr/share/snmp/defs usr/share/snmp/mibs
+    usr/libexec usr/sbin usr/share/misc
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -429,9 +428,7 @@
 	@echo ">>> stage 5.1: building 32 bit shim libraries"
 	@echo "--------------------------------------------------------------"
 .for _dir in \
-    lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc \
-    usr/share/snmp/defs usr/share/snmp/mibs
+    usr/include usr/lib32 usr/share/misc
 	mkdir -p ${LIB32TMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -1048,12 +1045,20 @@
 		${_lib_cddl} ${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
-		lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \
+		lib/libopie lib/libpam ${_default_thread_lib} \
 		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
 		${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
 		${_secure_lib_libssl} gnu/lib/libdwarf
 
+.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no"
+_default_thread_lib=	lib/${DEFAULT_THREAD_LIB}
+.elif ${MK_LIBTHR} != "no"
+_default_thread_lib=	lib/libthr
+.elif ${MK_LIBPTHREAD} != "no"
+_default_thread_lib=	lib/libpthread
+.endif
+
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L

==== //depot/projects/dtrace/src/ObsoleteFiles.inc#22 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.111 2007/09/14 03:07:22 jkoshy Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.112 2007/09/29 22:37:40 bushman Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20070930: rename of cached to nscd
+OLD_FILES+=etc/rc.d/cached
+OLD_FILES+=usr/sbin/cached
+OLD_FILES+=usr/share/man/man5/cached.conf.5
+OLD_FILES+=usr/share/man/man8/cached.8
 # 20070807: removal of PowerPC specific header file.
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/interruptvar.h

==== //depot/projects/dtrace/src/UPDATING#16 (text+ko) ====

@@ -21,6 +21,13 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070930:
+	The PCI code has been made aware of PCI domains. This means that
+	the location strings as used by pciconf(8) etc are now in the
+	following format: pci<domain>:<bus>:<device>[:<function>]. It
+	also means that consumers of <sys/pciio.h> potentially need to
+	be recompiled; this includes the hal and xorg-server ports.
+
 20070928:
         The caching daemon (cached) was renamed to nscd. nscd.conf
         configuration file should be used instead of cached.conf and
@@ -894,4 +901,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.504 2007/09/28 10:38:07 bushman Exp $
+$FreeBSD: src/UPDATING,v 1.505 2007/09/30 11:05:12 marius Exp $

==== //depot/projects/dtrace/src/cddl/lib/Makefile#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,9 @@
 
 .if ${MK_ZFS} != "no"
 _libzfs=	libzfs
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _libzpool=	libzpool
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/dtrace/src/cddl/sbin/zfs/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
 
@@ -19,7 +19,9 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>

==== //depot/projects/dtrace/src/cddl/sbin/zpool/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
 
@@ -19,7 +19,9 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lavl -lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>

==== //depot/projects/dtrace/src/cddl/usr.bin/Makefile#4 (text+ko) ====

@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	${_ztest}
 
 .if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _ztest=	ztest
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/dtrace/src/cddl/usr.bin/ztest/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
 
@@ -15,7 +15,8 @@
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>

==== //depot/projects/dtrace/src/cddl/usr.sbin/Makefile#3 (text+ko) ====

@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	${_zdb}
 
 .if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _zdb=	zdb
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/dtrace/src/cddl/usr.sbin/zdb/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
 
@@ -16,7 +16,8 @@
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>

==== //depot/projects/dtrace/src/include/Makefile#11 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.275 2007/09/23 07:34:21 pjd Exp $
+# $FreeBSD: src/include/Makefile,v 1.276 2007/10/01 18:07:29 ru Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -45,11 +45,13 @@
 LSUBDIRS=	cam/scsi \
 	dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
 	dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \
-	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
+	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
+	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
 	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
 	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
-	geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe geom/virstor \
+	geom/mirror geom/multipath geom/nop \
+	geom/raid3 geom/shsec geom/stripe geom/virstor \
 	netgraph/atm netgraph/netflow \
 	security/audit \
 	security/mac_biba security/mac_bsdextended security/mac_lomac \

==== //depot/projects/dtrace/src/lib/libc/Makefile#10 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.72 2007/05/19 16:38:39 kan Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.73 2007/10/01 18:15:10 ru Exp $
 
 SHLIBDIR?= /lib
 
@@ -23,6 +23,7 @@
 #
 # Only link with static libgcc.a (no libgcc_eh.a).
 #
+DPADD+=	${LIBGCC}
 LDFLAGS+= -nodefaultlibs
 LDADD+= -lgcc
 

==== //depot/projects/dtrace/src/lib/libpthread/Makefile#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libpthread/Makefile,v 1.63 2007/05/21 02:49:06 deischen Exp $
+# $FreeBSD: src/lib/libpthread/Makefile,v 1.64 2007/10/01 18:22:31 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -10,7 +10,8 @@
 
 .include <bsd.own.mk>
 
-.if ${DEFAULT_THREAD_LIB} == "libpthread" && ${SHLIBDIR} == "/usr/lib"
+.if (${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no") && \
+    ${SHLIBDIR} == "/usr/lib"
 SHLIBDIR= /lib
 .endif
 
@@ -46,7 +47,7 @@
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${DEFAULT_THREAD_LIB} == "libpthread"
+.if ${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so

==== //depot/projects/dtrace/src/lib/libthr/Makefile#10 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/Makefile,v 1.26 2007/06/08 02:21:13 davidxu Exp $
+# $FreeBSD: src/lib/libthr/Makefile,v 1.27 2007/10/01 18:29:55 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -10,7 +10,8 @@
 
 .include <bsd.own.mk>
 
-.if ${DEFAULT_THREAD_LIB} == "libthr" && ${SHLIBDIR} == "/usr/lib"
+.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no") && \
+    ${SHLIBDIR} == "/usr/lib"
 SHLIBDIR= /lib
 .endif
 
@@ -43,7 +44,7 @@
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${DEFAULT_THREAD_LIB} == "libthr"
+.if ${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so

==== //depot/projects/dtrace/src/libexec/atrun/Makefile#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/libexec/atrun/Makefile,v 1.14 2007/06/15 12:02:16 yar Exp $
+# $FreeBSD: src/libexec/atrun/Makefile,v 1.15 2007/10/01 18:17:23 ru Exp $
 
 MAINSRC=${.CURDIR}/../../usr.bin/at
 
@@ -16,7 +16,7 @@
 WFORMAT=0
 
 DPADD=	${LIBPAM} ${LIBUTIL}
-LDADD=	-lpam -lutil
+LDADD=	${MINUSLPAM} -lutil
 
 atrun.8: atrun.man
 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \

==== //depot/projects/dtrace/src/sbin/ggate/Makefile#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sbin/ggate/Makefile,v 1.7 2006/11/26 14:36:33 ru Exp $
+# $FreeBSD: src/sbin/ggate/Makefile,v 1.8 2007/10/01 18:22:31 ru Exp $
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 00:35:23 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B9BA116A419; Tue,  2 Oct 2007 00:35:23 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6B54C16A417
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 00:35:23 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 70E4213C44B
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 00:35:23 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l920ZNEA057615
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 00:35:23 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l920ZNUM057612
	for perforce@freebsd.org; Tue, 2 Oct 2007 00:35:23 GMT
	(envelope-from jb@freebsd.org)
Date: Tue, 2 Oct 2007 00:35:23 GMT
Message-Id: <200710020035.l920ZNUM057612@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127077 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 00:35:24 -0000

http://perforce.freebsd.org/chv.cgi?CH=127077

Change 127077 by jb@jb_freebsd1 on 2007/10/02 00:34:56

	IF6

Affected files ...

.. //depot/projects/dtrace6/src/etc/rc.d/kerberos#2 integrate
.. //depot/projects/dtrace6/src/sbin/tunefs/tunefs.8#2 integrate
.. //depot/projects/dtrace6/src/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/dtrace6/src/sys/conf/files.sparc64#2 integrate
.. //depot/projects/dtrace6/src/sys/conf/options.sparc64#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/acpica/acpi_cpu.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/uart/uart_kbd_sun.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/uart/uart_kbd_sun.h#2 integrate
.. //depot/projects/dtrace6/src/sys/i386/isa/pcvt/pcvt_ext.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/conf/NOTES#2 integrate

Differences ...

==== //depot/projects/dtrace6/src/etc/rc.d/kerberos#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/kerberos,v 1.4.2.1 2005/09/25 18:45:56 rwatson Exp $
+# $FreeBSD: src/etc/rc.d/kerberos,v 1.4.2.2 2007/10/01 23:37:39 mtm Exp $
 #
 
 # PROVIDE: kerberos
@@ -12,6 +12,6 @@
 load_rc_config $name
 rcvar="kerberos5_server_enable"
 command="${kerberos5_server}"
-command_args="${kerberos5_server_flags} &"
+command_args="${kerberos5_server_flags} --detach"
 
 run_rc_command "$1"

==== //depot/projects/dtrace6/src/sbin/tunefs/tunefs.8#2 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)tunefs.8	8.2 (Berkeley) 12/11/93
-.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.36 2005/02/13 22:25:17 ru Exp $
+.\" $FreeBSD: src/sbin/tunefs/tunefs.8,v 1.36.2.1 2007/09/29 16:31:44 maxim Exp $
 .\"
-.Dd May 18, 2002
+.Dd August 13, 2007
 .Dt TUNEFS 8
 .Os
 .Sh NAME
@@ -162,6 +162,8 @@
 .Bx 4.2 .
 .Sh BUGS
 This utility should work on active file systems.
+To change the root file system, the system must be rebooted
+after the file system is tuned.
 .\" Take this out and a Unix Daemon will dog your steps from now until
 .\" the time_t's wrap around.
 .Pp

==== //depot/projects/dtrace6/src/sys/compat/ia32/ia32_sysvec.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.20.2.1 2007/05/23 18:24:43 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.20.2.2 2007/10/01 20:13:49 jhb Exp $");
 
 #include "opt_compat.h"
 
@@ -272,10 +272,13 @@
 
 static u_long	ia32_maxdsiz = IA32_MAXDSIZ;
 SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, "");
+TUNABLE_ULONG("compat.ia32.maxdsiz", &ia32_maxdsiz);
 static u_long	ia32_maxssiz = IA32_MAXSSIZ;
 SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, "");
+TUNABLE_ULONG("compat.ia32.maxssiz", &ia32_maxssiz);
 static u_long	ia32_maxvmem = IA32_MAXVMEM;
 SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, "");
+TUNABLE_ULONG("compat.ia32.maxvmem", &ia32_maxvmem);
 
 static void
 ia32_fixlimit(struct rlimit *rl, int which)

==== //depot/projects/dtrace6/src/sys/conf/files.sparc64#2 (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.sparc64,v 1.73.2.3 2006/07/11 16:34:38 sam Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.73.2.4 2007/09/30 19:33:19 marius Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -12,6 +12,11 @@
 	no-obj no-implicit-rule before-depend				\
 	clean		"atkbdmap.h"
 #
+sunkbdmap.h			optional	sunkbd_dflt_keymap	\
+	compile-with	"/usr/sbin/kbdcontrol -L ${SUNKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > sunkbdmap.h"			\
+	no-obj no-implicit-rule before-depend				\
+	clean		"sunkbdmap.h"
+#
 ukbdmap.h			optional	ukbd_dflt_keymap	\
 	compile-with	"/usr/sbin/kbdcontrol -L ${UKBD_DFLT_KEYMAP} | sed -e 's/^static keymap_t.* = /static keymap_t key_map = /' -e 's/^static accentmap_t.* = /static accentmap_t accent_map = /' > ukbdmap.h"			\
 	no-obj no-implicit-rule before-depend				\

==== //depot/projects/dtrace6/src/sys/conf/options.sparc64#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options.sparc64,v 1.13 2005/06/10 20:58:59 marius Exp $
+# $FreeBSD: src/sys/conf/options.sparc64,v 1.13.2.1 2007/09/30 19:33:19 marius Exp $
 
 SUN4U			opt_global.h
 
@@ -18,3 +18,5 @@
 PSM_DEBUG		opt_psm.h
 PSM_HOOKRESUME		opt_psm.h
 PSM_RESETAFTERSUSPEND	opt_psm.h
+SUNKBD_DFLT_KEYMAP	opt_sunkbd.h
+SUNKBD_EMULATE_ATKBD	opt_sunkbd.h

==== //depot/projects/dtrace6/src/sys/dev/acpica/acpi_cpu.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.57.2.3 2007/06/11 18:54:09 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_cpu.c,v 1.57.2.4 2007/09/29 23:13:38 rpaulo Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -257,7 +257,7 @@
 acpi_cpu_attach(device_t dev)
 {
     ACPI_BUFFER		   buf;
-    ACPI_OBJECT		   arg, *obj;
+    ACPI_OBJECT		   arg[4], *obj;
     ACPI_OBJECT_LIST	   arglist;
     struct pcpu		   *pcpu_data;
     struct acpi_cpu_softc *sc;
@@ -268,6 +268,11 @@
     driver_t 		  **drivers;
     uint32_t		   cap_set[3];
 
+    /* UUID needed by _OSC evaluation */
+    static uint8_t cpu_oscuuid[16] = { 0x16, 0xA6, 0x77, 0x40, 0x0C, 0x29,
+				       0xBE, 0x47, 0x9E, 0xBD, 0xD8, 0x70,
+				       0x58, 0x71, 0x39, 0x53 };
+
     ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
 
     sc = device_get_softc(dev);
@@ -334,19 +339,39 @@
     /*
      * CPU capabilities are specified as a buffer of 32-bit integers:
      * revision, count, and one or more capabilities.  The revision of
-     * "1" is not specified anywhere but seems to match Linux.  We should
-     * also support _OSC here.
+     * "1" is not specified anywhere but seems to match Linux.
      */
     if (sc->cpu_features) {
-	arglist.Pointer = &arg;
+	arglist.Pointer = arg;
 	arglist.Count = 1;
-	arg.Type = ACPI_TYPE_BUFFER;
-	arg.Buffer.Length = sizeof(cap_set);
-	arg.Buffer.Pointer = (uint8_t *)cap_set;
+	arg[0].Type = ACPI_TYPE_BUFFER;
+	arg[0].Buffer.Length = sizeof(cap_set);
+	arg[0].Buffer.Pointer = (uint8_t *)cap_set;
 	cap_set[0] = 1; /* revision */
 	cap_set[1] = 1; /* number of capabilities integers */
 	cap_set[2] = sc->cpu_features;
 	AcpiEvaluateObject(sc->cpu_handle, "_PDC", &arglist, NULL);
+
+	/*
+	 * On some systems we need to evaluate _OSC so that the ASL
+	 * loads the _PSS and/or _PDC methods at runtime.
+	 *
+	 * TODO: evaluate failure of _OSC.
+	 */
+	arglist.Pointer = arg;
+	arglist.Count = 4;
+	arg[0].Type = ACPI_TYPE_BUFFER;
+	arg[0].Buffer.Length = sizeof(cpu_oscuuid);
+	arg[0].Buffer.Pointer = cpu_oscuuid;	/* UUID */
+	arg[1].Type = ACPI_TYPE_INTEGER;
+	arg[1].Integer.Value = 1;		/* revision */
+	arg[2].Type = ACPI_TYPE_INTEGER;
+	arg[2].Integer.Value = 1;		/* count */
+	arg[3].Type = ACPI_TYPE_BUFFER;
+	arg[3].Buffer.Length = sizeof(cap_set);	/* Capabilities buffer */
+	arg[3].Buffer.Pointer = (uint8_t *)cap_set;
+	cap_set[0] = 0;
+	AcpiEvaluateObject(sc->cpu_handle, "_OSC", &arglist, NULL);
     }
 
     /* Probe for Cx state support. */

==== //depot/projects/dtrace6/src/sys/dev/syscons/syscons.c#2 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.436.2.8 2006/11/27 14:37:09 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/syscons/syscons.c,v 1.436.2.9 2007/09/30 06:16:20 marcus Exp $");
 
 #include "opt_syscons.h"
 #include "opt_splash.h"
@@ -1060,8 +1060,7 @@
 	scp = sc_get_stat(SC_DEV(sc, i));
 	if (scp == scp->sc->cur_scp)
 	    return 0;
-	while ((error=tsleep(&scp->smode, PZERO|PCATCH,
-			     "waitvt", 0)) == ERESTART) ;
+	error = tsleep(&scp->smode, PZERO | PCATCH, "waitvt", 0);
 	return error;
 
     case VT_GETACTIVE:		/* get active vty # */

==== //depot/projects/dtrace6/src/sys/dev/uart/uart_kbd_sun.c#2 (text+ko) ====

@@ -25,9 +25,15 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/uart/uart_kbd_sun.c,v 1.5.2.3 2006/10/04 06:09:09 ru Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/uart/uart_kbd_sun.c,v 1.5.2.4 2007/09/30 19:33:19 marius Exp $");
 
 #include "opt_kbd.h"
+#include "opt_sunkbd.h"
+
+#if (defined(SUNKBD_EMULATE_ATKBD) && defined(SUNKBD_DFLT_KEYMAP)) ||	\
+    !defined(SUNKBD_EMULATE_ATKBD)
+#define	KBD_DFLT_KEYMAP
+#endif
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -35,26 +41,30 @@
 #include <sys/interrupt.h>
 #include <sys/kbio.h>
 #include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/ktr.h>
+#include <sys/limits.h>
+#include <sys/lock.h>
+#include <sys/mutex.h>
 
 #include <machine/bus.h>
-#include <machine/resource.h>
-
-#include <sys/rman.h>
 
 #include <dev/kbd/kbdreg.h>
+#include <dev/kbd/kbdtables.h>
 
 #include <dev/uart/uart.h>
 #include <dev/uart/uart_bus.h>
 #include <dev/uart/uart_cpu.h>
 
 #include <dev/uart/uart_kbd_sun.h>
+#if !defined(SUNKBD_EMULATE_ATKBD)
 #include <dev/uart/uart_kbd_sun_tables.h>
+#endif
 
+#if defined(SUNKBD_EMULATE_ATKBD) && defined(SUNKBD_DFLT_KEYMAP)
+#include "sunkbdmap.h"
+#endif
 #include "uart_if.h"
 
-#define	SUNKBD_BUF_SIZE		128
+#define	SUNKBD_DRIVER_NAME	"sunkbd"
 
 #define	TODO	printf("%s: unimplemented", __func__)
 
@@ -63,14 +73,23 @@
 	struct uart_softc	*sc_uart;
 	struct uart_devinfo	*sc_sysdev;
 
+	int			sc_checked_key;
+
 	struct callout		sc_repeat_callout;
 	int			sc_repeat_key;
 
 	int			sc_accents;
+	int			sc_composed_char;
+	int			sc_flags;
+#define	KPCOMPOSE			(1 << 0)
 	int			sc_mode;
 	int			sc_polling;
 	int			sc_repeating;
 	int			sc_state;
+
+#if defined(SUNKBD_EMULATE_ATKBD)
+	int			sc_buffered_char[2];
+#endif
 };
 
 static int sunkbd_configure(int flags);
@@ -96,6 +115,9 @@
 static void sunkbd_diag(keyboard_t *kbd, int level);
 
 static void sunkbd_repeat(void *v);
+#if defined(SUNKBD_EMULATE_ATKBD)
+static int keycode2scancode(int keycode, int shift, int up);
+#endif
 
 static keyboard_switch_t sunkbdsw = {
 	sunkbd_probe,
@@ -124,41 +146,46 @@
 static struct sunkbd_softc sunkbd_softc;
 static struct uart_devinfo uart_keyboard;
 
-static fkeytab_t fkey_tab[96] = {
-/* 01-04 */	{"\033[M", 3}, {"\033[N", 3}, {"\033[O", 3}, {"\033[P", 3},
-/* 05-08 */	{"\033[Q", 3}, {"\033[R", 3}, {"\033[S", 3}, {"\033[T", 3},
-/* 09-12 */	{"\033[U", 3}, {"\033[V", 3}, {"\033[W", 3}, {"\033[X", 3},
-/* 13-16 */	{"\033[Y", 3}, {"\033[Z", 3}, {"\033[a", 3}, {"\033[b", 3},
-/* 17-20 */	{"\033[c", 3}, {"\033[d", 3}, {"\033[e", 3}, {"\033[f", 3},
-/* 21-24 */	{"\033[g", 3}, {"\033[h", 3}, {"\033[i", 3}, {"\033[j", 3},
-/* 25-28 */	{"\033[k", 3}, {"\033[l", 3}, {"\033[m", 3}, {"\033[n", 3},
-/* 29-32 */	{"\033[o", 3}, {"\033[p", 3}, {"\033[q", 3}, {"\033[r", 3},
-/* 33-36 */	{"\033[s", 3}, {"\033[t", 3}, {"\033[u", 3}, {"\033[v", 3},
-/* 37-40 */	{"\033[w", 3}, {"\033[x", 3}, {"\033[y", 3}, {"\033[z", 3},
-/* 41-44 */	{"\033[@", 3}, {"\033[[", 3}, {"\033[\\",3}, {"\033[]", 3},
-/* 45-48 */     {"\033[^", 3}, {"\033[_", 3}, {"\033[`", 3}, {"\033[{", 3},
-/* 49-52 */	{"\033[H", 3}, {"\033[A", 3}, {"\033[I", 3}, {"-"     , 1},
-/* 53-56 */	{"\033[D", 3}, {"\033[E", 3}, {"\033[C", 3}, {"+"     , 1},
-/* 57-60 */	{"\033[F", 3}, {"\033[B", 3}, {"\033[G", 3}, {"\033[L", 3},
-/* 61-64 */	{"\177", 1},   {"\033[J", 3}, {"\033[~", 3}, {"\033[}", 3},
-/* 65-68 */	{"", 0}      , {"", 0}      , {"", 0}      , {"", 0}      ,
-/* 69-72 */	{"", 0}      , {"", 0}      , {"", 0}      , {"", 0}      ,
-/* 73-76 */	{"", 0}      , {"", 0}      , {"", 0}      , {"", 0}      ,
-/* 77-80 */	{"", 0}      , {"", 0}      , {"", 0}      , {"", 0}      ,
-/* 81-84 */	{"", 0}      , {"", 0}      , {"", 0}      , {"", 0}      ,
-/* 85-88 */	{"", 0}      , {"", 0}      , {"", 0}      , {"", 0}      ,
-/* 89-92 */	{"", 0}      , {"", 0}      , {"", 0}      , {"", 0}      ,
-/* 93-96 */	{"", 0}      , {"", 0}      , {"", 0}      , {"", 0}
+#if defined(SUNKBD_EMULATE_ATKBD)
+
+#define	SCAN_PRESS		0x000
+#define	SCAN_RELEASE		0x080
+#define	SCAN_PREFIX_E0		0x100
+#define	SCAN_PREFIX_E1		0x200
+#define	SCAN_PREFIX_CTL		0x400
+#define	SCAN_PREFIX_SHIFT	0x800
+#define	SCAN_PREFIX		(SCAN_PREFIX_E0 | SCAN_PREFIX_E1 |	\
+				SCAN_PREFIX_CTL | SCAN_PREFIX_SHIFT)
+
+#define	NOTR	0x0	/* no translation */
+
+static const uint8_t sunkbd_trtab[] = {
+	NOTR, 0x6d, 0x78, 0x6e, 0x79, 0x3b, 0x3c, 0x44, /* 0x00 - 0x07 */
+	0x3d, 0x57, 0x3e, 0x58, 0x3f, 0x5d, 0x40, NOTR, /* 0x08 - 0x0f */
+	0x41, 0x42, 0x43, 0x38, 0x5f, 0x68, 0x5c, 0x46, /* 0x10 - 0x17 */
+	0x61, 0x6f, 0x70, 0x64, 0x62, 0x01, 0x02, 0x03, /* 0x18 - 0x1f */
+	0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, /* 0x20 - 0x27 */
+	0x0c, 0x0d, 0x29, 0x0e, 0x66, 0x77, 0x5b, 0x37, /* 0x28 - 0x2f */
+	0x7a, 0x71, 0x53, 0x74, 0x5e, 0x0f, 0x10, 0x11, /* 0x30 - 0x37 */
+	0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, /* 0x38 - 0x3f */
+	0x1a, 0x1b, 0x67, 0x6b, 0x47, 0x48, 0x49, 0x4a, /* 0x40 - 0x47 */
+	0x73, 0x72, 0x63, NOTR, 0x1d, 0x1e, 0x1f, 0x20, /* 0x48 - 0x4f */
+	0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, /* 0x50 - 0x57 */
+	0x2b, 0x1c, 0x59, 0x4b, 0x4c, 0x4d, 0x52, 0x75, /* 0x58 - 0x5f */
+	0x60, 0x76, 0x45, 0x2a, 0x2c, 0x2d, 0x2e, 0x2f, /* 0x60 - 0x67 */
+	0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, NOTR, /* 0x68 - 0x6f */
+	0x4f, 0x50, 0x51, NOTR, NOTR, NOTR, 0x6c, 0x3a, /* 0x70 - 0x77 */
+	0x69, 0x39, 0x6a, 0x65, 0x56, 0x4e, NOTR, NOTR  /* 0x78 - 0x7f */
 };
 
+#endif
+
 static int
 sunkbd_probe_keyboard(struct uart_devinfo *di)
 {
-	int tries;
+	int c, id, ltries, tries;
 
 	for (tries = 5; tries != 0; tries--) {
-		int ltries;
-
 		uart_putc(di, SKBD_CMD_RESET);
 		for (ltries = 1000; ltries != 0; ltries--) {
 			if (uart_poll(di) == SKBD_RSP_RESET)
@@ -167,17 +194,18 @@
 		}
 		if (ltries == 0)
 			continue;
+		id = -1;
 		for (ltries = 1000; ltries != 0; ltries--) {
-			if (uart_poll(di) == SKBD_RSP_IDLE)
+			switch (c = uart_poll(di)) {
+			case -1:
 				break;
+			case SKBD_RSP_IDLE:
+				return (id);
+			default:
+				id = c;
+			}
 			DELAY(1000);
 		}
-		if (ltries == 0)
-			continue;
-		uart_putc(di, SKBD_CMD_LAYOUT);
-		if (uart_getc(di) != SKBD_RSP_LAYOUT)
-			break;
-		return (uart_getc(di));
 	}
 	return (-1);
 }
@@ -211,18 +239,23 @@
 	uart_keyboard.attach = sunkbd_attach;
 	uart_add_sysdev(&uart_keyboard);
 
-	if (sunkbd_probe_keyboard(&uart_keyboard) == -1)
+	if (sunkbd_probe_keyboard(&uart_keyboard) != KB_SUN4)
 		return (0);
 
 	sc = &sunkbd_softc;
 	callout_init(&sc->sc_repeat_callout, 0);
-	sc->sc_repeat_key = -1;
-	sc->sc_repeating = 0;
+	sunkbd_clear_state(&sc->sc_kbd);
 
-	kbd_init_struct(&sc->sc_kbd, "sunkbd", KB_OTHER, 0, 0, 0, 0);
+#if defined(SUNKBD_EMULATE_ATKBD)
+	kbd_init_struct(&sc->sc_kbd, SUNKBD_DRIVER_NAME, KB_101, 0, 0, 0, 0);
+	kbd_set_maps(&sc->sc_kbd, &key_map, &accent_map, fkey_tab,
+	    sizeof(fkey_tab) / sizeof(fkey_tab[0]));
+#else
+	kbd_init_struct(&sc->sc_kbd, SUNKBD_DRIVER_NAME, KB_OTHER, 0, 0, 0, 0);
 	kbd_set_maps(&sc->sc_kbd, &keymap_sun_us_unix_kbd,
 	    &accentmap_sun_us_unix_kbd, fkey_tab,
 	    sizeof(fkey_tab) / sizeof(fkey_tab[0]));
+#endif
 	sc->sc_mode = K_XLATE;
 	kbd_register(&sc->sc_kbd);
 
@@ -283,12 +316,12 @@
 			    KBDIO_KEYINPUT, sc->sc_kbd.kb_callback.kc_arg);
 		}
 	}
-
 }
 
 static int
 sunkbd_probe(int unit, void *arg, int flags)
 {
+
 	TODO;
 	return (0);
 }
@@ -296,6 +329,7 @@
 static int
 sunkbd_init(int unit, keyboard_t **kbdp, void *arg, int flags)
 {
+
 	TODO;
 	return (0);
 }
@@ -303,6 +337,7 @@
 static int
 sunkbd_term(keyboard_t *kbd)
 {
+
 	TODO;
 	return (0);
 }
@@ -310,6 +345,7 @@
 static int
 sunkbd_intr(keyboard_t *kbd, void *arg)
 {
+
 	TODO;
 	return (0);
 }
@@ -317,6 +353,7 @@
 static int
 sunkbd_test_if(keyboard_t *kbd)
 {
+
 	TODO;
 	return (0);
 }
@@ -324,6 +361,7 @@
 static int
 sunkbd_enable(keyboard_t *kbd)
 {
+
 	KBD_ACTIVATE(kbd);
 	return (0);
 }
@@ -331,6 +369,7 @@
 static int
 sunkbd_disable(keyboard_t *kbd)
 {
+
 	KBD_DEACTIVATE(kbd);
 	return (0);
 }
@@ -338,6 +377,7 @@
 static int
 sunkbd_read(keyboard_t *kbd, int wait)
 {
+
 	TODO;
 	return (0);
 }
@@ -345,69 +385,256 @@
 static int
 sunkbd_check(keyboard_t *kbd)
 {
-	TODO;
-	return (0);
+	struct sunkbd_softc *sc;
+
+	if (!KBD_IS_ACTIVE(kbd))
+		return (FALSE);
+
+	sc = (struct sunkbd_softc *)kbd;
+
+#if defined(SUNKBD_EMULATE_ATKBD)
+	if (sc->sc_buffered_char[0])
+		return (TRUE);
+#endif
+
+	if (sc->sc_repeating)
+		return (TRUE);
+
+	if (sc->sc_uart != NULL && !uart_rx_empty(sc->sc_uart))
+		return (TRUE);
+
+	if (sc->sc_polling != 0 && sc->sc_sysdev != NULL &&
+	    (sc->sc_checked_key = uart_poll(sc->sc_sysdev)) != -1)
+		return (TRUE);
+
+	return (FALSE);
 }
 
 static u_int
 sunkbd_read_char(keyboard_t *kbd, int wait)
 {
 	struct sunkbd_softc *sc;
-	int action;
-	int key;
+	int key, release, repeated, suncode;
 
 	sc = (struct sunkbd_softc *)kbd;
+
+#if defined(SUNKBD_EMULATE_ATKBD)
+	if (sc->sc_mode == K_RAW && sc->sc_buffered_char[0]) {
+		key = sc->sc_buffered_char[0];
+		if (key & SCAN_PREFIX) {
+			sc->sc_buffered_char[0] = key & ~SCAN_PREFIX;
+			return ((key & SCAN_PREFIX_E0) ? 0xe0 : 0xe1);
+		} else {
+			sc->sc_buffered_char[0] = sc->sc_buffered_char[1];
+			sc->sc_buffered_char[1] = 0;
+			return (key);
+		}
+	}
+#endif
+
+	repeated = 0;
 	if (sc->sc_repeating) {
+		repeated = 1;
 		sc->sc_repeating = 0;
 		callout_reset(&sc->sc_repeat_callout, hz / 10,
 		    sunkbd_repeat, sc);
-		key = sc->sc_repeat_key;
-		if (sc->sc_mode == K_RAW)
-			return (key);
-		else
-			return genkbd_keyaction(kbd, key & 0x7f, key & 0x80,
-			    &sc->sc_state, &sc->sc_accents);
+		suncode = sc->sc_repeat_key;
+		goto process_code;
+	}
+
+	if (sc->sc_checked_key != -1) {
+		suncode = sc->sc_checked_key;
+		sc->sc_checked_key = -1;
+		goto process_code;
 	}
 
 	for (;;) {
-		/* XXX compose */
+ next_code:
+		if (!(sc->sc_flags & KPCOMPOSE) && (sc->sc_composed_char > 0)) {
+			key = sc->sc_composed_char;
+			sc->sc_composed_char = 0;
+			if (key > UCHAR_MAX)
+				return (ERRKEY);
+			return (key);
+		}
 
 		if (sc->sc_uart != NULL && !uart_rx_empty(sc->sc_uart)) {
-			key = uart_rx_get(sc->sc_uart);
+			suncode = uart_rx_get(sc->sc_uart);
 		} else if (sc->sc_polling != 0 && sc->sc_sysdev != NULL) {
 			if (wait)
-				key = uart_getc(sc->sc_sysdev);
-			else if ((key = uart_poll(sc->sc_sysdev)) == -1)
+				suncode = uart_getc(sc->sc_sysdev);
+			else if ((suncode = uart_poll(sc->sc_sysdev)) == -1)
 				return (NOKEY);
 		} else {
 			return (NOKEY);
 		}
 
-		switch (key) {
+		switch (suncode) {
 		case SKBD_RSP_IDLE:
 			break;
 		default:
+ process_code:
 			++kbd->kb_count;
-
-			if ((key & 0x80) == 0) {
-				callout_reset(&sc->sc_repeat_callout, hz / 2,
-				    sunkbd_repeat, sc);
-				sc->sc_repeat_key = key;
-			} else {
-				if (sc->sc_repeat_key == (key & 0x7f)) {
+			key = SKBD_KEY_CHAR(suncode);
+			release = suncode & SKBD_KEY_RELEASE;
+			if (!repeated) {
+				if (release == 0) {
+					callout_reset(&sc->sc_repeat_callout,
+					    hz / 2, sunkbd_repeat, sc);
+					sc->sc_repeat_key = suncode;
+				} else if (sc->sc_repeat_key == key) {
 					callout_stop(&sc->sc_repeat_callout);
 					sc->sc_repeat_key = -1;
 				}
 			}
 
-			if (sc->sc_mode == K_RAW)
+#if defined(SUNKBD_EMULATE_ATKBD)
+			key = sunkbd_trtab[key];
+			if (key == NOTR)
+				return (NOKEY);
+
+			if (!repeated) {
+				switch (key) {
+				case 0x1d:	/* ctrl */
+					if (release != 0)
+						sc->sc_flags &= ~CTLS;
+					else
+						sc->sc_flags |= CTLS;
+					break;
+				case 0x2a:	/* left shift */
+				case 0x36:	/* right shift */
+					if (release != 0)
+						sc->sc_flags &= ~SHIFTS;
+					else
+						sc->sc_flags |= SHIFTS;
+					break;
+				case 0x38:	/* alt */
+				case 0x5d:	/* altgr */
+					if (release != 0)
+						sc->sc_flags &= ~ALTS;
+					else
+						sc->sc_flags |= ALTS;
+					break;
+				}
+			}
+			if (sc->sc_mode == K_RAW) {
+				key = keycode2scancode(key, sc->sc_flags,
+				    release);
+				if (key & SCAN_PREFIX) {
+					if (key & SCAN_PREFIX_CTL) {
+						sc->sc_buffered_char[0] =
+						    0x1d | (key & SCAN_RELEASE);
+						sc->sc_buffered_char[1] =
+						    key & ~SCAN_PREFIX;
+					} else if (key & SCAN_PREFIX_SHIFT) {
+						sc->sc_buffered_char[0] =
+						    0x2a | (key & SCAN_RELEASE);
+						sc->sc_buffered_char[1] =
+						    key & ~SCAN_PREFIX_SHIFT;
+					} else {
+						sc->sc_buffered_char[0] =
+						    key & ~SCAN_PREFIX;
+						sc->sc_buffered_char[1] = 0;
+					}
+					return ((key & SCAN_PREFIX_E0) ?
+					    0xe0 : 0xe1);
+				}
 				return (key);
+			}
+			switch (key) {
+			case 0x5c:	/* print screen */
+				if (sc->sc_flags & ALTS)
+					key = 0x54;	/* sysrq */
+				break;
+			case 0x68:	/* pause/break */
+				if (sc->sc_flags & CTLS)
+					key = 0x6c;	/* break */
+				break;
+			}
+
+			if (sc->sc_mode == K_CODE)
+				return (key | release);
+#else
+			if (sc->sc_mode == K_RAW || sc->sc_mode == K_CODE)
+				return (suncode);
+#endif
 
-			action = genkbd_keyaction(kbd, key & 0x7f, key & 0x80,
+#if defined(SUNKBD_EMULATE_ATKBD)
+			if (key == 0x38) {	/* left alt (KP compose key) */
+#else
+			if (key == 0x13) {	/* left alt (KP compose key) */
+#endif
+				if (release != 0) {
+					if (sc->sc_flags & KPCOMPOSE) {
+						sc->sc_flags &= ~KPCOMPOSE;
+						if (sc->sc_composed_char >
+						    UCHAR_MAX)
+							sc->sc_composed_char =
+							    0;
+					}
+				} else {
+					if (!(sc->sc_flags & KPCOMPOSE)) {
+						sc->sc_flags |= KPCOMPOSE;
+						sc->sc_composed_char = 0;
+					}
+				}
+			}
+			if (sc->sc_flags & KPCOMPOSE) {
+				switch (suncode) {
+				case 0x44:			/* KP 7 */
+				case 0x45:			/* KP 8 */
+				case 0x46:			/* KP 9 */
+					sc->sc_composed_char *= 10;
+					sc->sc_composed_char += suncode - 0x3d;
+					if (sc->sc_composed_char > UCHAR_MAX)
+						return (ERRKEY);
+					goto next_code;
+				case 0x5b:			/* KP 4 */
+				case 0x5c:			/* KP 5 */
+				case 0x5d:			/* KP 6 */
+					sc->sc_composed_char *= 10;
+					sc->sc_composed_char += suncode - 0x58;
+					if (sc->sc_composed_char > UCHAR_MAX)
+						return (ERRKEY);
+					goto next_code;
+				case 0x70:			/* KP 1 */
+				case 0x71:			/* KP 2 */
+				case 0x72:			/* KP 3 */
+					sc->sc_composed_char *= 10;
+					sc->sc_composed_char += suncode - 0x6f;
+					if (sc->sc_composed_char > UCHAR_MAX)
+						return (ERRKEY);
+					goto next_code;
+				case 0x5e:			/* KP 0 */
+					sc->sc_composed_char *= 10;
+					if (sc->sc_composed_char > UCHAR_MAX)
+						return (ERRKEY);
+					goto next_code;
+
+				case 0x44 | SKBD_KEY_RELEASE:	/* KP 7 */
+				case 0x45 | SKBD_KEY_RELEASE:	/* KP 8 */
+				case 0x46 | SKBD_KEY_RELEASE:	/* KP 9 */
+				case 0x5b | SKBD_KEY_RELEASE:	/* KP 4 */
+				case 0x5c | SKBD_KEY_RELEASE:	/* KP 5 */
+				case 0x5d | SKBD_KEY_RELEASE:	/* KP 6 */
+				case 0x70 | SKBD_KEY_RELEASE:	/* KP 1 */
+				case 0x71 | SKBD_KEY_RELEASE:	/* KP 2 */
+				case 0x72 | SKBD_KEY_RELEASE:	/* KP 3 */
+				case 0x5e | SKBD_KEY_RELEASE:	/* KP 0 */
+					goto next_code;
+				default:
+					if (sc->sc_composed_char > 0) {
+						sc->sc_flags &= ~KPCOMPOSE;
+						sc->sc_composed_char = 0;
+						return (ERRKEY);
+					}
+				}
+			}
+
+			key = genkbd_keyaction(kbd, key, release,
 			    &sc->sc_state, &sc->sc_accents);
-			if (action != NOKEY)
-				return (action);
-			break;
+			if (key != NOKEY || repeated)
+				return (key);
 		}
 	}
 	return (0);
@@ -416,16 +643,23 @@
 static int
 sunkbd_check_char(keyboard_t *kbd)
 {
-	TODO;
-	return (0);
+	struct sunkbd_softc *sc;
+
+	if (!KBD_IS_ACTIVE(kbd))
+		return (FALSE);
+
+	sc = (struct sunkbd_softc *)kbd;
+	if (!(sc->sc_flags & KPCOMPOSE) && (sc->sc_composed_char > 0))
+		return (TRUE);
+
+	return (sunkbd_check(kbd));
 }
 
 static int
 sunkbd_ioctl(keyboard_t *kbd, u_long cmd, caddr_t data)
 {
 	struct sunkbd_softc *sc;
-	int error;
-	int ival;
+	int c, error, ival;
 
 	sc = (struct sunkbd_softc *)kbd;
 	error = 0;
@@ -470,18 +704,19 @@
 			error = EINVAL;
 			break;
 		}
-		if (sc->sc_uart == NULL)
+		if (sc->sc_sysdev == NULL)
 			break;
-		sc->sc_uart->sc_txdatasz = 2;
-		sc->sc_uart->sc_txbuf[0] = SKBD_CMD_SETLED;
-		sc->sc_uart->sc_txbuf[1] = 0;
+		c = 0;
 		if (*(int *)data & CLKED)
-			sc->sc_uart->sc_txbuf[1] |= SKBD_LED_CAPSLOCK;
+			c |= SKBD_LED_CAPSLOCK;
 		if (*(int *)data & NLKED)
-			sc->sc_uart->sc_txbuf[1] |= SKBD_LED_NUMLOCK;
+			c |= SKBD_LED_NUMLOCK;
 		if (*(int *)data & SLKED)
-			sc->sc_uart->sc_txbuf[1] |= SKBD_LED_SCROLLLOCK;
-		UART_TRANSMIT(sc->sc_uart);
+			c |= SKBD_LED_SCROLLLOCK;
+		mtx_lock_spin(&sc->sc_uart->sc_hwmtx);
+		sc->sc_sysdev->ops.putc(&sc->sc_sysdev->bas, SKBD_CMD_SETLED);
+		sc->sc_sysdev->ops.putc(&sc->sc_sysdev->bas, c);
+		mtx_unlock_spin(&sc->sc_uart->sc_hwmtx);
 		KBD_LED_VAL(kbd) = *(int *)data;
 		break;
 	case KDGKBSTATE:
@@ -515,6 +750,7 @@
 static int
 sunkbd_lock(keyboard_t *kbd, int lock)
 {
+
 	TODO;
 	return (0);
 }
@@ -522,12 +758,28 @@
 static void
 sunkbd_clear_state(keyboard_t *kbd)
 {
-	/* TODO; */
+	struct sunkbd_softc *sc;
+
+	sc = (struct sunkbd_softc *)kbd;
+	sc->sc_checked_key = -1;
+	sc->sc_repeat_key = -1;
+	sc->sc_accents = 0;
+	sc->sc_composed_char = 0;
+	sc->sc_flags = 0;
+	sc->sc_polling = 0;
+	sc->sc_repeating = 0;
+	sc->sc_state &= LOCK_MASK;	/* Preserve locking key state. */
+
+#if defined(SUNKBD_EMULATE_ATKBD)
+	sc->sc_buffered_char[0] = 0;
+	sc->sc_buffered_char[1] = 0;
+#endif
 }
 
 static int
 sunkbd_get_state(keyboard_t *kbd, void *buf, size_t len)
 {
+
 	TODO;
 	return (0);
 }
@@ -535,6 +787,7 @@
 static int
 sunkbd_set_state(keyboard_t *kbd, void *buf, size_t len)
 {
+
 	TODO;
 	return (0);
 }
@@ -555,6 +808,7 @@
 static void
 sunkbd_diag(keyboard_t *kbd, int level)
 {
+
 	TODO;
 }
 
@@ -571,3 +825,45 @@
 		}
 	}
 }
+
+#if defined(SUNKBD_EMULATE_ATKBD)
+static int
+keycode2scancode(int keycode, int shift, int up)
+{
+	static const int scan[] = {
+		/* KP enter, right ctrl, KP divide */
+		0x1c , 0x1d , 0x35 ,
+		/* print screen */
+		0x37 | SCAN_PREFIX_SHIFT,
+		/* right alt, home, up, page up, left, right, end */
+		0x38, 0x47, 0x48, 0x49, 0x4b, 0x4d, 0x4f,
+		/* down, page down, insert, delete */
+		0x50, 0x51, 0x52, 0x53,
+		/* pause/break (see also below) */
+		0x46,
+		/*
+		 * MS: left window, right window, menu
+		 * also Sun: left meta, right meta, compose
+		 */
+		0x5b, 0x5c, 0x5d,
+		/* Sun type 6 USB */
+		/* help, stop, again, props, undo, front, copy */
+		0x68, 0x5e, 0x5f, 0x60,	0x61, 0x62, 0x63,
+		/* open, paste, find, cut, audiomute, audiolower, audioraise */
+		0x64, 0x65, 0x66, 0x67, 0x25, 0x1f, 0x1e,
+		/* power */
+		0x20
+	};
+	int scancode;
+
+	scancode = keycode;
+	if ((keycode >= 89) && (keycode < 89 + sizeof(scan) / sizeof(scan[0])))
+	scancode = scan[keycode - 89] | SCAN_PREFIX_E0;
+	/* pause/break */
+	if ((keycode == 104) && !(shift & CTLS))
+		scancode = 0x45 | SCAN_PREFIX_E1 | SCAN_PREFIX_CTL;
+	if (shift & SHIFTS)
+		scancode &= ~SCAN_PREFIX_SHIFT;
+	return (scancode | (up ? SCAN_RELEASE : SCAN_PRESS));
+}
+#endif

==== //depot/projects/dtrace6/src/sys/dev/uart/uart_kbd_sun.h#2 (text+ko) ====

@@ -32,7 +32,7 @@
  * Agency (DARPA) and Air Force Research Laboratory, Air Force
  * Materiel Command, USAF, under agreement number F30602-01-2-0537.
  *
- * $FreeBSD: src/sys/dev/uart/uart_kbd_sun.h,v 1.2 2005/01/06 01:43:26 imp Exp $
+ * $FreeBSD: src/sys/dev/uart/uart_kbd_sun.h,v 1.2.2.1 2007/09/30 19:33:19 marius Exp $
  */
 
 /* keyboard commands (host->kbd) */
@@ -63,3 +63,6 @@
 #define	KB_SUN2		2		/* type 2 keyboard */
 #define	KB_SUN3		3		/* type 3 keyboard */
 #define	KB_SUN4		4		/* type 4/5/6 keyboard */
+
+#define	SKBD_KEY_RELEASE	0x80
+#define	SKBD_KEY_CHAR(c)	((c) & 0x7f)

==== //depot/projects/dtrace6/src/sys/i386/isa/pcvt/pcvt_ext.c#2 (text+ko) ====

@@ -44,7 +44,7 @@
  *
  * 	Last Edit-Date: [Fri Mar  8 19:57:55 2002]
  *
- * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_ext.c,v 1.35 2005/01/06 22:18:17 imp Exp $
+ * $FreeBSD: src/sys/i386/isa/pcvt/pcvt_ext.c,v 1.35.2.1 2007/09/30 06:22:13 marcus Exp $
  *
  *---------------------------------------------------------------------------*/
 
@@ -2590,26 +2590,20 @@
 		/* sleep until vt switch happened */
 		i = *(int *)data - 1;
 
-		if(i != -1
-		   && (i < 0 || i >= PCVT_NSCREENS))
+		if(i == -1)
+			i = minor(dev);
+
+		if(i < 0 || i >= PCVT_NSCREENS)
 			return EINVAL;

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 00:57:50 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 43E4F16A475; Tue,  2 Oct 2007 00:57:50 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E800816A46D
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 00:57:49 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 335A313C45D
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 00:57:49 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l920vmGD067464
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 00:57:48 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l920vmvQ067461
	for perforce@freebsd.org; Tue, 2 Oct 2007 00:57:48 GMT
	(envelope-from thompsa@freebsd.org)
Date: Tue, 2 Oct 2007 00:57:48 GMT
Message-Id: <200710020057.l920vmvQ067461@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127079 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 00:57:50 -0000

http://perforce.freebsd.org/chv.cgi?CH=127079

Change 127079 by thompsa@thompsa_heff on 2007/10/02 00:57:01

	Setting the channel for monitor/adhoc mode requires the chip to be
	disabled and enabled.

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#29 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#29 (text+ko) ====

@@ -2801,7 +2801,9 @@
 	IPW_LOCK(sc);
 	if (ic->ic_opmode == IEEE80211_M_IBSS ||
 	    ic->ic_opmode == IEEE80211_M_MONITOR) {
+		ipw_disable(sc);
 		ipw_setchannel(sc, ic->ic_curchan);
+		ipw_enable(sc);
 	}
 	IPW_UNLOCK(sc);
 }

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 02:45:55 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E660F16A41A; Tue,  2 Oct 2007 02:45:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D77EB16A418
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 02:45:53 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D35F213C4B6
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 02:45:53 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l922jrCw076030
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 02:45:53 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l922jqhk076027
	for perforce@freebsd.org; Tue, 2 Oct 2007 02:45:52 GMT
	(envelope-from thompsa@freebsd.org)
Date: Tue, 2 Oct 2007 02:45:52 GMT
Message-Id: <200710020245.l922jqhk076027@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127082 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 02:45:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=127082

Change 127082 by thompsa@thompsa_heff on 2007/10/02 02:45:04

	Whitespace.

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#30 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#30 (text+ko) ====

@@ -342,7 +342,7 @@
 	ic->ic_scan_mindwell = ipw_scan_mindwell;
 
 	bpfattach2(ifp, DLT_IEEE802_11_RADIO,
-	    sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap), 
+	    sizeof (struct ieee80211_frame) + sizeof (sc->sc_txtap),
 	    &sc->sc_drvbpf);
 
 	sc->sc_rxtap_len = sizeof sc->sc_rxtap;
@@ -2148,7 +2148,7 @@
 	error = ipw_setscanopts(sc, 0x3fff, IPW_SCAN_DO_NOT_ASSOCIATE);
 	if (error != 0)
 		goto done;
- 
+
 	/*
 	 * Setup null/bogus ssid so firmware doesn't use any previous
 	 * ssid to try and associate.  This is because the ``don't

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 02:58:08 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A7B7D16A469; Tue,  2 Oct 2007 02:58:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4CC2016A418
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 02:58:08 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 47BC313C458
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 02:58:08 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l922w84O076711
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 02:58:08 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l922w8IZ076708
	for perforce@freebsd.org; Tue, 2 Oct 2007 02:58:08 GMT
	(envelope-from thompsa@freebsd.org)
Date: Tue, 2 Oct 2007 02:58:08 GMT
Message-Id: <200710020258.l922w8IZ076708@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127083 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 02:58:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=127083

Change 127083 by thompsa@thompsa_heff on 2007/10/02 02:57:19

	Simplify ipw_media_status() rate conversion.
	
	Obtained from:	sam

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#31 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#31 (text+ko) ====

@@ -779,6 +779,18 @@
 	return (error);
 }
 
+static int
+ipw_cvtrate(int ipwrate)
+{
+	switch (ipwrate) {
+	case IPW_RATE_DS1:	return 2;
+	case IPW_RATE_DS2:	return 4;
+	case IPW_RATE_DS5:	return 11;
+	case IPW_RATE_DS11:	return 22;
+	}
+	return 0;
+}
+
 /*
  * The firmware automatically adapts the transmit speed. We report its current
  * value here.
@@ -786,20 +798,9 @@
 static void
 ipw_media_status(struct ifnet *ifp, struct ifmediareq *imr)
 {
-#define N(a)	(sizeof (a) / sizeof (a[0]))
 	struct ipw_softc *sc = ifp->if_softc;
 	struct ieee80211com *ic = &sc->sc_ic;
-	static const struct {
-		uint32_t	val;
-		int		rate;
-	} rates[] = {
-		{ IPW_RATE_DS1,   2 },
-		{ IPW_RATE_DS2,   4 },
-		{ IPW_RATE_DS5,  11 },
-		{ IPW_RATE_DS11, 22 },
-	};
-	uint32_t val;
-	int rate, i;
+	int rate;
 
 	imr->ifm_status = IFM_AVALID;
 	imr->ifm_active = IFM_IEEE80211;
@@ -807,14 +808,9 @@
 		imr->ifm_status |= IFM_ACTIVE;
 
 	/* read current transmission rate from adapter */
-	val = ipw_read_table1(sc, IPW_INFO_CURRENT_TX_RATE) & 0xf;
-
-	/* convert ipw rate to 802.11 rate */
-	for (i = 0; i < N(rates) && rates[i].val != val; i++);
-	rate = (i < N(rates)) ? rates[i].rate : 0;
+	rate = ipw_cvtrate(ipw_read_table1(sc, IPW_INFO_CURRENT_TX_RATE) & 0xf);
+	imr->ifm_active |= ieee80211_rate2media(ic, rate, IEEE80211_MODE_11B);
 
-	imr->ifm_active |= IFM_IEEE80211_11B;
-	imr->ifm_active |= ieee80211_rate2media(ic, rate, IEEE80211_MODE_11B);
 	switch (ic->ic_opmode) {
 	case IEEE80211_M_STA:
 		break;
@@ -833,7 +829,6 @@
 		/* should not get there */
 		break;
 	}
-#undef N
 }
 
 static int

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 03:31:47 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C934816A41B; Tue,  2 Oct 2007 03:31:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 66D8616A419
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 03:31:46 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A80713C468
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 03:31:46 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l923VkQj079899
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 03:31:46 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l923Vkkp079896
	for perforce@freebsd.org; Tue, 2 Oct 2007 03:31:46 GMT
	(envelope-from thompsa@freebsd.org)
Date: Tue, 2 Oct 2007 03:31:46 GMT
Message-Id: <200710020331.l923Vkkp079896@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127085 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 03:31:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=127085

Change 127085 by thompsa@thompsa_heff on 2007/10/02 03:30:52

	- Remove dead code in ipw_newstate.
	- send disassociate to the AP when going to INIT.

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#32 edit
.. //depot/projects/wifi/sys/dev/ipw/if_ipwvar.h#11 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#32 (text+ko) ====

@@ -136,9 +136,11 @@
 static int	ipw_reset(struct ipw_softc *);
 static int	ipw_load_ucode(struct ipw_softc *, const char *, int);
 static int	ipw_load_firmware(struct ipw_softc *, const char *, int);
+static int	ipw_config(struct ipw_softc *);
 static void	ipw_assoc_task(void *, int);
 static int	ipw_auth_and_assoc(struct ipw_softc *);
-static int	ipw_config(struct ipw_softc *);
+static void	ipw_disassoc_task(void *, int);
+static int	ipw_disassociate(struct ipw_softc *);
 static void	ipw_init_task(void *, int);
 static void	ipw_init(void *);
 static void	ipw_init_locked(struct ipw_softc *, int);
@@ -230,6 +232,7 @@
 	TASK_INIT(&sc->sc_init_task, 0, ipw_init_task, sc);
 	TASK_INIT(&sc->sc_scan_task, 0, ipw_scan_task, sc);
 	TASK_INIT(&sc->sc_assoc_task, 0, ipw_assoc_task, sc);
+	TASK_INIT(&sc->sc_disassoc_task, 0, ipw_disassoc_task, sc);
 	callout_init_mtx(&sc->sc_wdtimer, &sc->sc_mtx, 0);
 
 	if (pci_get_powerstate(dev) != PCI_POWERSTATE_D0) {
@@ -836,47 +839,26 @@
 {
 	struct ifnet *ifp = ic->ic_ifp;
 	struct ipw_softc *sc = ifp->if_softc;
-#if 0
-	struct ieee80211_node *ni;
-	uint32_t len, error;
-#endif
 
 	DPRINTF(("%s: %s -> %s flags 0x%x\n", __func__,
 		ieee80211_state_name[ic->ic_state],
 		ieee80211_state_name[nstate], sc->flags));
 
 	switch (nstate) {
+	case IEEE80211_S_SCAN:
 	case IEEE80211_S_RUN:
-#if 0
-		ni = ic->ic_bss;
-		DELAY(200); /* firmware needs a short delay here */
-
-		len = IEEE80211_ADDR_LEN;
-		ipw_read_table2(sc, IPW_INFO_CURRENT_BSSID, ni->ni_bssid, &len);
-		IEEE80211_ADDR_COPY(ni->ni_macaddr, ni->ni_bssid);
-
-		if (ic->ic_opmode != IEEE80211_M_HOSTAP) {
-			len = IEEE80211_NWID_LEN;
-			error = ipw_read_table2(sc, IPW_INFO_CURRENT_SSID,
-			    ni->ni_essid, &len);
-
-			if (error == 0) {
-				ni->ni_esslen = len;
-#ifdef IPW_DEBUG
-				if (ipw_debug > 0) {
-					printf("Associated to ");
-					ieee80211_print_essid(ni->ni_essid,
-					    ni->ni_esslen);
-					printf("\n");
-				}
-#endif
-			}
-		}
-#endif
 		return (*sc->sc_newstate)(ic, nstate, arg);
 
 	case IEEE80211_S_INIT:
-	case IEEE80211_S_SCAN:
+		/*
+		 * NB: don't try to do this if ipw_stop_master has
+		 *     shutdown the firmware and disabled interrupts.
+		 */
+		if (ic->ic_state == IEEE80211_S_RUN &&
+		    (sc->flags & IPW_FLAG_FW_INITED))
+			taskqueue_enqueue_fast(taskqueue_fast,
+			    &sc->sc_disassoc_task);
+
 		return sc->sc_newstate(ic, nstate, arg);
 
 	case IEEE80211_S_AUTH:
@@ -896,7 +878,6 @@
 	default:
 		break;
 	}
-
 	ic->ic_state = nstate;
 
 	return 0;
@@ -2368,7 +2349,8 @@
 }
 
 /*
- * Handler for sc_scan_task.  This is a simple wrapper around ipw_scan().
+ * Handler for sc_assoc_task.  This is a simple wrapper around
+ * ipw_auth_and_assoc().
  */
 static void
 ipw_assoc_task(void *context, int pending)
@@ -2452,7 +2434,21 @@
 	return ipw_enable(sc);		/* finally, enable adapter */
 }
 
-#if 0
+/*
+ * Handler for sc_disassoc_task.  This is a simple wrapper around
+ * ipw_disassociate().
+ */
+static void
+ipw_disassoc_task(void *context, int pending)
+{
+	struct ipw_softc *sc = context;
+	IPW_LOCK_DECL;
+
+	IPW_LOCK(sc);
+	ipw_disassociate(sc);
+	IPW_UNLOCK(sc);
+}
+
 static int
 ipw_disassociate(struct ipw_softc *sc)
 {
@@ -2460,6 +2456,8 @@
 	struct ieee80211_node *ni = ic->ic_bss;
 
 	DPRINTF(("Disassociate from %6D\n", ni->ni_bssid, ":"));
+
+	sc->flags &= ~IPW_FLAG_ASSOCIATED;
 	/*
 	 * NB: firmware currently ignores bssid parameter, but
 	 *     supply it in case this changes (follow linux driver).
@@ -2467,7 +2465,6 @@
 	return ipw_cmd(sc, IPW_CMD_DISASSOCIATE,
 		ni->ni_bssid, IEEE80211_ADDR_LEN);
 }
-#endif
 
 /*
  * Handler for sc_init_task.  This is a simple wrapper around ipw_init().

==== //depot/projects/wifi/sys/dev/ipw/if_ipwvar.h#11 (text+ko) ====

@@ -87,6 +87,7 @@
 	struct task			sc_init_task;
 	struct task			sc_scan_task;
 	struct task			sc_assoc_task;
+	struct task			sc_disassoc_task;
 	struct callout			sc_wdtimer;	/* watchdog timer */
 
 	uint32_t			flags;

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 03:54:15 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DC8D216A468; Tue,  2 Oct 2007 03:54:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 85DFD16A420
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 03:54:14 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 066BC13C45B
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 03:54:14 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l923sDte081112
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 03:54:13 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l923sDgF081109
	for perforce@freebsd.org; Tue, 2 Oct 2007 03:54:13 GMT
	(envelope-from thompsa@freebsd.org)
Date: Tue, 2 Oct 2007 03:54:13 GMT
Message-Id: <200710020354.l923sDgF081109@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127086 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 03:54:15 -0000

http://perforce.freebsd.org/chv.cgi?CH=127086

Change 127086 by thompsa@thompsa_heff on 2007/10/02 03:54:06

	Move the INITED check to when the fw command is actaully issued, and
	use the ASSOCIATED to see if we are actually connected.

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#33 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#33 (text+ko) ====

@@ -850,12 +850,7 @@
 		return (*sc->sc_newstate)(ic, nstate, arg);
 
 	case IEEE80211_S_INIT:
-		/*
-		 * NB: don't try to do this if ipw_stop_master has
-		 *     shutdown the firmware and disabled interrupts.
-		 */
-		if (ic->ic_state == IEEE80211_S_RUN &&
-		    (sc->flags & IPW_FLAG_FW_INITED))
+		if (sc->flags & IPW_FLAG_ASSOCIATED)
 			taskqueue_enqueue_fast(taskqueue_fast,
 			    &sc->sc_disassoc_task);
 
@@ -2457,6 +2452,13 @@
 
 	DPRINTF(("Disassociate from %6D\n", ni->ni_bssid, ":"));
 
+	/*
+	 * NB: don't try to do this if ipw_stop_master has
+	 *     shutdown the firmware and disabled interrupts.
+	 */
+	if (sc->flags & IPW_FLAG_FW_INITED)
+		return (0);
+
 	sc->flags &= ~IPW_FLAG_ASSOCIATED;
 	/*
 	 * NB: firmware currently ignores bssid parameter, but

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 07:04:46 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7521916A468; Tue,  2 Oct 2007 07:04:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2F4AE16A420
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 07:04:46 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1BF9013C457
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 07:04:46 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9274k7G006050
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 07:04:46 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9274keR006047
	for perforce@freebsd.org; Tue, 2 Oct 2007 07:04:46 GMT
	(envelope-from thompsa@freebsd.org)
Date: Tue, 2 Oct 2007 07:04:46 GMT
Message-Id: <200710020704.l9274keR006047@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127089 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 07:04:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=127089

Change 127089 by thompsa@thompsa_heff on 2007/10/02 07:04:15

	- Drain the taskqueue on detach or bad things happen
	- Fix check on FW_INITED

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#34 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#34 (text+ko) ====

@@ -404,6 +404,10 @@
 
 	ipw_stop(sc);
 	callout_drain(&sc->sc_wdtimer);
+	taskqueue_drain(taskqueue_fast, &sc->sc_init_task);
+	taskqueue_drain(taskqueue_fast, &sc->sc_scan_task);
+	taskqueue_drain(taskqueue_fast, &sc->sc_assoc_task);
+	taskqueue_drain(taskqueue_fast, &sc->sc_disassoc_task);
 
 	if (ifp != NULL) {
 		bpfdetach(ifp);
@@ -2456,7 +2460,7 @@
 	 * NB: don't try to do this if ipw_stop_master has
 	 *     shutdown the firmware and disabled interrupts.
 	 */
-	if (sc->flags & IPW_FLAG_FW_INITED)
+	if (!(sc->flags & IPW_FLAG_FW_INITED))
 		return (0);
 
 	sc->flags &= ~IPW_FLAG_ASSOCIATED;

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 16:46:45 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 305EC16A419; Tue,  2 Oct 2007 16:46:45 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BA3C716A41A
	for <perforce@FreeBSD.org>; Tue,  2 Oct 2007 16:46:44 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 808EB13C43E
	for <perforce@FreeBSD.org>; Tue,  2 Oct 2007 16:46:44 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l92GkiiP079474
	for <perforce@FreeBSD.org>; Tue, 2 Oct 2007 16:46:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l92GkiNT079471
	for perforce@freebsd.org; Tue, 2 Oct 2007 16:46:44 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 2 Oct 2007 16:46:44 GMT
Message-Id: <200710021646.l92GkiNT079471@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127100 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 16:46:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=127100

Change 127100 by hselasky@hselasky_laptop001 on 2007/10/02 16:46:15

	
	Dummy commit; The first step into supporting the USS820
	chip which provides a Device Controller Interface for USB.

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#1 add
.. //depot/projects/usb/src/sys/dev/usb/uss820_dci.h#1 add
.. //depot/projects/usb/src/sys/dev/usb/uss820_dci_pci.c#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 18:33:52 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DC9D916A420; Tue,  2 Oct 2007 18:33:51 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 799B516A41A
	for <perforce@FreeBSD.org>; Tue,  2 Oct 2007 18:33:51 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4D18013C447
	for <perforce@FreeBSD.org>; Tue,  2 Oct 2007 18:33:51 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l92IXpdw097086
	for <perforce@FreeBSD.org>; Tue, 2 Oct 2007 18:33:51 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l92IXpMp097083
	for perforce@freebsd.org; Tue, 2 Oct 2007 18:33:51 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Tue, 2 Oct 2007 18:33:51 GMT
Message-Id: <200710021833.l92IXpMp097083@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127105 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 18:33:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=127105

Change 127105 by hselasky@hselasky_laptop001 on 2007/10/02 18:33:05

	
	USS820 Device Control Interface driver;
	
	  - added BSD license
	  - added initial register description

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#2 edit
.. //depot/projects/usb/src/sys/dev/usb/uss820_dci.h#2 edit
.. //depot/projects/usb/src/sys/dev/usb/uss820_dci_pci.c#2 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/uss820_dci.c#2 (text+ko) ====

@@ -1,0 +1,26 @@
+/*-
+ * Copyright (c) 2007 Hans Petter Selasky <hselasky@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+

==== //depot/projects/usb/src/sys/dev/usb/uss820_dci.h#2 (text+ko) ====

@@ -1,0 +1,251 @@
+/*-
+ * Copyright (c) 2007 Hans Petter Selasky <hselasky@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef _USS820_DCI_H_
+#define	_USS820_DCI_H_
+
+#define	USS820_TXDAT 0x00 /* Transmit FIFO data */
+
+#define	USS820_TXCNTL 0x01 /* Transmit FIFO byte count low */
+#define	USS820_TXCNTL_MASK 0xFF
+
+#define	USS820_TXCNTH 0x02 /* Transmit FIFO byte count high */
+#define	USS820_TXCNTH_MASK 0x03
+#define	USS820_TXCNTH_UNUSED 0xFC
+
+#define	USS820_TXCON 0x03 /* USB transmit FIFO control */
+#define	USS820_TXCON_REVRP 0x01
+#define	USS820_TXCON_ADVRM 0x02
+#define	USS820_TXCON_ATM 0x04 /* Automatic Transmit Management */
+#define	USS820_TXCON_TXISO 0x08 /* Transmit Isochronous Data */
+#define	USS820_TXCON_UNUSED 0x10
+#define	USS820_TXCON_FFSZ_16_64 0x00
+#define	USS820_TXCON_FFSZ_64_256 0x20
+#define	USS820_TXCON_FFSZ_8_512 0x40
+#define	USS820_TXCON_FFSZ_32_1024 0x60
+#define	USS820_TXCON_FFSZ_MASK 0x60
+#define	USS820_TXCON_TXCLR 0x80 /* Transmit FIFO clear */
+
+#define	USS820_TXFLG 0x04 /* Transmit FIFO flag (Read Only) */
+#define	USS820_TXFLG_TXOVF 0x01 /* TX overrun */
+#define	USS820_TXFLG_TXURF 0x02 /* TX underrun */
+#define	USS820_TXFLG_TXFULL 0x04 /* TX full */
+#define	USS820_TXFLG_TXEMP 0x08 /* TX empty */
+#define	USS820_TXFLG_UNUSED 0x30
+#define	USS820_TXFLG_TXFIF0 0x40
+#define	USS820_TXFLG_TXFIF1 0x80
+
+#define	USS820_RXDAT 0x05 /* Receive FIFO data */
+
+#define	USS820_RXCNTL 0x06 /* Receive FIFO byte count low */
+#define	USS820_RXCNTL_MASK 0xFF
+
+#define	USS820_RXCNTH 0x07 /* Receive FIFO byte count high */
+#define	USS820_RXCNTH_MASK 0x03
+#define	USS820_RXCNTH_UNUSED 0xFC
+
+#define	USS820_RXCON 0x08 /* Receive FIFO control */
+#define	USS820_RXCON_REVWP 0x01
+#define	USS820_RXCON_ADVWM 0x02
+#define	USS820_RXCON_ARM 0x04 /* Auto Receive Management */
+#define	USS820_RXCON_RXISO 0x08 /* Receive Isochronous Data */
+#define	USS820_RXCON_RXFFRC 0x10 /* FIFO Read Complete */
+#define	USS820_RXCON_FFSZ_16_64 0x00
+#define	USS820_RXCON_FFSZ_64_256 0x20
+#define	USS820_RXCON_FFSZ_8_512 0x40
+#define	USS820_RXCON_FFSZ_32_1024 0x60
+#define	USS820_RXCON_RXCLR 0x80 /* Receive FIFO clear */
+
+#define	USS820_RXFLG 0x09 /* Receive FIFO flag (Read Only) */
+#define	USS820_RXFLG_RXOVF 0x01 /* RX overflow */
+#define	USS820_RXFLG_RXURF 0x02 /* RX underflow */
+#define	USS820_RXFLG_RXFULL 0x04 /* RX full */
+#define	USS820_RXFLG_RXEMP 0x08 /* RX empty */
+#define	USS820_RXFLG_RXFLUSH 0x10 /* RX flush */
+#define	USS820_RXFLG_UNUSED 0x20
+#define	USS820_RXFLG_RXFIF0 0x40
+#define	USS820_RXFLG_RXFIF1 0x80
+
+#define	USS820_EPINDEX 0x0a /* Endpoint index selection */
+#define	USS820_EPINDEX_MASK 0x07
+#define	USS820_EPINDEX_UNUSED 0xF8
+
+#define	USS820_EPCON 0x0b /* Endpoint control */
+#define	USS820_EPCON_TXEPEN 0x01 /* Transmit Endpoint Enable */
+#define	USS820_EPCON_TXOE 0x02 /* Transmit Output Enable */
+#define	USS820_EPCON_RXEPEN 0x04 /* Receive Endpoint Enable */
+#define	USS820_EPCON_RXIE 0x08 /* Receive Input Enable */
+#define	USS820_EPCON_RXSPM 0x10 /* Receive Single-Packet Mode */
+#define	USS820_EPCON_CTLEP 0x20 /* Control Endpoint */
+#define	USS820_EPCON_TXSTL 0x40 /* Stall Transmit Endpoint */
+#define	USS820_EPCON_RXSTL 0x80 /* Stall Receive Endpoint */
+
+#define	USS820_TXSTAT 0x0c /* Transmit status */
+#define	USS820_TXSTAT_TXACK 0x01 /* Transmit Acknowledge */
+#define	USS820_TXSTAT_TXERR 0x02 /* Transmit Error */
+#define	USS820_TXSTAT_TXVOID 0x04 /* Transmit Void */
+#define	USS820_TXSTAT_TXSOVW 0x08 /* Transmit Data Sequence Overwrite Bit */
+#define	USS820_TXSTAT_TXFLUSH 0x10 /* Transmit FIFO Packet Flushed */
+#define	USS820_TXSTAT_TXNAKE 0x20 /* Transmit NAK Mode Enable */
+#define	USS820_TXSTAT_TXDSAM 0x40 /* Transmit Data-Set-Available Mode */
+#define	USS820_TXSTAT_TXSEQ 0x80 /* Transmitter Current Sequence Bit */
+
+#define	USS820_RXSTAT 0x0d /* Receive status */
+#define	USS820_RXSTAT_RXACK 0x01 /* Receive Acknowledge */
+#define	USS820_RXSTAT_RXERR 0x02 /* Receive Error */
+#define	USS820_RXSTAT_RXVOID 0x04 /* Receive Void */
+#define	USS820_RXSTAT_RXSOVW 0x08 /* Receive Data Sequence Overwrite Bit */
+#define	USS820_RXSTAT_EDOVW 0x10 /* End Overwrite Flag */
+#define	USS820_RXSTAT_STOVW 0x20 /* Start Overwrite Flag */
+#define	USS820_RXSTAT_RXSETUP 0x40 /* Received SETUP token */
+#define	USS820_RXSTAT_RXSEQ 0x80 /* Receiver Endpoint Sequence Bit */
+
+#define	USS820_SOFL 0x0e /* Start Of Frame counter low */
+#define	USS820_SOFL_MASK 0xFF
+
+#define	USS820_SOFH 0x0f /* Start Of Frame counter high */
+#define	USS820_SOFH_MASK 0x07
+#define	USS820_SOFH_SOFDIS 0x08 /* SOF Pin Output Disable */
+#define	USS820_SOFH_FTLOCK 0x10 /* Frame Timer Lock */
+#define	USS820_SOFH_SOFIE 0x20 /* SOF Interrupt Enable */
+#define	USS820_SOFH_ASOF 0x40 /* Any Start of Frame */
+#define	USS820_SOFH_SOFACK 0x80 /* SOF Token Received Without Error */
+
+#define	USS820_FADDR 0x10 /* Function Address */
+#define	USS820_FADDR_MASK 0x7F
+#define	USS820_FADDR_UNUSED 0x80
+
+#define	USS820_SCR 0x11 /* System Control */
+#define	USS820_SCR_UNUSED 0x01
+#define	USS820_SCR_T_IRQ 0x02 /* Global Interrupt Enable */
+#define	USS820_SCR_IRQLVL 0x04 /* Interrupt Mode */
+#define	USS820_SCR_SRESET 0x08 /* Software reset */
+#define	USS820_SCR_IE_RESET 0x10 /* Enable Reset Interrupt */
+#define	USS820_SCR_IE_SUSP 0x20 /* Enable Suspend Interrupt */
+#define	USS820_SCR_RWUPE 0x40 /* Enable Remote Wake-Up Feature */
+#define	USS820_SCR_IRQPOL 0x80 /* IRQ polarity */
+
+#define	USS820_SSR 0x12 /* System Status */
+#define	USS820_SSR_RESET 0x01 /* Reset Condition Detected on USB cable */
+#define	USS820_SSR_SUSPEND 0x02 /* Suspend Detected */
+#define	USS820_SSR_RESUME 0x04 /* Resume Detected */
+#define	USS820_SSR_SUSPDIS 0x08 /* Suspend Disable */
+#define	USS820_SSR_SUSPPO 0x10 /* Suspend Power Off */
+#define	USS820_SSR_UNUSED 0xE0
+
+#define	USS820_UNK0 0x13 /* Unknown */
+#define	USS820_UNK0_UNUSED 0xFF
+
+#define	USS820_SBI 0x14 /* Serial bus interrupt low */
+#define	USS820_SBI_FTXD0 0x01 /* Function Transmit Done, EP 0 */
+#define	USS820_SBI_FRXD0 0x02 /* Function Receive Done, EP 0 */
+#define	USS820_SBI_FTXD1 0x04
+#define	USS820_SBI_FRXD1 0x08
+#define	USS820_SBI_FTXD2 0x10
+#define	USS820_SBI_FRXD2 0x20
+#define	USS820_SBI_FTXD3 0x40
+#define	USS820_SBI_FRXD3 0x80
+
+#define	USS820_SBI1 0x15 /* Serial bus interrupt high */
+#define	USS820_SBI1_FTXD4 0x01
+#define	USS820_SBI1_FRXD4 0x02
+#define	USS820_SBI1_FTXD5 0x04
+#define	USS820_SBI1_FRXD5 0x08
+#define	USS820_SBI1_FTXD6 0x10
+#define	USS820_SBI1_FRXD6 0x20
+#define	USS820_SBI1_FTXD7 0x40
+#define	USS820_SBI1_FRXD7 0x80
+
+#define	USS820_SBIE 0x16 /* Serial bus interrupt enable low */
+#define	USS820_SBIE_FTXIE0 0x01
+#define	USS820_SBIE_FRXIE0 0x02
+#define	USS820_SBIE_FTXIE1 0x04
+#define	USS820_SBIE_FRXIE1 0x08
+#define	USS820_SBIE_FTXIE2 0x10
+#define	USS820_SBIE_FRXIE2 0x20
+#define	USS820_SBIE_FTXIE3 0x40
+#define	USS820_SBIE_FRXIE3 0x80
+
+#define	USS820_SBIE1 0x17 /* Serial bus interrupt enable high */
+#define	USS820_SBIE1_FTXIE4 0x01
+#define	USS820_SBIE1_FRXIE4 0x02
+#define	USS820_SBIE1_FTXIE5 0x04
+#define	USS820_SBIE1_FRXIE5 0x08
+#define	USS820_SBIE1_FTXIE6 0x10
+#define	USS820_SBIE1_FRXIE6 0x20
+#define	USS820_SBIE1_FTXIE7 0x40
+#define	USS820_SBIE1_FRXIE7 0x80
+
+#define	USS820_REV 0x18 /* Hardware revision */
+#define	USS820_REV_MIN 0x0F
+#define	USS820_REV_MAJ 0xF0
+
+#define	USS820_LOCK 0x19 /* Suspend power-off locking */
+#define	USS820_LOCK_UNLOCKED 0x01
+#define	USS820_LOCK_UNUSED 0xFE
+
+#define	USS820_PEND 0x1a /* Pend hardware status update */
+#define	USS820_PEND_PEND 0x01
+#define	USS820_PEND_UNUSED 0xFE
+
+#define	USS820_SCRATCH 0x1b /* Scratch firmware information */
+#define	USS820_SCRATCH_MASK 0x7F
+#define	USS820_SCRATCH_IE_RESUME 0x80 /* Enable Resume Interrupt */
+
+#define	USS820_MCSR 0x1c /* Miscellaneous control and status */
+#define	USS820_MCSR_DPEN 0x01 /* DPLS Pull-Up Enable */
+#define	USS820_MCSR_SUSPLOE 0x02 /* Suspend Lock Out Enable */
+#define	USS820_MCSR_BDFEAT 0x04 /* Board Feature Enable */
+#define	USS820_MCSR_FEAT 0x08 /* Feature Enable */
+#define	USS820_MCSR_PKGID 0x10 /* Package Identification */
+#define	USS820_MCSR_SUSPS 0x20 /* Suspend Status */
+#define	USS820_MCSR_INIT 0x40 /* Device Initialized */
+#define	USS820_MCSR_RWUPR 0x80 /* Remote Wakeup-Up Remember */
+
+#define	USS820_DSAV 0x1d /* Data set available low (Read Only) */
+#define	USS820_DSAV_TXAV0 0x01
+#define	USS820_DSAV_RXAV0 0x02
+#define	USS820_DSAV_TXAV1 0x04
+#define	USS820_DSAV_RXAV1 0x08
+#define	USS820_DSAV_TXAV2 0x10
+#define	USS820_DSAV_RXAV2 0x20
+#define	USS820_DSAV_TXAV3 0x40
+#define	USS820_DSAV_RXAV3 0x80
+
+#define	USS820_DSAV1 0x1e /* Data set available high */
+#define	USS820_DSAV1_TXAV4 0x01
+#define	USS820_DSAV1_RXAV4 0x02
+#define	USS820_DSAV1_TXAV5 0x04
+#define	USS820_DSAV1_RXAV5 0x08
+#define	USS820_DSAV1_TXAV6 0x10
+#define	USS820_DSAV1_RXAV6 0x20
+#define	USS820_DSAV1_TXAV7 0x40
+#define	USS820_DSAV1_RXAV7 0x80
+
+#define	USS820_UNK1 0x1f /* Unknown */
+#define	USS820_UNK1_UNKNOWN 0xFF
+
+#endif /* _USS820_DCI_H_ */

==== //depot/projects/usb/src/sys/dev/usb/uss820_dci_pci.c#2 (text+ko) ====

@@ -1,0 +1,26 @@
+/*-
+ * Copyright (c) 2007 Hans Petter Selasky <hselasky@freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 20:34:10 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E4EDA16A418; Tue,  2 Oct 2007 20:34:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7422D16A419
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 20:34:09 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5860013C458
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 20:34:09 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l92KY99f006282
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 20:34:09 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l92KY9sq006279
	for perforce@freebsd.org; Tue, 2 Oct 2007 20:34:09 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 2 Oct 2007 20:34:09 GMT
Message-Id: <200710022034.l92KY9sq006279@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127109 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 20:34:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=127109

Change 127109 by kmacy@kmacy_home:ethng on 2007/10/02 20:33:49

	fix i386 build errors

Affected files ...

.. //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#10 edit
.. //depot/projects/ethng/src/sys/i386/i386/intr_machdep.c#3 edit
.. //depot/projects/ethng/src/sys/i386/i386/local_apic.c#3 edit
.. //depot/projects/ethng/src/sys/i386/include/intr_machdep.h#3 edit
.. //depot/projects/ethng/src/sys/i386/pci/pci_cfgreg.c#2 edit
.. //depot/projects/ethng/src/sys/sys/mbuf.h#8 edit

Differences ...

==== //depot/projects/ethng/src/sys/dev/cxgb/sys/uipc_mvec.c#10 (text+ko) ====

@@ -40,8 +40,13 @@
 #include <sys/ktr.h>
 #include <sys/sf_buf.h>
 
+#include <vm/vm.h>
+#include <vm/pmap.h>
+
 #include <machine/bus.h>
 
+
+
 #ifdef CONFIG_DEFINED
 #include <cxgb_include.h>
 #include <sys/mvec.h>

==== //depot/projects/ethng/src/sys/i386/i386/intr_machdep.c#3 (text+ko) ====

@@ -47,6 +47,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/proc.h>
+#include <sys/smp.h>
 #include <sys/syslog.h>
 #include <sys/systm.h>
 #include <sys/sx.h>
@@ -560,7 +561,7 @@
 	} while (!(intr_cpus & (1 << current_cpu)));
 }
 
-+/* Attempt to bind the specified IRQ to the specified CPU. */
+/* Attempt to bind the specified IRQ to the specified CPU. */
 int
 intr_bind(u_int vector, u_char cpu)
 {

==== //depot/projects/ethng/src/sys/i386/i386/local_apic.c#3 (text+ko) ====

@@ -45,6 +45,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/pcpu.h>
+#include <sys/proc.h>
 #include <sys/smp.h>
 
 #include <vm/vm.h>

==== //depot/projects/ethng/src/sys/i386/include/intr_machdep.h#3 (text+ko) ====

@@ -130,7 +130,7 @@
 void	elcr_write_trigger(u_int irq, enum intr_trigger trigger);
 #ifdef SMP
 void	intr_add_cpu(u_int cpu);
-int	intr_bind(int vector, u_int cpu);
+int	intr_bind(u_int vector, u_char cpu);
 #endif
 int	intr_add_handler(const char *name, int vector, driver_filter_t filter,
     driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep);

==== //depot/projects/ethng/src/sys/i386/pci/pci_cfgreg.c#2 (text+ko) ====

@@ -38,6 +38,7 @@
 #include <sys/lock.h>
 #include <sys/mutex.h>
 #include <sys/malloc.h>
+#include <sys/proc.h>
 #include <sys/queue.h>
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>

==== //depot/projects/ethng/src/sys/sys/mbuf.h#8 (text+ko) ====

@@ -402,7 +402,7 @@
 static __inline struct mbuf	*m_getclr(int how, short type);	/* XXX */
 static __inline struct mbuf	*m_free(struct mbuf *m);
 static __inline void		 m_clget(struct mbuf *m, int how);
-static __inline void		*m_cljget(struct mbuf *m, int how, uma_zone_t zone);
+static __inline void		*m_cljget(struct mbuf *m, int how, int size);
 static __inline void		 m_chtype(struct mbuf *m, short new_type);
 void				 mb_free_ext(struct mbuf *);
 static __inline struct mbuf	*m_last(struct mbuf *m);
@@ -574,15 +574,18 @@
  * the cluster attached to it and the return value can be safely ignored.
  * For size it takes MCLBYTES, MJUMPAGESIZE, MJUM9BYTES, MJUM16BYTES.
  */
+
 static __inline void *
-m_cljget(struct mbuf *m, int how, uma_zone_t zone)
+m_cljget(struct mbuf *m, int how, int size)
 {
+	uma_zone_t zone;
 
 	if (m && m->m_flags & M_EXT)
 		printf("%s: %p mbuf already has cluster\n", __func__, m);
 	if (m != NULL)
 		m->m_ext.ext_buf = NULL;
 
+	zone = m_getzone(size);
 	return (uma_zalloc_arg(zone, m, how));
 }
 

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 22:12:02 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 03BD116A481; Tue,  2 Oct 2007 22:12:01 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9AB7C16A417
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 22:12:01 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 88EB113C468
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 22:12:01 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l92MC1CD022860
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 22:12:01 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l92MC12K022856
	for perforce@freebsd.org; Tue, 2 Oct 2007 22:12:01 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 2 Oct 2007 22:12:01 GMT
Message-Id: <200710022212.l92MC12K022856@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127112 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 22:12:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=127112

Change 127112 by kmacy@kmacy_home:ethng on 2007/10/02 22:11:01

	fix remaining breakage caused by critical_{enter,exit} being moved inline in
	proc.h

Affected files ...

.. //depot/projects/ethng/src/sys/dev/mcd/mcd.c#2 edit
.. //depot/projects/ethng/src/sys/dev/rc/rc.c#2 edit
.. //depot/projects/ethng/src/sys/dev/scd/scd.c#2 edit

Differences ...

==== //depot/projects/ethng/src/sys/dev/mcd/mcd.c#2 (text+ko) ====

@@ -58,8 +58,10 @@
 
 #include <machine/bus.h>
 #include <machine/resource.h>
+#include <sys/proc.h>
 #include <sys/rman.h>
 
+
 #include <isa/isavar.h>
   
 #include <dev/mcd/mcdreg.h>

==== //depot/projects/ethng/src/sys/dev/rc/rc.c#2 (text+ko) ====

@@ -50,6 +50,7 @@
 #include <sys/tty.h>
 #include <machine/bus.h>
 #include <machine/resource.h>
+#include <sys/proc.h>
 #include <sys/rman.h>
 
 #include <dev/ic/cd180.h>

==== //depot/projects/ethng/src/sys/dev/scd/scd.c#2 (text+ko) ====

@@ -60,6 +60,7 @@
 
 #include <machine/bus.h>
 #include <machine/resource.h>
+#include <sys/proc.h>
 #include <sys/rman.h>
 
 #include <isa/isavar.h>

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 22:34:28 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A308D16A41B; Tue,  2 Oct 2007 22:34:28 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5DE6616A419
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 22:34:28 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4ED3F13C465
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 22:34:28 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l92MYSUp024171
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 22:34:28 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l92MYSKQ024168
	for perforce@freebsd.org; Tue, 2 Oct 2007 22:34:28 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 2 Oct 2007 22:34:28 GMT
Message-Id: <200710022234.l92MYSKQ024168@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127114 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 22:34:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=127114

Change 127114 by kmacy@kmacy_home:ethng on 2007/10/02 22:33:57

	compile in cxgb_support.c

Affected files ...

.. //depot/projects/ethng/src/sys/modules/cxgb/Makefile#8 edit

Differences ...

==== //depot/projects/ethng/src/sys/modules/cxgb/Makefile#8 (text+ko) ====

@@ -8,10 +8,11 @@
 SRCS+=	cxgb_xgmac.c cxgb_vsc7323.c cxgb_t3_hw.c cxgb_main.c 
 SRCS+=  cxgb_sge.c cxgb_lro.c cxgb_offload.c cxgb_l2t.c
 SRCS+=	device_if.h bus_if.h pci_if.h opt_zero.h opt_sched.h
-SRCS+=	uipc_mvec.c cxgb_multiq.c
+SRCS+=	uipc_mvec.c cxgb_multiq.c cxgb_support.c
 
 CFLAGS+= -DCONFIG_CHELSIO_T3_CORE -g -DCONFIG_DEFINED -DDEFAULT_JUMBO -I${CXGB} -DSMP
 CFLAGS+= -DIFNET_MULTIQUEUE
+
 #CFLAGS+= -DDISABLE_MBUF_IOVEC
 #CFLAGS+= -DDEBUG -DDEBUG_PRINT
 #CFLAGS+= -DINVARIANT_SUPPORT -DINVARIANTS 

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 22:36:33 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6C20216A469; Tue,  2 Oct 2007 22:36:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 63BD116A46D
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 22:36:32 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D08513C45A
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 22:36:32 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l92MaWdO024282
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 22:36:32 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l92MaWOp024279
	for perforce@freebsd.org; Tue, 2 Oct 2007 22:36:32 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 2 Oct 2007 22:36:32 GMT
Message-Id: <200710022236.l92MaWOp024279@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127115 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 22:36:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=127115

Change 127115 by kmacy@kmacy_home:ethng on 2007/10/02 22:35:30

	compile in cxgb_support.c when compiled statically

Affected files ...

.. //depot/projects/ethng/src/sys/conf/files#5 edit

Differences ...

==== //depot/projects/ethng/src/sys/conf/files#5 (text+ko) ====

@@ -522,6 +522,7 @@
 dev/cxgb/common/cxgb_xgmac.c	optional cxgb pci
 dev/cxgb/common/cxgb_t3_hw.c	optional cxgb pci
 dev/cxgb/sys/uipc_mvec.c	optional cxgb pci
+dev/cxgb/sys/cxgb_support.c	optional cxgb pci
 dev/cy/cy.c			optional cy
 dev/cy/cy_isa.c			optional cy isa
 dev/cy/cy_pci.c			optional cy pci

From owner-p4-projects@FreeBSD.ORG  Tue Oct  2 22:53:58 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id A2C6516A41A; Tue,  2 Oct 2007 22:53:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3F03816A418
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 22:53:58 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2F69613C458
	for <perforce@freebsd.org>; Tue,  2 Oct 2007 22:53:58 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l92Mrw2M025262
	for <perforce@freebsd.org>; Tue, 2 Oct 2007 22:53:58 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l92MrqTj025259
	for perforce@freebsd.org; Tue, 2 Oct 2007 22:53:52 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 2 Oct 2007 22:53:52 GMT
Message-Id: <200710022253.l92MrqTj025259@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127116 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 02 Oct 2007 22:53:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=127116

Change 127116 by kmacy@kmacy:storage:toestack on 2007/10/02 22:53:20

	IFC #127115

Affected files ...

.. //depot/projects/toestack/ObsoleteFiles.inc#2 integrate
.. //depot/projects/toestack/UPDATING#2 integrate
.. //depot/projects/toestack/bin/getfacl/getfacl.c#2 integrate
.. //depot/projects/toestack/bin/ps/print.c#2 integrate
.. //depot/projects/toestack/bin/ps/ps.c#2 integrate
.. //depot/projects/toestack/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/toestack/etc/defaults/rc.conf#3 integrate
.. //depot/projects/toestack/etc/mtree/BSD.include.dist#2 integrate
.. //depot/projects/toestack/etc/rc.d/Makefile#3 integrate
.. //depot/projects/toestack/etc/rc.d/nscd#2 integrate
.. //depot/projects/toestack/etc/services#3 integrate
.. //depot/projects/toestack/gnu/usr.bin/binutils/ld/Makefile#2 integrate
.. //depot/projects/toestack/gnu/usr.bin/binutils/ld/genscripts.sh#2 integrate
.. //depot/projects/toestack/gnu/usr.bin/cc/cc_int/Makefile#2 integrate
.. //depot/projects/toestack/gnu/usr.bin/man/man/man.c#2 integrate
.. //depot/projects/toestack/gnu/usr.bin/texinfo/info/Makefile#2 integrate
.. //depot/projects/toestack/include/Makefile#2 integrate
.. //depot/projects/toestack/lib/libarchive/archive_read.3#2 integrate
.. //depot/projects/toestack/lib/libarchive/archive_write_disk.c#2 integrate
.. //depot/projects/toestack/lib/libarchive/test/test_write_disk.c#2 integrate
.. //depot/projects/toestack/lib/libc/gen/Makefile.inc#2 integrate
.. //depot/projects/toestack/lib/libc/net/sctp_connectx.3#2 integrate
.. //depot/projects/toestack/lib/libc/net/sctp_opt_info.3#2 integrate
.. //depot/projects/toestack/lib/libc/net/sctp_recvmsg.3#2 integrate
.. //depot/projects/toestack/lib/libc/net/sctp_send.3#2 integrate
.. //depot/projects/toestack/lib/libc/net/sctp_sendmsg.3#2 integrate
.. //depot/projects/toestack/lib/libc/rpc/auth_time.c#2 integrate
.. //depot/projects/toestack/lib/libc/rpc/getnetconfig.c#2 integrate
.. //depot/projects/toestack/lib/libc/rpc/getnetpath.c#2 integrate
.. //depot/projects/toestack/lib/libc/rpc/rpc_generic.c#2 integrate
.. //depot/projects/toestack/lib/libc/rpc/rpcb_clnt.c#2 integrate
.. //depot/projects/toestack/lib/libc/stdlib/getenv.c#2 integrate
.. //depot/projects/toestack/lib/libc/sys/Makefile.inc#2 integrate
.. //depot/projects/toestack/lib/libc/sys/minherit.2#2 integrate
.. //depot/projects/toestack/lib/libc/sys/ntp_adjtime.2#2 integrate
.. //depot/projects/toestack/lib/libc/sys/ntp_gettime.2#2 delete
.. //depot/projects/toestack/lib/libdisk/open_disk.c#2 integrate
.. //depot/projects/toestack/lib/libdisk/open_ia64_disk.c#2 integrate
.. //depot/projects/toestack/lib/libkvm/kvm_proc.c#2 integrate
.. //depot/projects/toestack/lib/libutil/expand_number.3#3 integrate
.. //depot/projects/toestack/lib/libutil/flopen.3#2 integrate
.. //depot/projects/toestack/lib/libutil/humanize_number.3#3 integrate
.. //depot/projects/toestack/lib/libutil/kld.3#2 integrate
.. //depot/projects/toestack/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate
.. //depot/projects/toestack/release/doc/en_US.ISO8859-1/relnotes/article.sgml#4 integrate
.. //depot/projects/toestack/release/doc/share/misc/dev.archlist.txt#4 integrate
.. //depot/projects/toestack/sbin/dhclient/dhclient.8#2 integrate
.. //depot/projects/toestack/sbin/fsck_ffs/Makefile#2 integrate
.. //depot/projects/toestack/sbin/fsck_ffs/main.c#2 integrate
.. //depot/projects/toestack/sbin/geom/class/Makefile#2 integrate
.. //depot/projects/toestack/sbin/geom/class/virstor/Makefile#1 branch
.. //depot/projects/toestack/sbin/geom/class/virstor/geom_virstor.c#1 branch
.. //depot/projects/toestack/sbin/geom/class/virstor/gvirstor.8#1 branch
.. //depot/projects/toestack/sbin/geom/core/geom.8#2 integrate
.. //depot/projects/toestack/sbin/geom/core/geom.c#2 integrate
.. //depot/projects/toestack/sbin/ipfw/ipfw2.c#2 integrate
.. //depot/projects/toestack/sbin/quotacheck/preen.c#2 integrate
.. //depot/projects/toestack/sbin/quotacheck/quotacheck.c#2 integrate
.. //depot/projects/toestack/sbin/tunefs/tunefs.8#2 integrate
.. //depot/projects/toestack/share/man/man4/cxgb.4#2 integrate
.. //depot/projects/toestack/share/man/man4/gem.4#2 integrate
.. //depot/projects/toestack/share/man/man4/if_bridge.4#2 integrate
.. //depot/projects/toestack/share/man/man4/sctp.4#2 integrate
.. //depot/projects/toestack/share/man/man4/snd_emu10kx.4#2 integrate
.. //depot/projects/toestack/share/man/man9/DECLARE_GEOM_CLASS.9#2 integrate
.. //depot/projects/toestack/share/man/man9/crypto.9#2 integrate
.. //depot/projects/toestack/share/man/man9/sleepqueue.9#2 integrate
.. //depot/projects/toestack/share/misc/committers-ports.dot#2 integrate
.. //depot/projects/toestack/share/misc/committers-src.dot#2 integrate
.. //depot/projects/toestack/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/toestack/sys/amd64/amd64/uma_machdep.c#2 integrate
.. //depot/projects/toestack/sys/amd64/conf/MULTIQ#5 integrate
.. //depot/projects/toestack/sys/amd64/include/smp.h#2 integrate
.. //depot/projects/toestack/sys/amd64/include/vmparam.h#3 integrate
.. //depot/projects/toestack/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/toestack/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/toestack/sys/amd64/linux32/linux32_proto.h#2 integrate
.. //depot/projects/toestack/sys/amd64/linux32/linux32_syscall.h#2 integrate
.. //depot/projects/toestack/sys/amd64/linux32/linux32_sysent.c#2 integrate
.. //depot/projects/toestack/sys/amd64/linux32/linux32_sysvec.c#2 integrate
.. //depot/projects/toestack/sys/amd64/linux32/syscalls.master#2 integrate
.. //depot/projects/toestack/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/toestack/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/toestack/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/toestack/sys/arm/at91/at91_mci.c#2 integrate
.. //depot/projects/toestack/sys/arm/at91/at91_pmc.c#2 integrate
.. //depot/projects/toestack/sys/arm/conf/AVILA#2 integrate
.. //depot/projects/toestack/sys/arm/conf/CRB#2 integrate
.. //depot/projects/toestack/sys/arm/include/asmacros.h#2 integrate
.. //depot/projects/toestack/sys/arm/include/vmparam.h#2 integrate
.. //depot/projects/toestack/sys/arm/sa11x0/uart_dev_sa1110.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i8134x/files.crb#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i8134x/i81342.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i8134x/i81342reg.h#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch
.. //depot/projects/toestack/sys/arm/xscale/i8134x/iq81342reg.h#1 branch
.. //depot/projects/toestack/sys/arm/xscale/i8134x/iq81342var.h#1 branch
.. //depot/projects/toestack/sys/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate
.. //depot/projects/toestack/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/toestack/sys/compat/ia32/ia32_sysvec.c#2 integrate
.. //depot/projects/toestack/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/toestack/sys/conf/files#3 integrate
.. //depot/projects/toestack/sys/conf/options#3 integrate
.. //depot/projects/toestack/sys/contrib/dev/acpica/evmisc.c#2 integrate
.. //depot/projects/toestack/sys/contrib/dev/acpica/evxface.c#2 integrate
.. //depot/projects/toestack/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch
.. //depot/projects/toestack/sys/contrib/dev/npe/LICENSE#1 branch
.. //depot/projects/toestack/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/toestack/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/toestack/sys/dev/acpica/acpi.c#2 integrate
.. //depot/projects/toestack/sys/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/toestack/sys/dev/ath/ath_rate/sample/sample.c#2 integrate
.. //depot/projects/toestack/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_adapter.h#6 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_include.h#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_main.c#7 edit
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_multiq.c#4 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_osdep.h#5 integrate
.. //depot/projects/toestack/sys/dev/cxgb/cxgb_sge.c#4 edit
.. //depot/projects/toestack/sys/dev/cxgb/sys/cxgb_support.c#1 branch
.. //depot/projects/toestack/sys/dev/cxgb/sys/mvec.h#3 integrate
.. //depot/projects/toestack/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate
.. //depot/projects/toestack/sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/toestack/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/gem/if_gemreg.h#2 integrate
.. //depot/projects/toestack/sys/dev/gem/if_gemvar.h#2 integrate
.. //depot/projects/toestack/sys/dev/mcd/mcd.c#2 integrate
.. //depot/projects/toestack/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/toestack/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/toestack/sys/dev/nfe/if_nfe.c#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pcireg.h#2 integrate
.. //depot/projects/toestack/sys/dev/ral/rt2560.c#3 integrate
.. //depot/projects/toestack/sys/dev/ral/rt2661.c#3 integrate
.. //depot/projects/toestack/sys/dev/rc/rc.c#2 integrate
.. //depot/projects/toestack/sys/dev/scd/scd.c#2 integrate
.. //depot/projects/toestack/sys/dev/sound/pci/emu10kx-midi.c#2 integrate
.. //depot/projects/toestack/sys/dev/sound/pci/emu10kx-pcm.c#2 integrate
.. //depot/projects/toestack/sys/dev/sound/pci/emu10kx.c#2 integrate
.. //depot/projects/toestack/sys/dev/sound/pci/emu10kx.h#2 integrate
.. //depot/projects/toestack/sys/dev/syscons/syscons.c#2 integrate
.. //depot/projects/toestack/sys/dev/syscons/syscons.h#2 integrate
.. //depot/projects/toestack/sys/dev/usb/ehci_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/usb/if_axe.c#2 integrate
.. //depot/projects/toestack/sys/dev/usb/if_axereg.h#2 integrate
.. //depot/projects/toestack/sys/dev/usb/if_rum.c#3 integrate
.. //depot/projects/toestack/sys/dev/usb/if_ural.c#3 integrate
.. //depot/projects/toestack/sys/dev/usb/if_zyd.c#4 integrate
.. //depot/projects/toestack/sys/dev/wi/if_wi.c#3 integrate
.. //depot/projects/toestack/sys/fs/msdosfs/msdosfs_fat.c#2 integrate
.. //depot/projects/toestack/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/toestack/sys/fs/procfs/procfs_status.c#2 integrate
.. //depot/projects/toestack/sys/geom/geom_event.c#2 integrate
.. //depot/projects/toestack/sys/geom/virstor/binstream.c#1 branch
.. //depot/projects/toestack/sys/geom/virstor/binstream.h#1 branch
.. //depot/projects/toestack/sys/geom/virstor/g_virstor.c#1 branch
.. //depot/projects/toestack/sys/geom/virstor/g_virstor.h#1 branch
.. //depot/projects/toestack/sys/geom/virstor/g_virstor_md.c#1 branch
.. //depot/projects/toestack/sys/geom/virstor/g_virstor_md.h#1 branch
.. //depot/projects/toestack/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/toestack/sys/i386/i386/genassym.c#2 integrate
.. //depot/projects/toestack/sys/i386/i386/geode.c#2 integrate
.. //depot/projects/toestack/sys/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/toestack/sys/i386/i386/local_apic.c#3 integrate
.. //depot/projects/toestack/sys/i386/include/intr_machdep.h#2 integrate
.. //depot/projects/toestack/sys/i386/include/smp.h#2 integrate
.. //depot/projects/toestack/sys/i386/include/vmparam.h#2 integrate
.. //depot/projects/toestack/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/toestack/sys/i386/linux/linux_proto.h#2 integrate
.. //depot/projects/toestack/sys/i386/linux/linux_ptrace.c#2 integrate
.. //depot/projects/toestack/sys/i386/linux/linux_syscall.h#2 integrate
.. //depot/projects/toestack/sys/i386/linux/linux_sysent.c#2 integrate
.. //depot/projects/toestack/sys/i386/linux/linux_sysvec.c#2 integrate
.. //depot/projects/toestack/sys/i386/linux/syscalls.master#2 integrate
.. //depot/projects/toestack/sys/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/toestack/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/toestack/sys/ia64/ia64/uma_machdep.c#2 integrate
.. //depot/projects/toestack/sys/ia64/include/vmparam.h#2 integrate
.. //depot/projects/toestack/sys/kern/init_main.c#3 integrate
.. //depot/projects/toestack/sys/kern/kern_clock.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_exec.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_kse.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_mbuf.c#3 integrate
.. //depot/projects/toestack/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_switch.c#3 integrate
.. //depot/projects/toestack/sys/kern/kern_synch.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_thread.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_timeout.c#3 integrate
.. //depot/projects/toestack/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/toestack/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/toestack/sys/kern/subr_kdb.c#2 integrate
.. //depot/projects/toestack/sys/kern/subr_lock.c#2 integrate
.. //depot/projects/toestack/sys/kern/subr_sleepqueue.c#2 integrate
.. //depot/projects/toestack/sys/kern/subr_trap.c#2 integrate
.. //depot/projects/toestack/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/toestack/sys/kern/sys_process.c#2 integrate
.. //depot/projects/toestack/sys/kern/uipc_mbuf.c#3 integrate
.. //depot/projects/toestack/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_cache.c#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_lookup.c#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_mount.c#2 integrate
.. //depot/projects/toestack/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/toestack/sys/modules/Makefile#2 integrate
.. //depot/projects/toestack/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/toestack/sys/modules/cxgb/cxgb/Makefile#3 edit
.. //depot/projects/toestack/sys/modules/geom/geom_virstor/Makefile#1 branch
.. //depot/projects/toestack/sys/modules/sound/driver/emu10kx/Makefile#2 integrate
.. //depot/projects/toestack/sys/net/bpf_filter.c#2 integrate
.. //depot/projects/toestack/sys/net/if_bridge.c#2 integrate
.. //depot/projects/toestack/sys/net/if_ethersubr.c#3 integrate
.. //depot/projects/toestack/sys/net/if_media.h#2 integrate
.. //depot/projects/toestack/sys/net/if_stf.c#2 integrate
.. //depot/projects/toestack/sys/net/route.h#3 integrate
.. //depot/projects/toestack/sys/net80211/_ieee80211.h#3 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_ht.c#3 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_ht.h#2 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_ioctl.h#3 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_node.c#3 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_node.h#2 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_power.c#2 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_proto.c#3 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_proto.h#3 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_regdomain.c#2 integrate
.. //depot/projects/toestack/sys/net80211/ieee80211_var.h#3 integrate
.. //depot/projects/toestack/sys/netgraph/ng_ppp.c#2 integrate
.. //depot/projects/toestack/sys/netgraph/ng_pppoe.c#2 integrate
.. //depot/projects/toestack/sys/netinet/if_ether.c#3 integrate
.. //depot/projects/toestack/sys/netinet/in_gif.c#2 integrate
.. //depot/projects/toestack/sys/netinet/in_pcb.c#4 integrate
.. //depot/projects/toestack/sys/netinet/ip_fw2.c#2 integrate
.. //depot/projects/toestack/sys/netinet/sctp.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_asconf.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_asconf.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_constants.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_indata.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_input.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_lock_bsd.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_os_bsd.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_output.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_output.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_pcb.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_pcb.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_sysctl.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_timer.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_timer.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_uio.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctputil.c#3 integrate
.. //depot/projects/toestack/sys/netinet/sctputil.h#3 integrate
.. //depot/projects/toestack/sys/netinet/tcp_subr.c#4 integrate
.. //depot/projects/toestack/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/toestack/sys/netinet/tcp_timer.h#3 integrate
.. //depot/projects/toestack/sys/netinet/tcp_usrreq.c#4 integrate
.. //depot/projects/toestack/sys/netinet/tcp_var.h#4 integrate
.. //depot/projects/toestack/sys/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/toestack/sys/netinet6/sctp6_var.h#2 integrate
.. //depot/projects/toestack/sys/nfsclient/nfs_bio.c#2 integrate
.. //depot/projects/toestack/sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/toestack/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/toestack/sys/pci/agp_i810.c#2 integrate
.. //depot/projects/toestack/sys/pci/agp_via.c#2 integrate
.. //depot/projects/toestack/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/toestack/sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/toestack/sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/toestack/sys/powerpc/powerpc/uma_machdep.c#2 integrate
.. //depot/projects/toestack/sys/security/mac_lomac/mac_lomac.c#3 integrate
.. //depot/projects/toestack/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/toestack/sys/sparc64/include/vmparam.h#2 integrate
.. //depot/projects/toestack/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/toestack/sys/sparc64/sparc64/genassym.c#2 integrate
.. //depot/projects/toestack/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/toestack/sys/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/toestack/sys/sun4v/include/vmparam.h#2 integrate
.. //depot/projects/toestack/sys/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/toestack/sys/sys/callout.h#3 integrate
.. //depot/projects/toestack/sys/sys/lock_profile.h#2 integrate
.. //depot/projects/toestack/sys/sys/mbuf.h#3 integrate
.. //depot/projects/toestack/sys/sys/mount.h#2 integrate
.. //depot/projects/toestack/sys/sys/param.h#2 integrate
.. //depot/projects/toestack/sys/sys/proc.h#3 integrate
.. //depot/projects/toestack/sys/sys/socket.h#2 integrate
.. //depot/projects/toestack/sys/sys/user.h#2 integrate
.. //depot/projects/toestack/sys/sys/vmmeter.h#2 integrate
.. //depot/projects/toestack/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/toestack/sys/vm/vm_fault.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_glue.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_map.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_object.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_object.h#2 integrate
.. //depot/projects/toestack/sys/vm/vm_page.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_page.h#2 integrate
.. //depot/projects/toestack/sys/vm/vm_pageout.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_pageq.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_phys.c#2 integrate
.. //depot/projects/toestack/sys/vm/vm_phys.h#2 integrate
.. //depot/projects/toestack/tools/tools/crypto/ipsecstats.c#2 integrate
.. //depot/projects/toestack/tools/tools/nanobsd/nanobsd.sh#2 integrate
.. //depot/projects/toestack/usr.bin/at/at.c#2 integrate
.. //depot/projects/toestack/usr.bin/calendar/calendars/calendar.dutch#3 integrate
.. //depot/projects/toestack/usr.bin/calendar/calendars/calendar.freebsd#2 integrate
.. //depot/projects/toestack/usr.bin/calendar/calendars/hr_HR.ISO8859-2/calendar.praznici#2 integrate
.. //depot/projects/toestack/usr.bin/login/login_fbtab.c#2 integrate
.. //depot/projects/toestack/usr.bin/m4/gnum4.c#2 integrate
.. //depot/projects/toestack/usr.bin/mklocale/yacc.y#2 integrate
.. //depot/projects/toestack/usr.bin/systat/pigs.c#3 integrate
.. //depot/projects/toestack/usr.bin/top/machine.c#2 integrate
.. //depot/projects/toestack/usr.sbin/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agent.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agent.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/Makefile.inc#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/group.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/group.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/passwd.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/passwd.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/services.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/agents/services.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/cachelib.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/cachelib.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/cacheplcs.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/cacheplcs.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/config.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/config.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/debug.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/hashtable.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/log.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/log.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/mp_rs_query.#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/mp_rs_query.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/mp_rs_query.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/mp_ws_query.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/mp_ws_query.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/nscd.8#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/nscd.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/nscd.conf.5#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/nscdcli.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/nscdcli.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/parser.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/parser.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/protocol.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/protocol.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/query.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/query.h#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/singletons.c#2 integrate
.. //depot/projects/toestack/usr.sbin/nscd/singletons.h#2 integrate
.. //depot/projects/toestack/usr.sbin/repquota/repquota.c#2 integrate
.. //depot/projects/toestack/usr.sbin/wpa/hostapd/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/wpa/wpa_supplicant/Makefile#2 integrate

Differences ...

==== //depot/projects/toestack/ObsoleteFiles.inc#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.110 2007/08/31 19:41:27 yar Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.112 2007/09/29 22:37:40 bushman Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20070930: rename of cached to nscd
+OLD_FILES+=etc/rc.d/cached
+OLD_FILES+=usr/sbin/cached
+OLD_FILES+=usr/share/man/man5/cached.conf.5
+OLD_FILES+=usr/share/man/man8/cached.8
 # 20070807: removal of PowerPC specific header file.
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/interruptvar.h
@@ -3301,7 +3306,6 @@
 OLD_FILES+=usr/share/man/man4/uaudio.4.gz
 OLD_FILES+=usr/share/man/man4/utf2.4.gz
 OLD_FILES+=usr/share/man/man4/vinumdebug.4.gz
-OLD_FILES+=usr/share/man/man5/ar.5.gz
 OLD_FILES+=usr/share/man/man5/disklabel.5.gz
 OLD_FILES+=usr/share/man/man5/dm.conf.5.gz
 OLD_FILES+=usr/share/man/man5/ranlib.5.gz

==== //depot/projects/toestack/UPDATING#2 (text+ko) ====

@@ -21,6 +21,13 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070928:
+        The caching daemon (cached) was renamed to nscd. nscd.conf
+        configuration file should be used instead of cached.conf and
+        nscd_enable, nscd_pidfile and nscd_flags options should be used
+        instead of cached_enable, cached_pidfile and cached_flags in
+        rc.conf.
+
 20070704:
         The new IPsec code is now compiled in using the IPSEC option.  The
 	IPSEC option now requires "device crypto" be defined in your kernel
@@ -887,4 +894,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $
+$FreeBSD: src/UPDATING,v 1.504 2007/09/28 10:38:07 bushman Exp $

==== //depot/projects/toestack/bin/getfacl/getfacl.c#2 (text+ko) ====

@@ -32,7 +32,7 @@
 
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.11 2006/03/13 11:45:29 rwatson Exp $");
+__FBSDID("$FreeBSD: src/bin/getfacl/getfacl.c,v 1.12 2007/09/19 02:04:47 kevlo Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -41,6 +41,8 @@
 
 #include <err.h>
 #include <errno.h>
+#include <grp.h>
+#include <pwd.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -55,6 +57,32 @@
 	fprintf(stderr, "getfacl [-dhq] [file ...]\n");
 }
 
+static char *
+getuname(uid_t uid)
+{
+	struct passwd *pw;
+	static char uids[10];
+
+	if ((pw = getpwuid(uid)) == NULL) {
+		(void)snprintf(uids, sizeof(uids), "%u", uid);
+		return (uids);
+	} else
+		return (pw->pw_name);
+}
+
+static char *
+getgname(gid_t gid)
+{
+	struct group *gr;
+	static char gids[10];
+
+	if ((gr = getgrgid(gid)) == NULL) {
+		(void)snprintf(gids, sizeof(gids), "%u", gid);
+		return (gids);
+	} else
+		return (gr->gr_name);
+}
+
 /*
  * return an ACL corresponding to the permissions
  * contained in struct stat
@@ -169,8 +197,8 @@
 		more_than_one++;
 
 	if (!qflag)
-		printf("#file:%s\n#owner:%d\n#group:%d\n", path, sb.st_uid,
-		    sb.st_gid);
+		printf("# file: %s\n# owner: %s\n# group: %s\n", path,
+		    getuname(sb.st_uid), getgname(sb.st_gid));
 
 	if (hflag)
 		acl = acl_get_link_np(path, type);

==== //depot/projects/toestack/bin/ps/print.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.94 2006/02/21 13:02:18 cognet Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/print.c,v 1.95 2007/09/17 05:27:18 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/time.h>
@@ -197,14 +197,13 @@
 void
 state(KINFO *k, VARENT *ve)
 {
-	int flag, sflag, tdflags;
+	int flag, tdflags;
 	char *cp;
 	VAR *v;
 	char buf[16];
 
 	v = ve->var;
 	flag = k->ki_p->ki_flag;
-	sflag = k->ki_p->ki_sflag;
 	tdflags = k->ki_p->ki_tdflags;	/* XXXKSE */
 	cp = buf;
 
@@ -242,7 +241,7 @@
 		*cp = '?';
 	}
 	cp++;
-	if (!(sflag & PS_INMEM))
+	if (!(flag & P_INMEM))
 		*cp++ = 'W';
 	if (k->ki_p->ki_nice < NZERO)
 		*cp++ = '<';
@@ -591,7 +590,7 @@
 #define	fxtofl(fixpt)	((double)(fixpt) / fscale)
 
 	/* XXX - I don't like this */
-	if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_sflag & PS_INMEM) == 0)
+	if (k->ki_p->ki_swtime == 0 || (k->ki_p->ki_flag & P_INMEM) == 0)
 		return (0.0);
 	if (rawcpu)
 		return (100.0 * fxtofl(k->ki_p->ki_pctcpu));
@@ -619,7 +618,7 @@
 	if (failure)
 		return (0.0);
 
-	if ((k->ki_p->ki_sflag & PS_INMEM) == 0)
+	if ((k->ki_p->ki_flag & P_INMEM) == 0)
 		return (0.0);
 	/* XXX want pmap ptpages, segtab, etc. (per architecture) */
 	/* XXX don't have info about shared */

==== //depot/projects/toestack/bin/ps/ps.c#2 (text+ko) ====

@@ -47,7 +47,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.110 2005/02/09 17:37:38 ru Exp $");
+__FBSDID("$FreeBSD: src/bin/ps/ps.c,v 1.111 2007/09/17 05:27:18 jeff Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -994,13 +994,13 @@
 	return (s);
 }
 
-#define UREADOK(ki)	(forceuread || (ki->ki_p->ki_sflag & PS_INMEM))
+#define UREADOK(ki)	(forceuread || (ki->ki_p->ki_flag & P_INMEM))
 
 static void
 saveuser(KINFO *ki)
 {
 
-	if (ki->ki_p->ki_sflag & PS_INMEM) {
+	if (ki->ki_p->ki_flag & P_INMEM) {
 		/*
 		 * The u-area might be swapped out, and we can't get
 		 * at it because we have a crashdump and no swap.

==== //depot/projects/toestack/etc/defaults/rc.conf#3 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.318 2007/09/28 10:38:08 bushman Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -495,7 +495,6 @@
 auditd_enable="NO"	# Run the audit daemon.
 auditd_program="/usr/sbin/auditd"	# Path to the audit daemon.
 auditd_flags=""		# Which options to pass to the audit daemon.
-cached_enable="NO"	# Run the nsswitch caching daemon.
 cron_enable="YES"	# Run the periodic job daemon.
 cron_program="/usr/sbin/cron"	# Which cron executable to run (if enabled).
 cron_dst="YES"		# Handle DST transitions intelligently (YES/NO)
@@ -503,6 +502,7 @@
 lpd_enable="NO"		# Run the line printer daemon.
 lpd_program="/usr/sbin/lpd"	# path to lpd, if you want a different one.
 lpd_flags=""		# Flags to lpd (if enabled).
+nscd_enable="NO"	# Run the nsswitch caching daemon.
 chkprintcap_enable="NO"	# Run chkprintcap(8) before running lpd.
 chkprintcap_flags="-d"	# Create missing directories by default.
 dumpdev="AUTO"		# Device to crashdump to (device name, AUTO, or NO).

==== //depot/projects/toestack/etc/mtree/BSD.include.dist#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.118 2007/07/14 21:49:21 rwatson Exp $
+# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.119 2007/09/23 07:34:21 pjd Exp $
 #
 # Please see the file src/etc/mtree/README before making changes to this file.
 #
@@ -174,6 +174,8 @@
         ..
         stripe
         ..
+        virstor
+        ..
     ..
     gnu
         posix

==== //depot/projects/toestack/etc/rc.d/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.83 2007/09/07 15:44:09 mlaier Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $
 
 .include <bsd.own.mk>
 
@@ -48,7 +48,7 @@
 .endif
 
 .if ${MK_NS_CACHING} != "no"
-FILES+= cached
+FILES+= nscd
 .endif
 
 FILESDIR=	/etc/rc.d

==== //depot/projects/toestack/etc/rc.d/nscd#2 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/nscd,v 1.4 2007/08/09 13:06:11 bushman Exp $
+# $FreeBSD: src/etc/rc.d/nscd,v 1.6 2007/09/28 10:38:08 bushman Exp $
 #
 
 # PROVIDE: nscd
@@ -8,7 +8,7 @@
 # BEFORE: LOGIN
 
 #
-# Add the following lines to /etc/rc.conf to enable cached:
+# Add the following lines to /etc/rc.conf to enable nscd:
 #
 # nscd_enable="YES"
 #
@@ -24,9 +24,29 @@
 extra_commands="flush"
 flush_cmd="${command} -I all"
 
-nscd_enable=${nscd_enable:-"NO"}
-nscd_pidfile=${nscd_pidfile:-"/var/run/nscd.pid"}
-nscd_flags=${nscd_flags:-""}
+# usage: _nscd_set_option <option name> <default value>
+#
+_nscd_set_option() {
+	local _optname _defoptval _nscd_opt_val _cached_opt_val
+	_optname=$1
+	_defoptval=$2
+
+	_nscd_opt_val=$(eval "echo \$nscd_${_optname}")
+	_cached_opt_val=$(eval "echo \$cached_${_optname}")
+	
+	if [ -n "$_cached_opt_val" -a "$_nscd_opt_val" != "$_defoptval" ]; then
+		warn "You should use nscd_${_optname} instead of" \
+		    "cached_${_optname}"
+		setvar "nscd_${_optname}" "$_cached_opt_val"
+	else
+		setvar "nscd_${_optname}" "${_nscd_opt_val:-$_defoptval}"
+	fi
+}
+
 
 load_rc_config $name
+_nscd_set_option "enable" "NO"
+_nscd_set_option "pidfile" "/var/run/nscd.pid"
+_nscd_set_option "flags" ""
 run_rc_command "$1"
+

==== //depot/projects/toestack/etc/services#3 (text+ko) ====

@@ -16,7 +16,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-# $FreeBSD: src/etc/services,v 1.112 2007/09/08 08:56:01 mr Exp $
+# $FreeBSD: src/etc/services,v 1.113 2007/09/21 01:26:00 brooks Exp $
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
@@ -2331,7 +2331,7 @@
 sge_qmaster	6444/tcp   #Grid Engine Qmaster Service
 sge_qmaster	6444/udp   #Grid Engine Qmaster Service
 sge_execd	6445/tcp   #Grid Engine Execution Service
-sge_execd	6445/upd   #Grid Engine Execution Service
+sge_execd	6445/udp   #Grid Engine Execution Service
 xdsxdm		6558/tcp
 xdsxdm		6558/udp
 ircd		6667/tcp   #Internet Relay Chat (unoffical)

==== //depot/projects/toestack/gnu/usr.bin/binutils/ld/Makefile#2 (text+ko) ====

@@ -1,9 +1,13 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.31 2004/12/21 09:59:40 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.32 2007/09/26 01:31:28 marcel Exp $
 
 .include "../Makefile.inc0"
 
 .PATH: ${SRCDIR}/ld
 
+.if ${TARGET_ARCH} == "ia64"
+CFLAGS+= -O1
+.endif
+
 PROG=	ld
 SCRIPTDIR= /usr/libdata/ldscripts
 SRCS+=	ldcref.c ldctor.c ldemul.c ldemul-list.h ldexp.c ldfile.c \

==== //depot/projects/toestack/gnu/usr.bin/binutils/ld/genscripts.sh#2 (text+ko) ====

@@ -9,7 +9,7 @@
 # sparc-sun-sunos4.1.3 sparc-sun-sunos4.1.3 sun4 "" sun3 sparc-sun-sunos4.1.3
 # produces sun3.x sun3.xbn sun3.xn sun3.xr sun3.xu em_sun3.c
 #
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.7 2006/09/14 07:46:32 imp Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/genscripts.sh,v 1.9 2007/09/19 14:19:32 obrien Exp $
 #
 # This is a cut-down version of the GNU script. Instead of jumping through
 # hoops for all possible combinations of paths, just use the libdir
@@ -54,8 +54,12 @@
 fi
 
 # Set some flags for the emultempl scripts.  USE_LIBPATH will
-# be set for any libpath-using emulation.
-      USE_LIBPATH=yes
+# be set for any libpath-using emulation; NATIVE will be set for a
+# emulation to enable 'LD_LIBRARY_PATH=/foo:/bar ld -lfooz'
+    if [ "x${host}" = "x${target}" ] ; then
+      NATIVE=yes
+    fi
+  USE_LIBPATH=yes
 
 # Set the library search path, for libraries named by -lfoo.
 # If LIB_PATH is defined (e.g., by Makefile) and non-empty, it is used.

==== //depot/projects/toestack/gnu/usr.bin/cc/cc_int/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.51 2007/05/19 04:25:57 kan Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc_int/Makefile,v 1.52 2007/09/18 23:34:42 cognet Exp $
 
 .include "../Makefile.inc"
 .include "../Makefile.ver"
@@ -75,6 +75,10 @@
 # Target specific, C specific object file
 C_TARGET_OBJS=
 
+.if ${TARGET_ARCH} == "arm" && defined(TARGET_BIG_ENDIAN)
+CFLAGS += -DTARGET_ENDIAN_DEFAULT=MASK_BIG_END
+.endif
+
 # Language-specific object files for C and Objective C.
 C_AND_OBJC_OBJS = attribs.o c-errors.o c-lex.o c-pragma.o c-decl.o c-typeck.o \
   c-convert.o c-aux-info.o c-common.o c-opts.o c-format.o c-semantics.o \

==== //depot/projects/toestack/gnu/usr.bin/man/man/man.c#2 (text+ko) ====

@@ -16,7 +16,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.63 2005/12/05 14:22:11 ru Exp $";
+  "$FreeBSD: src/gnu/usr.bin/man/man/man.c,v 1.65 2007/09/25 21:41:22 edwin Exp $";
 #endif /* not lint */
 
 #define MAN_MAIN
@@ -884,11 +884,26 @@
 
  next:
 
+#if HAVE_LIBZ > 0
+  if ((fp = gzopen (ult, "r")) == NULL)
+  {
+    /* check for the compressed version too */
+    strlcat(ult, ".gz", FILENAME_MAX);
+    if ((fp = gzopen (ult, "r")) == NULL)
+      return ult; /* we munged it, but it doesn't exist anyway */
+  }
+#else
   if ((fp = fopen (ult, "r")) == NULL)
     return ult;
+#endif
 
+#if HAVE_LIBZ > 0
+  end = gzgets (fp, buf, BUFSIZ);
+  gzclose(fp);
+#else
   end = fgets (buf, BUFSIZ, fp);
   fclose(fp);
+#endif
 
   if (!end || strlen (buf) < 5)
     return ult;

==== //depot/projects/toestack/gnu/usr.bin/texinfo/info/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.13 2002/06/05 06:58:32 ru Exp $
+# $FreeBSD: src/gnu/usr.bin/texinfo/info/Makefile,v 1.14 2007/09/19 14:21:18 obrien Exp $
 
 PROG=	info
 MAN=	info.1 info.5 texinfo.5
@@ -8,7 +8,7 @@
 	infomap.c m-x.c man.c nodemenu.c nodes.c search.c session.c \
 	signals.c terminal.c tilde.c variables.c window.c
 
-CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:/usr/X11R6/info:.\"
+CFLAGS+= -DINFODIR=\"${INFODIR}:/usr/local/info:.\"
 
 DPADD=	${LIBTERMCAP} ${LIBTXI}
 LDADD=	-ltermcap ${LIBTXI}

==== //depot/projects/toestack/include/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.274 2007/07/14 21:49:22 rwatson Exp $
+# $FreeBSD: src/include/Makefile,v 1.275 2007/09/23 07:34:21 pjd Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -49,7 +49,7 @@
 	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
 	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
-	geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe \
+	geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe geom/virstor \
 	netgraph/atm netgraph/netflow \
 	security/audit \
 	security/mac_biba security/mac_bsdextended security/mac_lomac \

==== //depot/projects/toestack/lib/libarchive/archive_read.3#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/lib/libarchive/archive_read.3,v 1.34 2007/05/29 01:00:18 kientzle Exp $
+.\" $FreeBSD: src/lib/libarchive/archive_read.3,v 1.35 2007/09/19 16:37:45 kientzle Exp $
 .\"
 .Dd August 19, 2006
 .Dt archive_read 3
@@ -267,7 +267,7 @@
 The
 .Va flags
 argument is passed unmodified to
-.Xr archiv_write_disk_set_options 3 .
+.Xr archive_write_disk_set_options 3 .
 .It Fn archive_read_extract_set_progress_callback
 Sets a pointer to a user-defined callback that can be used
 for updating progress displays during extraction.

==== //depot/projects/toestack/lib/libarchive/archive_write_disk.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.14 2007/08/12 17:35:05 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_disk.c,v 1.17 2007/09/21 04:52:42 kientzle Exp $");
 
 #ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
@@ -448,8 +448,10 @@
 
 	__archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 	    ARCHIVE_STATE_DATA, "archive_write_disk_block");
-	if (a->fd < 0)
-		return (ARCHIVE_OK);
+	if (a->fd < 0) {
+		archive_set_error(&a->archive, 0, "File not open");
+		return (ARCHIVE_WARN);
+	}
 	archive_clear_error(&a->archive);
 
 	/* Seek if necessary to the specified offset. */
@@ -478,12 +480,17 @@
 _archive_write_data(struct archive *_a, const void *buff, size_t size)
 {
 	struct archive_write_disk *a = (struct archive_write_disk *)_a;
+	int r;
+
 	__archive_check_magic(&a->archive, ARCHIVE_WRITE_DISK_MAGIC,
 	    ARCHIVE_STATE_DATA, "archive_write_data");
 	if (a->fd < 0)
 		return (ARCHIVE_OK);
 
-	return (_archive_write_data_block(_a, buff, size, a->offset));
+	r = _archive_write_data_block(_a, buff, size, a->offset);
+	if (r < ARCHIVE_OK)
+		return (r);
+	return (size);
 }
 
 static int

==== //depot/projects/toestack/lib/libarchive/test/test_write_disk.c#2 (text+ko) ====

@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.3 2007/07/06 15:43:11 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_write_disk.c,v 1.6 2007/09/21 04:52:43 kientzle Exp $");
 
 #if ARCHIVE_VERSION_STAMP >= 1009000
 
@@ -50,8 +50,76 @@
 	    st.st_mode, archive_entry_mode(ae));
 	assert(st.st_mode == (archive_entry_mode(ae) & ~UMASK));
 }
+
+static void create_reg_file(struct archive_entry *ae, const char *msg)
+{
+	static const char data[]="abcdefghijklmnopqrstuvwxyz";
+	struct archive *ad;
+	struct stat st;
+
+	/* Write the entry to disk. */
+	assert((ad = archive_write_disk_new()) != NULL);
+	failure("%s", msg);
+	assertEqualIntA(ad, 0, archive_write_header(ad, ae));
+	assertEqualInt(sizeof(data), archive_write_data(ad, data, sizeof(data)));
+	assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
+#if ARCHIVE_API_VERSION > 1
+	assertEqualInt(0, archive_write_finish(ad));
+#else
+	archive_write_finish(ad);
 #endif
+	/* Test the entries on disk. */
+	assert(0 == stat(archive_entry_pathname(ae), &st));
+	failure("st.st_mode=%o archive_entry_mode(ae)=%o",
+	    st.st_mode, archive_entry_mode(ae));
+	assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK));
+	assertEqualInt(st.st_size, sizeof(data));
+}
+
+static void create_reg_file2(struct archive_entry *ae, const char *msg)
+{
+	const int datasize = 100000;
+	char *data;
+	char *compare;
+	struct archive *ad;
+	struct stat st;
+	int i, fd;
 
+	data = malloc(datasize);
+	for (i = 0; i < datasize; i++)
+		data[i] = (char)(i % 256);
+
+	/* Write the entry to disk. */
+	assert((ad = archive_write_disk_new()) != NULL);
+	failure("%s", msg);
+	assertEqualIntA(ad, 0, archive_write_header(ad, ae));
+	for (i = 0; i < datasize - 999; i += 1000) {
+		assertEqualIntA(ad, ARCHIVE_OK,
+		    archive_write_data_block(ad, data + i, 1000, i));
+	}
+	assertEqualIntA(ad, 0, archive_write_finish_entry(ad));
+#if ARCHIVE_API_VERSION > 1
+	assertEqualInt(0, archive_write_finish(ad));
+#else
+	archive_write_finish(ad);
+#endif
+	/* Test the entries on disk. */
+	assert(0 == stat(archive_entry_pathname(ae), &st));
+	failure("st.st_mode=%o archive_entry_mode(ae)=%o",
+	    st.st_mode, archive_entry_mode(ae));
+	assertEqualInt(st.st_mode, (archive_entry_mode(ae) & ~UMASK));
+	assertEqualInt(st.st_size, i);
+
+	compare = malloc(datasize);
+	fd = open(archive_entry_pathname(ae), O_RDONLY);
+	assertEqualInt(datasize, read(fd, compare, datasize));
+	close(fd);
+	assert(memcmp(compare, data, datasize) == 0);
+	free(compare);
+	free(data);
+}
+#endif
+
 DEFINE_TEST(test_write_disk)
 {
 #if ARCHIVE_VERSION_STAMP < 1009000
@@ -66,7 +134,14 @@
 	assert((ae = archive_entry_new()) != NULL);

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 00:20:34 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE7C516A41A; Wed,  3 Oct 2007 00:20:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 72CEE16A418
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 00:20:33 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 528C213C448
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 00:20:33 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l930KXvY032004
	for <perforce@freebsd.org>; Wed, 3 Oct 2007 00:20:33 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l930KXWJ032001
	for perforce@freebsd.org; Wed, 3 Oct 2007 00:20:33 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 3 Oct 2007 00:20:33 GMT
Message-Id: <200710030020.l930KXWJ032001@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127118 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 00:20:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=127118

Change 127118 by kmacy@kmacy_home:ethng on 2007/10/03 00:19:32

	unbreak world - we cleverly export lock details of network data structures to user-land

Affected files ...

.. //depot/projects/ethng/src/sys/net/if_var.h#6 edit

Differences ...

==== //depot/projects/ethng/src/sys/net/if_var.h#6 (text+ko) ====

@@ -79,6 +79,7 @@
 #include <sys/eventhandler.h>
 #endif /* _KERNEL */
 #include <sys/lock.h>		/* XXX */
+#include <sys/mutex.h>		/* XXX */
 #include <sys/rwlock.h>		/* XXX */
 #include <sys/event.h>		/* XXX */
 #include <sys/_task.h>

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 01:33:57 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D8D716A419; Wed,  3 Oct 2007 01:33:57 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AF03A16A421
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 01:33:56 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A8B7E13C455
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 01:33:56 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l931Xu8s045880
	for <perforce@freebsd.org>; Wed, 3 Oct 2007 01:33:56 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l931Xtqw045877
	for perforce@freebsd.org; Wed, 3 Oct 2007 01:33:55 GMT
	(envelope-from kmacy@freebsd.org)
Date: Wed, 3 Oct 2007 01:33:55 GMT
Message-Id: <200710030133.l931Xtqw045877@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127119 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 01:33:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=127119

Change 127119 by kmacy@kmacy_home:ethng on 2007/10/03 01:33:54

	IFC #127110

Affected files ...

.. //depot/projects/ethng/src/Makefile.inc1#2 integrate
.. //depot/projects/ethng/src/UPDATING#3 integrate
.. //depot/projects/ethng/src/cddl/lib/Makefile#2 integrate
.. //depot/projects/ethng/src/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/ethng/src/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/ethng/src/cddl/usr.bin/Makefile#2 integrate
.. //depot/projects/ethng/src/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/ethng/src/cddl/usr.sbin/Makefile#2 integrate
.. //depot/projects/ethng/src/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/ethng/src/contrib/gcc/opts.c#2 integrate
.. //depot/projects/ethng/src/contrib/wpa_supplicant/main.c#2 integrate
.. //depot/projects/ethng/src/etc/rc.d/cached#2 delete
.. //depot/projects/ethng/src/include/Makefile#3 integrate
.. //depot/projects/ethng/src/lib/libc/Makefile#2 integrate
.. //depot/projects/ethng/src/lib/libpthread/Makefile#2 integrate
.. //depot/projects/ethng/src/lib/libthr/Makefile#2 integrate
.. //depot/projects/ethng/src/libexec/atrun/Makefile#2 integrate
.. //depot/projects/ethng/src/sbin/ggate/Makefile#2 integrate
.. //depot/projects/ethng/src/share/man/man4/pci.4#2 integrate
.. //depot/projects/ethng/src/share/man/man9/pci.9#2 integrate
.. //depot/projects/ethng/src/share/mk/bsd.libnames.mk#2 integrate
.. //depot/projects/ethng/src/share/mk/bsd.prog.mk#2 integrate
.. //depot/projects/ethng/src/sys/amd64/amd64/legacy.c#2 integrate
.. //depot/projects/ethng/src/sys/amd64/include/legacyvar.h#2 integrate
.. //depot/projects/ethng/src/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/ethng/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/ethng/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate
.. //depot/projects/ethng/src/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/cardbus/cardbus.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/pccbb/pccbb.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/pccbb/pccbb_pci.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/pccbb/pccbbvar.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/pci/pci_pci.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/pci/pci_private.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/ethng/src/sys/dev/pci/pcib_private.h#2 integrate
.. //depot/projects/ethng/src/sys/dev/pci/pcivar.h#2 integrate
.. //depot/projects/ethng/src/sys/i386/i386/legacy.c#2 integrate
.. //depot/projects/ethng/src/sys/i386/include/legacyvar.h#2 integrate
.. //depot/projects/ethng/src/sys/i386/pci/pci_bus.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/kern_sx.c#2 integrate
.. //depot/projects/ethng/src/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_asconf.c#8 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_constants.h#6 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_indata.c#6 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_input.c#8 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_output.c#7 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_output.h#5 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_pcb.c#7 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_timer.c#6 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_usrreq.c#7 integrate
.. //depot/projects/ethng/src/sys/netinet/sctp_var.h#5 integrate
.. //depot/projects/ethng/src/sys/netinet/sctputil.c#7 integrate
.. //depot/projects/ethng/src/sys/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/ethng/src/sys/powerpc/powermac/uninorth.c#2 integrate
.. //depot/projects/ethng/src/sys/sparc64/pci/apb.c#2 integrate
.. //depot/projects/ethng/src/sys/sparc64/pci/ofw_pcibus.c#3 integrate
.. //depot/projects/ethng/src/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/ethng/src/sys/sun4v/sun4v/hv_pci.c#2 integrate
.. //depot/projects/ethng/src/sys/sys/param.h#3 integrate
.. //depot/projects/ethng/src/sys/sys/pciio.h#2 integrate
.. //depot/projects/ethng/src/tools/build/make_check/Makefile#2 integrate
.. //depot/projects/ethng/src/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate
.. //depot/projects/ethng/src/tools/make_libdeps.sh#2 integrate
.. //depot/projects/ethng/src/tools/tools/pciroms/pciroms.c#2 integrate
.. //depot/projects/ethng/src/usr.bin/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.sbin/Makefile#3 integrate
.. //depot/projects/ethng/src/usr.sbin/bluetooth/bthidd/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.sbin/cached/Makefile#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/agent.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/agent.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/agents/Makefile.inc#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/agents/group.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/agents/group.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/agents/passwd.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/agents/passwd.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/agents/services.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/agents/services.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/cached.8#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/cached.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/cached.conf.5#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/cachedcli.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/cachedcli.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/cachelib.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/cachelib.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/cacheplcs.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/cacheplcs.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/config.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/config.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/debug.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/debug.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/hashtable.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/log.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/log.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/mp_rs_query.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/mp_rs_query.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/mp_ws_query.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/mp_ws_query.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/parser.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/parser.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/protocol.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/protocol.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/query.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/query.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/singletons.c#2 delete
.. //depot/projects/ethng/src/usr.sbin/cached/singletons.h#2 delete
.. //depot/projects/ethng/src/usr.sbin/config/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.sbin/cron/cron/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.sbin/ngctl/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.sbin/pciconf/pciconf.8#2 integrate
.. //depot/projects/ethng/src/usr.sbin/pciconf/pciconf.c#2 integrate
.. //depot/projects/ethng/src/usr.sbin/pmcstat/Makefile#2 integrate
.. //depot/projects/ethng/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate

Differences ...

==== //depot/projects/ethng/src/Makefile.inc1#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.586 2007/10/01 18:24:46 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -330,8 +330,7 @@
 .endfor
 .for _dir in \
     lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc \
-    usr/share/snmp/defs usr/share/snmp/mibs
+    usr/libexec usr/sbin usr/share/misc
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -415,9 +414,7 @@
 	@echo ">>> stage 5.1: building 32 bit shim libraries"
 	@echo "--------------------------------------------------------------"
 .for _dir in \
-    lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc \
-    usr/share/snmp/defs usr/share/snmp/mibs
+    usr/include usr/lib32 usr/share/misc
 	mkdir -p ${LIB32TMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -1027,12 +1024,20 @@
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
-		lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \
+		lib/libopie lib/libpam ${_default_thread_lib} \
 		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
 		${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
 		${_secure_lib_libssl}
 
+.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no"
+_default_thread_lib=	lib/${DEFAULT_THREAD_LIB}
+.elif ${MK_LIBTHR} != "no"
+_default_thread_lib=	lib/libthr
+.elif ${MK_LIBPTHREAD} != "no"
+_default_thread_lib=	lib/libpthread
+.endif
+
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L

==== //depot/projects/ethng/src/UPDATING#3 (text+ko) ====

@@ -21,6 +21,13 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070930:
+	The PCI code has been made aware of PCI domains. This means that
+	the location strings as used by pciconf(8) etc are now in the
+	following format: pci<domain>:<bus>:<device>[:<function>]. It
+	also means that consumers of <sys/pciio.h> potentially need to
+	be recompiled; this includes the hal and xorg-server ports.
+
 20070928:
         The caching daemon (cached) was renamed to nscd. nscd.conf
         configuration file should be used instead of cached.conf and
@@ -894,4 +901,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.504 2007/09/28 10:38:07 bushman Exp $
+$FreeBSD: src/UPDATING,v 1.505 2007/09/30 11:05:12 marius Exp $

==== //depot/projects/ethng/src/cddl/lib/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,9 @@
 
 .if ${MK_ZFS} != "no"
 _libzfs=	libzfs
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _libzpool=	libzpool
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/ethng/src/cddl/sbin/zfs/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
 
@@ -19,7 +19,9 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>

==== //depot/projects/ethng/src/cddl/sbin/zpool/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
 
@@ -19,7 +19,9 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lavl -lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>

==== //depot/projects/ethng/src/cddl/usr.bin/Makefile#2 (text+ko) ====

@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	${_ztest}
 
 .if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _ztest=	ztest
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/ethng/src/cddl/usr.bin/ztest/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
 
@@ -15,7 +15,8 @@
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>

==== //depot/projects/ethng/src/cddl/usr.sbin/Makefile#2 (text+ko) ====

@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	${_zdb}
 
 .if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _zdb=	zdb
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/ethng/src/cddl/usr.sbin/zdb/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
 
@@ -16,7 +16,8 @@
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>

==== //depot/projects/ethng/src/contrib/gcc/opts.c#2 (text+ko) ====

@@ -20,7 +20,7 @@
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/opts.c,v 1.3 2007/05/19 02:22:16 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/opts.c,v 1.4 2007/10/02 20:06:14 obrien Exp $ */
 
 #include "config.h"
 #include "system.h"
@@ -501,7 +501,10 @@
       flag_reorder_functions = 1;
       flag_tree_store_ccp = 1;
       flag_tree_store_copy_prop = 1;
-      flag_tree_vrp = 1;
+      /* XXX: some issues with ports have been traced to -ftree-vrp.
+         So remove it from -O2 and above.  Note that jdk1{5,6} are affected
+         and they build with w/-O3 - so we cannot just move it to -O3. */
+      // flag_tree_vrp = 1;
 
       if (!optimize_size)
 	{

==== //depot/projects/ethng/src/contrib/wpa_supplicant/main.c#2 (text) ====

@@ -82,7 +82,7 @@
 	       "  -N = start describing new interface\n");
 
 	printf("example:\n"
-	       "  wpa_supplicant -Dwext -iwlan0 -c/etc/wpa_supplicant.conf\n");
+	       "  wpa_supplicant -Dbsd -iwlan0 -c/etc/wpa_supplicant.conf\n");
 #endif /* CONFIG_NO_STDOUT_DEBUG */
 }
 

==== //depot/projects/ethng/src/include/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.275 2007/09/23 07:34:21 pjd Exp $
+# $FreeBSD: src/include/Makefile,v 1.276 2007/10/01 18:07:29 ru Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -45,11 +45,13 @@
 LSUBDIRS=	cam/scsi \
 	dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
 	dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \
-	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
+	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
+	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
 	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
 	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
-	geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe geom/virstor \
+	geom/mirror geom/multipath geom/nop \
+	geom/raid3 geom/shsec geom/stripe geom/virstor \
 	netgraph/atm netgraph/netflow \
 	security/audit \
 	security/mac_biba security/mac_bsdextended security/mac_lomac \

==== //depot/projects/ethng/src/lib/libc/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.72 2007/05/19 16:38:39 kan Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.73 2007/10/01 18:15:10 ru Exp $
 
 SHLIBDIR?= /lib
 
@@ -23,6 +23,7 @@
 #
 # Only link with static libgcc.a (no libgcc_eh.a).
 #
+DPADD+=	${LIBGCC}
 LDFLAGS+= -nodefaultlibs
 LDADD+= -lgcc
 

==== //depot/projects/ethng/src/lib/libpthread/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libpthread/Makefile,v 1.63 2007/05/21 02:49:06 deischen Exp $
+# $FreeBSD: src/lib/libpthread/Makefile,v 1.64 2007/10/01 18:22:31 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -10,7 +10,8 @@
 
 .include <bsd.own.mk>
 
-.if ${DEFAULT_THREAD_LIB} == "libpthread" && ${SHLIBDIR} == "/usr/lib"
+.if (${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no") && \
+    ${SHLIBDIR} == "/usr/lib"
 SHLIBDIR= /lib
 .endif
 
@@ -46,7 +47,7 @@
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${DEFAULT_THREAD_LIB} == "libpthread"
+.if ${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so

==== //depot/projects/ethng/src/lib/libthr/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/Makefile,v 1.26 2007/06/08 02:21:13 davidxu Exp $
+# $FreeBSD: src/lib/libthr/Makefile,v 1.27 2007/10/01 18:29:55 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -10,7 +10,8 @@
 
 .include <bsd.own.mk>
 
-.if ${DEFAULT_THREAD_LIB} == "libthr" && ${SHLIBDIR} == "/usr/lib"
+.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no") && \
+    ${SHLIBDIR} == "/usr/lib"
 SHLIBDIR= /lib
 .endif
 
@@ -43,7 +44,7 @@
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${DEFAULT_THREAD_LIB} == "libthr"
+.if ${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so

==== //depot/projects/ethng/src/libexec/atrun/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/libexec/atrun/Makefile,v 1.14 2007/06/15 12:02:16 yar Exp $
+# $FreeBSD: src/libexec/atrun/Makefile,v 1.15 2007/10/01 18:17:23 ru Exp $
 
 MAINSRC=${.CURDIR}/../../usr.bin/at
 
@@ -16,7 +16,7 @@
 WFORMAT=0
 
 DPADD=	${LIBPAM} ${LIBUTIL}
-LDADD=	-lpam -lutil
+LDADD=	${MINUSLPAM} -lutil
 
 atrun.8: atrun.man
 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \

==== //depot/projects/ethng/src/sbin/ggate/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sbin/ggate/Makefile,v 1.7 2006/11/26 14:36:33 ru Exp $
+# $FreeBSD: src/sbin/ggate/Makefile,v 1.8 2007/10/01 18:22:31 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -6,8 +6,7 @@
 	${_ggated} \
 	ggatel
 
-.if ${MK_LIBTHR} != "no" || \
-    (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")   
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _ggatec=	ggatec
 _ggated=	ggated
 .endif

==== //depot/projects/ethng/src/share/man/man4/pci.4#2 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/pci.4,v 1.18 2007/04/07 14:36:18 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/pci.4,v 1.19 2007/09/30 11:05:12 marius Exp $
 .\"
-.Dd October 24, 1999
+.Dd September 30, 2007
 .Dt PCI 4
 .Os
 .Sh NAME
@@ -109,7 +109,7 @@
 .Bl -tag -width pd_vendor
 .It pc_sel
 .Tn PCI
-bus, slot and function.
+domain, bus, slot and function.
 .It pd_name
 .Tn PCI
 device driver name.
@@ -150,7 +150,7 @@
 .Bl -tag -width pc_subvendor
 .It pc_sel
 .Tn PCI
-bus, slot and function.
+domain, bus, slot and function.
 .It pc_hdr
 .Tn PCI
 header type.
@@ -257,9 +257,10 @@
 .It pi_sel
 A
 .Va pcisel
-structure which specifies the bus, slot and function the user would like to
-query.
-If the specific bus is not found, errno will be set to ENODEV and -1 returned from the ioctl.
+structure which specifies the domain, bus, slot and function the user would
+like to query.
+If the specific bus is not found, errno will be set to ENODEV and -1 returned
+from the ioctl.
 .It pi_reg
 The
 .Tn PCI

==== //depot/projects/ethng/src/share/man/man9/pci.9#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/man9/pci.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/pci.9,v 1.10 2007/09/30 11:05:13 marius Exp $
 .\"
-.Dd January 22, 2005
+.Dd September 30, 2007
 .Dt PCI 9
 .Os
 .Sh NAME
@@ -39,6 +39,7 @@
 .Nm pci_set_powerstate ,
 .Nm pci_get_powerstate ,
 .Nm pci_find_bsf ,
+.Nm pci_find_dbsf ,
 .Nm pci_find_device
 .Nd PCI bus interface
 .Sh SYNOPSIS
@@ -65,6 +66,8 @@
 .Ft device_t
 .Fn pci_find_bsf "uint8_t bus" "uint8_t slot" "uint8_t func"
 .Ft device_t
+.Fn pci_find_dbsf "uint32_t domain" "uint8_t bus" "uint8_t slot" "uint8_t func"
+.Ft device_t
 .Fn pci_find_device "uint16_t vendor" "uint16_t device"
 .Sh DESCRIPTION
 The
@@ -198,6 +201,30 @@
 number actually refers to the number of the device on the bus,
 which does not necessarily indicate its geographic location
 in terms of a physical slot.
+Note that in case the system has multiple PCI domains,
+the
+.Fn pci_find_bsf
+function only searches the first one.
+Actually, it is equivalent to:
+.Bd -literal -offset indent
+pci_find_dbsf(0, bus, slot, func);
+.Ed
+.Pp
+The
+.Fn pci_find_dbsf
+function looks up the
+.Vt device_t
+of a PCI device, given its
+.Fa domain ,
+.Fa bus ,
+.Fa slot ,
+and
+.Fa func .
+The
+.Fa slot
+number actually refers to the number of the device on the bus,
+which does not necessarily indicate its geographic location
+in terms of a physical slot.
 .Pp
 The
 .Fn pci_find_device

==== //depot/projects/ethng/src/share/mk/bsd.libnames.mk#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.104 2007/05/13 14:12:40 deischen Exp $
+# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.105 2007/10/01 18:15:11 ru Exp $
 
 # The include file <bsd.libnames.mk> define library names.
 # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this
@@ -120,11 +120,7 @@
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
 LIBPMC?=	${DESTDIR}${LIBDIR}/libpmc.a
-.if defined(DEFAULT_THREAD_LIB)
-LIBPTHREAD?=	${DESTDIR}${LIBDIR}/${DEFAULT_THREAD_LIB}.a
-.else
-LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libthr.a
-.endif
+LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libpthread.a
 LIBRADIUS?=	${DESTDIR}${LIBDIR}/libradius.a
 LIBREADLINE?=	${DESTDIR}${LIBDIR}/libreadline.a
 LIBROKEN?=	${DESTDIR}${LIBDIR}/libroken.a

==== //depot/projects/ethng/src/share/mk/bsd.prog.mk#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.149 2006/09/13 23:27:21 obrien Exp $
+# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.150 2007/10/01 18:15:11 ru Exp $
 
 .include <bsd.init.mk>
 
@@ -40,8 +40,12 @@
 
 # If there are Objective C sources, link with Objective C libraries.
 .if !empty(SRCS:M*.m)
-OBJCLIBS?= -lobjc -lpthread
+.if defined(OBJCLIBS)
 LDADD+=	${OBJCLIBS}
+.else
+DPADD+=	${LIBOBJC} ${LIBPTHREAD}
+LDADD+=	-lobjc -lpthread
+.endif
 .endif
 
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}

==== //depot/projects/ethng/src/sys/amd64/amd64/legacy.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.60 2007/03/20 20:21:44 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.61 2007/09/30 11:05:13 marius Exp $");
 
 /*
  * This code implements a system driver for legacy systems that do not
@@ -207,6 +207,9 @@
 	struct legacy_device *atdev = DEVTOAT(child);
 
 	switch (which) {
+	case LEGACY_IVAR_PCIDOMAIN:
+		*result = 0;
+		break;
 	case LEGACY_IVAR_PCIBUS:
 		*result = atdev->lg_pcibus;
 		break;
@@ -223,6 +226,8 @@
 	struct legacy_device *atdev = DEVTOAT(child);
 
 	switch (which) {
+	case LEGACY_IVAR_PCIDOMAIN:
+		return EINVAL;
 	case LEGACY_IVAR_PCIBUS:
 		atdev->lg_pcibus = value;
 		break;

==== //depot/projects/ethng/src/sys/amd64/include/legacyvar.h#2 (text+ko) ====

@@ -23,19 +23,21 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.7 2005/09/18 01:42:43 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.8 2007/09/30 11:05:13 marius Exp $
  */
 
 #ifndef _MACHINE_LEGACYVAR_H_
 #define	_MACHINE_LEGACYVAR_H_
 
 enum legacy_device_ivars {
+	LEGACY_IVAR_PCIDOMAIN,
 	LEGACY_IVAR_PCIBUS
 };
 
 #define LEGACY_ACCESSOR(var, ivar, type)				\
     __BUS_ACCESSOR(legacy, var, LEGACY, ivar, type)
 
+LEGACY_ACCESSOR(pcidomain,		PCIDOMAIN,	uint32_t)
 LEGACY_ACCESSOR(pcibus,			PCIBUS,		uint32_t)
 
 #undef LEGACY_ACCESSOR

==== //depot/projects/ethng/src/sys/amd64/pci/pci_bus.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.121 2007/05/02 17:50:34 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.122 2007/09/30 11:05:13 marius Exp $");
 
 #include "opt_cpu.h"
 
@@ -276,6 +276,9 @@
 {
 
 	switch (which) {
+	case  PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return 0;
 	case  PCIB_IVAR_BUS:
 		*result = legacy_get_pcibus(dev);
 		return 0;
@@ -289,6 +292,8 @@
 {
 
 	switch (which) {
+	case  PCIB_IVAR_DOMAIN:
+		return EINVAL;
 	case  PCIB_IVAR_BUS:
 		legacy_set_pcibus(dev, value);
 		return 0;

==== //depot/projects/ethng/src/sys/arm/xscale/i80321/i80321_pci.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.11 2007/07/27 14:53:42 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.12 2007/09/30 11:05:13 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -250,8 +250,10 @@
 {
 	struct i80321_pci_softc *sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
-
 		*result = sc->sc_busno;
 		return (0);
 		
@@ -265,6 +267,8 @@
 	struct i80321_pci_softc * sc = device_get_softc(dev);
 
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_busno = result;
 		return (0);

==== //depot/projects/ethng/src/sys/arm/xscale/i8134x/i81342_pci.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -481,8 +481,10 @@
 {
 	struct i81342_pci_softc *sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
-
 		*result = sc->sc_busno;
 		return (0);
 		
@@ -496,6 +498,8 @@
 	struct i81342_pci_softc * sc = device_get_softc(dev);
 
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_busno = result;
 		return (0);

==== //depot/projects/ethng/src/sys/arm/xscale/ixp425/ixp425_pci.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.4 2007/03/06 10:58:22 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.5 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -229,6 +229,9 @@
 
 	sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
 		*result = sc->sc_bus;
 		return (0);
@@ -244,6 +247,8 @@
 
 	sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_bus = value;
 		return (0);

==== //depot/projects/ethng/src/sys/dev/acpica/acpi_pci.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.30 2006/05/11 22:13:20 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.31 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -275,17 +275,19 @@
 static int
 acpi_pci_attach(device_t dev)
 {
-	int busno;
+	int busno, domain;
 
 	/*
 	 * Since there can be multiple independantly numbered PCI
 	 * busses on systems with multiple PCI domains, we can't use
 	 * the unit number to decide which bus we are probing. We ask
-	 * the parent pcib what our bus number is.
+	 * the parent pcib what our domain and bus numbers are.
 	 */
+	domain = pcib_get_domain(dev);
 	busno = pcib_get_bus(dev);
 	if (bootverbose)
-		device_printf(dev, "physical bus=%d\n", busno);
+		device_printf(dev, "domain=%d, physical bus=%d\n",
+		    domain, busno);
 
 	/*
 	 * First, PCI devices are added as in the normal PCI bus driver.
@@ -297,7 +299,7 @@
 	 * pci_add_children() doesn't find.  We currently just ignore
 	 * these devices.
 	 */
-	pci_add_children(dev, busno, sizeof(struct acpi_pci_devinfo));
+	pci_add_children(dev, domain, busno, sizeof(struct acpi_pci_devinfo));
 	AcpiWalkNamespace(ACPI_TYPE_DEVICE, acpi_get_handle(dev), 1,
 	    acpi_pci_save_handle, dev, NULL);
 

==== //depot/projects/ethng/src/sys/dev/acpica/acpi_pcib_acpi.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.54 2007/05/02 17:50:35 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.55 2007/09/30 11:05:14 marius Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -259,6 +259,9 @@
     struct acpi_hpcib_softc	*sc = device_get_softc(dev);
 
     switch (which) {
+    case PCIB_IVAR_DOMAIN:
+	*result = 0;
+	return (0);
     case PCIB_IVAR_BUS:
 	*result = sc->ap_bus;
 	return (0);
@@ -278,6 +281,8 @@
     struct acpi_hpcib_softc	*sc = device_get_softc(dev);
 
     switch (which) {
+    case PCIB_IVAR_DOMAIN:
+	return (EINVAL);
     case PCIB_IVAR_BUS:
 	sc->ap_bus = value;
 	return (0);

==== //depot/projects/ethng/src/sys/dev/bge/if_bge.c#2 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.197 2007/06/04 18:25:03 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.198 2007/09/30 11:05:14 marius Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -2181,13 +2181,14 @@
 bge_has_multiple_ports(struct bge_softc *sc)
 {
 	device_t dev = sc->bge_dev;
-	u_int b, s, f, fscan;
+	u_int b, d, f, fscan, s;
 
+	d = pci_get_domain(dev);
 	b = pci_get_bus(dev);
 	s = pci_get_slot(dev);
 	f = pci_get_function(dev);
 	for (fscan = 0; fscan <= PCI_FUNCMAX; fscan++)
-		if (fscan != f && pci_find_bsf(b, s, fscan) != NULL)
+		if (fscan != f && pci_find_dbsf(d, b, s, fscan) != NULL)
 			return (1);
 	return (0);
 }

==== //depot/projects/ethng/src/sys/dev/cardbus/cardbus.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.65 2007/05/16 23:40:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.66 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -162,12 +162,13 @@
 {
 	device_t brdev = device_get_parent(cbdev);
 	device_t child;
+	int bus, domain, slot, func;
 	int cardattached = 0;
-	int bus, slot, func;
 	int cardbusfunchigh = 0;
 
 	cardbus_detach_card(cbdev); /* detach existing cards */
 	POWER_ENABLE_SOCKET(brdev, cbdev);
+	domain = pcib_get_domain(cbdev);
 	bus = pcib_get_bus(cbdev);
 	slot = 0;
 	/* For each function, set it up and try to attach a driver to it */
@@ -175,7 +176,7 @@
 		struct cardbus_devinfo *dinfo;
 
 		dinfo = (struct cardbus_devinfo *)
-		    pci_read_device(brdev, bus, slot, func,
+		    pci_read_device(brdev, domain, bus, slot, func,
 			sizeof(struct cardbus_devinfo));
 		if (dinfo == NULL)
 			continue;

==== //depot/projects/ethng/src/sys/dev/pccbb/pccbb.c#2 (text+ko) ====

@@ -75,7 +75,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/pccbb/pccbb.c,v 1.164 2007/06/04 05:59:44 imp Exp $");

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 02:40:17 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ADE8B16A419; Wed,  3 Oct 2007 02:40:17 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4AEBB16A421
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 02:40:17 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4241013C447
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 02:40:17 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l932eHIZ066077
	for <perforce@freebsd.org>; Wed, 3 Oct 2007 02:40:17 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l932eEwl066074
	for perforce@freebsd.org; Wed, 3 Oct 2007 02:40:14 GMT
	(envelope-from imp@freebsd.org)
Date: Wed, 3 Oct 2007 02:40:14 GMT
Message-Id: <200710030240.l932eEwl066074@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127122 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 02:40:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=127122

Change 127122 by imp@imp_paco-paco on 2007/10/03 02:39:44

	IFC @127120

Affected files ...

.. //depot/projects/arm/src/Makefile.inc1#29 integrate
.. //depot/projects/arm/src/ObsoleteFiles.inc#28 integrate
.. //depot/projects/arm/src/UPDATING#20 integrate
.. //depot/projects/arm/src/cddl/lib/Makefile#4 integrate
.. //depot/projects/arm/src/cddl/sbin/zfs/Makefile#3 integrate
.. //depot/projects/arm/src/cddl/sbin/zpool/Makefile#3 integrate
.. //depot/projects/arm/src/cddl/usr.bin/Makefile#4 integrate
.. //depot/projects/arm/src/cddl/usr.bin/ztest/Makefile#3 integrate
.. //depot/projects/arm/src/cddl/usr.sbin/Makefile#4 integrate
.. //depot/projects/arm/src/cddl/usr.sbin/zdb/Makefile#3 integrate
.. //depot/projects/arm/src/contrib/gcc/opts.c#3 integrate
.. //depot/projects/arm/src/contrib/wpa_supplicant/main.c#3 integrate
.. //depot/projects/arm/src/etc/defaults/rc.conf#18 integrate
.. //depot/projects/arm/src/etc/rc.d/Makefile#10 integrate
.. //depot/projects/arm/src/etc/rc.d/cached#2 delete
.. //depot/projects/arm/src/etc/rc.d/nscd#3 integrate
.. //depot/projects/arm/src/include/Makefile#13 integrate
.. //depot/projects/arm/src/lib/libc/Makefile#7 integrate
.. //depot/projects/arm/src/lib/libc/gen/Makefile.inc#4 integrate
.. //depot/projects/arm/src/lib/libpthread/Makefile#6 integrate
.. //depot/projects/arm/src/lib/libthr/Makefile#8 integrate
.. //depot/projects/arm/src/lib/libutil/expand_number.3#2 integrate
.. //depot/projects/arm/src/lib/libutil/flopen.3#3 integrate
.. //depot/projects/arm/src/lib/libutil/humanize_number.3#4 integrate
.. //depot/projects/arm/src/lib/libutil/kld.3#3 integrate
.. //depot/projects/arm/src/libexec/atrun/Makefile#3 integrate
.. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#21 integrate
.. //depot/projects/arm/src/sbin/ggate/Makefile#4 integrate
.. //depot/projects/arm/src/share/man/man4/pci.4#3 integrate
.. //depot/projects/arm/src/share/man/man9/pci.9#2 integrate
.. //depot/projects/arm/src/share/man/man9/sleepqueue.9#4 integrate
.. //depot/projects/arm/src/share/misc/committers-src.dot#7 integrate
.. //depot/projects/arm/src/share/mk/bsd.libnames.mk#7 integrate
.. //depot/projects/arm/src/share/mk/bsd.prog.mk#4 integrate
.. //depot/projects/arm/src/sys/amd64/amd64/legacy.c#3 integrate
.. //depot/projects/arm/src/sys/amd64/include/legacyvar.h#3 integrate
.. //depot/projects/arm/src/sys/amd64/pci/pci_bus.c#10 integrate
.. //depot/projects/arm/src/sys/arm/arm/locore.S#24 integrate
.. //depot/projects/arm/src/sys/arm/conf/AVILA#15 integrate
.. //depot/projects/arm/src/sys/arm/xscale/i80321/i80321_pci.c#9 integrate
.. //depot/projects/arm/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/files.ixp425#11 integrate
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npe.c#12 integrate
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_npevar.h#10 integrate
.. //depot/projects/arm/src/sys/arm/xscale/ixp425/ixp425_pci.c#20 integrate
.. //depot/projects/arm/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch
.. //depot/projects/arm/src/sys/contrib/dev/npe/LICENSE#1 branch
.. //depot/projects/arm/src/sys/dev/acpica/acpi_pci.c#6 integrate
.. //depot/projects/arm/src/sys/dev/acpica/acpi_pcib_acpi.c#9 integrate
.. //depot/projects/arm/src/sys/dev/bge/if_bge.c#34 integrate
.. //depot/projects/arm/src/sys/dev/cardbus/cardbus.c#11 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbb.c#18 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbb_pci.c#11 integrate
.. //depot/projects/arm/src/sys/dev/pccbb/pccbbvar.h#7 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci.c#30 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#13 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci_private.h#13 integrate
.. //depot/projects/arm/src/sys/dev/pci/pci_user.c#5 integrate
.. //depot/projects/arm/src/sys/dev/pci/pcib_private.h#8 integrate
.. //depot/projects/arm/src/sys/dev/pci/pcivar.h#13 integrate
.. //depot/projects/arm/src/sys/geom/geom_event.c#4 integrate
.. //depot/projects/arm/src/sys/i386/i386/legacy.c#3 integrate
.. //depot/projects/arm/src/sys/i386/include/legacyvar.h#3 integrate
.. //depot/projects/arm/src/sys/i386/pci/pci_bus.c#9 integrate
.. //depot/projects/arm/src/sys/kern/kern_sx.c#14 integrate
.. //depot/projects/arm/src/sys/kern/sched_ule.c#25 integrate
.. //depot/projects/arm/src/sys/netinet/ip_fw2.c#37 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_asconf.c#15 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_constants.h#18 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_indata.c#21 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_input.c#22 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_output.c#21 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_output.h#9 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#21 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_timer.c#16 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#22 integrate
.. //depot/projects/arm/src/sys/netinet/sctp_var.h#13 integrate
.. //depot/projects/arm/src/sys/netinet/sctputil.c#23 integrate
.. //depot/projects/arm/src/sys/powerpc/powermac/grackle.c#3 integrate
.. //depot/projects/arm/src/sys/powerpc/powermac/uninorth.c#5 integrate
.. //depot/projects/arm/src/sys/sparc64/pci/apb.c#5 integrate
.. //depot/projects/arm/src/sys/sparc64/pci/ofw_pcibus.c#12 integrate
.. //depot/projects/arm/src/sys/sparc64/pci/psycho.c#13 integrate
.. //depot/projects/arm/src/sys/sun4v/sun4v/hv_pci.c#4 integrate
.. //depot/projects/arm/src/sys/sys/param.h#35 integrate
.. //depot/projects/arm/src/sys/sys/pciio.h#2 integrate
.. //depot/projects/arm/src/sys/vm/vm_object.c#23 integrate
.. //depot/projects/arm/src/sys/vm/vm_page.c#32 integrate
.. //depot/projects/arm/src/sys/vm/vm_page.h#15 integrate
.. //depot/projects/arm/src/tools/build/make_check/Makefile#2 integrate
.. //depot/projects/arm/src/tools/build/mk/OptionalObsoleteFiles.inc#8 integrate
.. //depot/projects/arm/src/tools/make_libdeps.sh#3 integrate
.. //depot/projects/arm/src/tools/tools/nanobsd/nanobsd.sh#9 integrate
.. //depot/projects/arm/src/tools/tools/pciroms/pciroms.c#2 integrate
.. //depot/projects/arm/src/usr.bin/Makefile#6 integrate
.. //depot/projects/arm/src/usr.sbin/Makefile#15 integrate
.. //depot/projects/arm/src/usr.sbin/bluetooth/bthidd/Makefile#3 integrate
.. //depot/projects/arm/src/usr.sbin/cached/Makefile#3 delete
.. //depot/projects/arm/src/usr.sbin/cached/agent.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agent.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/Makefile.inc#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/group.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/group.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/passwd.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/passwd.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/services.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/agents/services.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/cached.8#3 delete
.. //depot/projects/arm/src/usr.sbin/cached/cached.c#3 delete
.. //depot/projects/arm/src/usr.sbin/cached/cached.conf.5#3 delete
.. //depot/projects/arm/src/usr.sbin/cached/cachedcli.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/cachedcli.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/cachelib.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/cachelib.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/cacheplcs.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/cacheplcs.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/config.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/config.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/debug.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/debug.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/hashtable.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/log.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/log.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/mp_rs_query.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/mp_rs_query.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/mp_ws_query.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/mp_ws_query.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/parser.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/parser.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/protocol.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/protocol.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/query.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/query.h#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/singletons.c#2 delete
.. //depot/projects/arm/src/usr.sbin/cached/singletons.h#2 delete
.. //depot/projects/arm/src/usr.sbin/config/Makefile#4 integrate
.. //depot/projects/arm/src/usr.sbin/cron/cron/Makefile#3 integrate
.. //depot/projects/arm/src/usr.sbin/ngctl/Makefile#5 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/Makefile#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agent.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agent.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/Makefile.inc#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/group.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/group.h#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/passwd.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/passwd.h#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/services.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/agents/services.h#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/cachelib.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/cachelib.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/cacheplcs.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/cacheplcs.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/config.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/config.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/debug.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/hashtable.h#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/log.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/log.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/mp_rs_query.#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/mp_rs_query.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/mp_rs_query.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/mp_ws_query.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/mp_ws_query.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/nscd.8#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/nscd.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/nscd.conf.5#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/nscdcli.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/nscdcli.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/parser.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/parser.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/protocol.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/protocol.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/query.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/query.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/singletons.c#2 integrate
.. //depot/projects/arm/src/usr.sbin/nscd/singletons.h#3 integrate
.. //depot/projects/arm/src/usr.sbin/pciconf/pciconf.8#4 integrate
.. //depot/projects/arm/src/usr.sbin/pciconf/pciconf.c#3 integrate
.. //depot/projects/arm/src/usr.sbin/pmcstat/Makefile#3 integrate
.. //depot/projects/arm/src/usr.sbin/wpa/wpa_supplicant/Makefile#4 integrate
.. //depot/projects/arm/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate

Differences ...

==== //depot/projects/arm/src/Makefile.inc1#29 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.586 2007/10/01 18:24:46 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -330,8 +330,7 @@
 .endfor
 .for _dir in \
     lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc \
-    usr/share/snmp/defs usr/share/snmp/mibs
+    usr/libexec usr/sbin usr/share/misc
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -415,9 +414,7 @@
 	@echo ">>> stage 5.1: building 32 bit shim libraries"
 	@echo "--------------------------------------------------------------"
 .for _dir in \
-    lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc \
-    usr/share/snmp/defs usr/share/snmp/mibs
+    usr/include usr/lib32 usr/share/misc
 	mkdir -p ${LIB32TMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -1027,12 +1024,20 @@
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
-		lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \
+		lib/libopie lib/libpam ${_default_thread_lib} \
 		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
 		${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
 		${_secure_lib_libssl}
 
+.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no"
+_default_thread_lib=	lib/${DEFAULT_THREAD_LIB}
+.elif ${MK_LIBTHR} != "no"
+_default_thread_lib=	lib/libthr
+.elif ${MK_LIBPTHREAD} != "no"
+_default_thread_lib=	lib/libpthread
+.endif
+
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L

==== //depot/projects/arm/src/ObsoleteFiles.inc#28 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.111 2007/09/14 03:07:22 jkoshy Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.112 2007/09/29 22:37:40 bushman Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,11 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20070930: rename of cached to nscd
+OLD_FILES+=etc/rc.d/cached
+OLD_FILES+=usr/sbin/cached
+OLD_FILES+=usr/share/man/man5/cached.conf.5
+OLD_FILES+=usr/share/man/man8/cached.8
 # 20070807: removal of PowerPC specific header file.
 .if ${TARGET_ARCH} == "powerpc"
 OLD_FILES+=usr/include/machine/interruptvar.h

==== //depot/projects/arm/src/UPDATING#20 (text+ko) ====

@@ -21,6 +21,20 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070930:
+	The PCI code has been made aware of PCI domains. This means that
+	the location strings as used by pciconf(8) etc are now in the
+	following format: pci<domain>:<bus>:<device>[:<function>]. It
+	also means that consumers of <sys/pciio.h> potentially need to
+	be recompiled; this includes the hal and xorg-server ports.
+
+20070928:
+        The caching daemon (cached) was renamed to nscd. nscd.conf
+        configuration file should be used instead of cached.conf and
+        nscd_enable, nscd_pidfile and nscd_flags options should be used
+        instead of cached_enable, cached_pidfile and cached_flags in
+        rc.conf.
+
 20070704:
         The new IPsec code is now compiled in using the IPSEC option.  The
 	IPSEC option now requires "device crypto" be defined in your kernel
@@ -887,4 +901,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.503 2007/07/09 01:13:00 yongari Exp $
+$FreeBSD: src/UPDATING,v 1.505 2007/09/30 11:05:12 marius Exp $

==== //depot/projects/arm/src/cddl/lib/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,9 @@
 
 .if ${MK_ZFS} != "no"
 _libzfs=	libzfs
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _libzpool=	libzpool
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/arm/src/cddl/sbin/zfs/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
 
@@ -19,7 +19,9 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>

==== //depot/projects/arm/src/cddl/sbin/zpool/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
 
@@ -19,7 +19,9 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lavl -lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>

==== //depot/projects/arm/src/cddl/usr.bin/Makefile#4 (text+ko) ====

@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	${_ztest}
 
 .if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _ztest=	ztest
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/arm/src/cddl/usr.bin/ztest/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
 
@@ -15,7 +15,8 @@
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>

==== //depot/projects/arm/src/cddl/usr.sbin/Makefile#4 (text+ko) ====

@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	${_zdb}
 
 .if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _zdb=	zdb
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/arm/src/cddl/usr.sbin/zdb/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
 
@@ -16,7 +16,8 @@
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>

==== //depot/projects/arm/src/contrib/gcc/opts.c#3 (text+ko) ====

@@ -20,7 +20,7 @@
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/opts.c,v 1.3 2007/05/19 02:22:16 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/opts.c,v 1.5 2007/10/03 01:26:24 obrien Exp $ */
 
 #include "config.h"
 #include "system.h"
@@ -501,7 +501,10 @@
       flag_reorder_functions = 1;
       flag_tree_store_ccp = 1;
       flag_tree_store_copy_prop = 1;
-      flag_tree_vrp = 1;
+      /* XXX: some issues with ports have been traced to -ftree-vrp.
+         So remove it from -O2 and above.  Note that jdk1{5,6} are affected
+         and they build with w/-O3 - so we cannot just move it to -O3. */
+      // flag_tree_vrp = 1;
 
       if (!optimize_size)
 	{

==== //depot/projects/arm/src/contrib/wpa_supplicant/main.c#3 (text) ====

@@ -82,7 +82,7 @@
 	       "  -N = start describing new interface\n");
 
 	printf("example:\n"
-	       "  wpa_supplicant -Dwext -iwlan0 -c/etc/wpa_supplicant.conf\n");
+	       "  wpa_supplicant -Dbsd -iwlan0 -c/etc/wpa_supplicant.conf\n");
 #endif /* CONFIG_NO_STDOUT_DEBUG */
 }
 

==== //depot/projects/arm/src/etc/defaults/rc.conf#18 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.318 2007/09/28 10:38:08 bushman Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -495,7 +495,6 @@
 auditd_enable="NO"	# Run the audit daemon.
 auditd_program="/usr/sbin/auditd"	# Path to the audit daemon.
 auditd_flags=""		# Which options to pass to the audit daemon.
-cached_enable="NO"	# Run the nsswitch caching daemon.
 cron_enable="YES"	# Run the periodic job daemon.
 cron_program="/usr/sbin/cron"	# Which cron executable to run (if enabled).
 cron_dst="YES"		# Handle DST transitions intelligently (YES/NO)
@@ -503,6 +502,7 @@
 lpd_enable="NO"		# Run the line printer daemon.
 lpd_program="/usr/sbin/lpd"	# path to lpd, if you want a different one.
 lpd_flags=""		# Flags to lpd (if enabled).
+nscd_enable="NO"	# Run the nsswitch caching daemon.
 chkprintcap_enable="NO"	# Run chkprintcap(8) before running lpd.
 chkprintcap_flags="-d"	# Create missing directories by default.
 dumpdev="AUTO"		# Device to crashdump to (device name, AUTO, or NO).

==== //depot/projects/arm/src/etc/rc.d/Makefile#10 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.83 2007/09/07 15:44:09 mlaier Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $
 
 .include <bsd.own.mk>
 
@@ -48,7 +48,7 @@
 .endif
 
 .if ${MK_NS_CACHING} != "no"
-FILES+= cached
+FILES+= nscd
 .endif
 
 FILESDIR=	/etc/rc.d

==== //depot/projects/arm/src/etc/rc.d/nscd#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: src/etc/rc.d/nscd,v 1.4 2007/08/09 13:06:11 bushman Exp $
+# $FreeBSD: src/etc/rc.d/nscd,v 1.6 2007/09/28 10:38:08 bushman Exp $
 #
 
 # PROVIDE: nscd
@@ -8,7 +8,7 @@
 # BEFORE: LOGIN
 
 #
-# Add the following lines to /etc/rc.conf to enable cached:
+# Add the following lines to /etc/rc.conf to enable nscd:
 #
 # nscd_enable="YES"
 #
@@ -24,9 +24,29 @@
 extra_commands="flush"
 flush_cmd="${command} -I all"
 
-nscd_enable=${nscd_enable:-"NO"}
-nscd_pidfile=${nscd_pidfile:-"/var/run/nscd.pid"}
-nscd_flags=${nscd_flags:-""}
+# usage: _nscd_set_option <option name> <default value>
+#
+_nscd_set_option() {
+	local _optname _defoptval _nscd_opt_val _cached_opt_val
+	_optname=$1
+	_defoptval=$2
+
+	_nscd_opt_val=$(eval "echo \$nscd_${_optname}")
+	_cached_opt_val=$(eval "echo \$cached_${_optname}")
+	
+	if [ -n "$_cached_opt_val" -a "$_nscd_opt_val" != "$_defoptval" ]; then
+		warn "You should use nscd_${_optname} instead of" \
+		    "cached_${_optname}"
+		setvar "nscd_${_optname}" "$_cached_opt_val"
+	else
+		setvar "nscd_${_optname}" "${_nscd_opt_val:-$_defoptval}"
+	fi
+}
+
 
 load_rc_config $name
+_nscd_set_option "enable" "NO"
+_nscd_set_option "pidfile" "/var/run/nscd.pid"
+_nscd_set_option "flags" ""
 run_rc_command "$1"
+

==== //depot/projects/arm/src/include/Makefile#13 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.275 2007/09/23 07:34:21 pjd Exp $
+# $FreeBSD: src/include/Makefile,v 1.276 2007/10/01 18:07:29 ru Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -45,11 +45,13 @@
 LSUBDIRS=	cam/scsi \
 	dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
 	dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \
-	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
+	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
+	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
 	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
 	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
-	geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe geom/virstor \
+	geom/mirror geom/multipath geom/nop \
+	geom/raid3 geom/shsec geom/stripe geom/virstor \
 	netgraph/atm netgraph/netflow \
 	security/audit \
 	security/mac_biba security/mac_bsdextended security/mac_lomac \

==== //depot/projects/arm/src/lib/libc/Makefile#7 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.72 2007/05/19 16:38:39 kan Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.73 2007/10/01 18:15:10 ru Exp $
 
 SHLIBDIR?= /lib
 
@@ -23,6 +23,7 @@
 #
 # Only link with static libgcc.a (no libgcc_eh.a).
 #
+DPADD+=	${LIBGCC}
 LDFLAGS+= -nodefaultlibs
 LDADD+= -lgcc
 

==== //depot/projects/arm/src/lib/libc/gen/Makefile.inc#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile.inc	8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.127 2007/07/04 23:27:38 peter Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.128 2007/09/28 02:22:56 scf Exp $
 
 # machine-independent gen sources
 .PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
@@ -85,7 +85,8 @@
 	fpclassify.3 isnormal.3
 MLINKS+=frexp.3 frexpf.3 frexp.3 frexpl.3
 MLINKS+=fts.3 fts_children.3 fts.3 fts_close.3 fts.3 fts_open.3 \
-	fts.3 fts_read.3 fts.3 fts_set.3
+	fts.3 fts_read.3 fts.3 fts_set.3 fts.3 fts_set_clientptr.3 \
+	fts.3 fts_get_clientptr.3 fts.3 fts_get_stream.3
 MLINKS+=ftw.3 nftw.3
 MLINKS+=getcap.3 cgetcap.3 getcap.3 cgetclose.3 getcap.3 cgetent.3 \
 	getcap.3 cgetfirst.3 getcap.3 cgetmatch.3 getcap.3 cgetnext.3 \

==== //depot/projects/arm/src/lib/libpthread/Makefile#6 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libpthread/Makefile,v 1.63 2007/05/21 02:49:06 deischen Exp $
+# $FreeBSD: src/lib/libpthread/Makefile,v 1.64 2007/10/01 18:22:31 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -11,7 +11,8 @@
 
 .include <bsd.own.mk>
 
-.if ${DEFAULT_THREAD_LIB} == "libpthread" && ${SHLIBDIR} == "/usr/lib"
+.if (${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no") && \
+    ${SHLIBDIR} == "/usr/lib"
 SHLIBDIR= /lib
 .endif
 
@@ -47,7 +48,7 @@
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${DEFAULT_THREAD_LIB} == "libpthread"
+.if ${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so

==== //depot/projects/arm/src/lib/libthr/Makefile#8 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/Makefile,v 1.26 2007/06/08 02:21:13 davidxu Exp $
+# $FreeBSD: src/lib/libthr/Makefile,v 1.27 2007/10/01 18:29:55 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -10,7 +10,8 @@
 
 .include <bsd.own.mk>
 
-.if ${DEFAULT_THREAD_LIB} == "libthr" && ${SHLIBDIR} == "/usr/lib"
+.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no") && \
+    ${SHLIBDIR} == "/usr/lib"
 SHLIBDIR= /lib
 .endif
 
@@ -43,7 +44,7 @@
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${DEFAULT_THREAD_LIB} == "libthr"
+.if ${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so

==== //depot/projects/arm/src/lib/libutil/expand_number.3#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/lib/libutil/expand_number.3,v 1.2 2007/09/05 14:25:16 pjd Exp $
+.\" $FreeBSD: src/lib/libutil/expand_number.3,v 1.3 2007/09/28 15:31:44 obrien Exp $
 .\"
 .Dd April 16, 2007
 .Dt EXPAND_NUMBER 3
@@ -83,4 +83,4 @@
 The
 .Fn expand_number
 function first appeared in
-.Fx 7.0 .
+.Fx 6.3 .

==== //depot/projects/arm/src/lib/libutil/flopen.3#3 (text+ko) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libutil/flopen.3,v 1.5 2007/08/03 09:20:28 des Exp $
+.\" $FreeBSD: src/lib/libutil/flopen.3,v 1.6 2007/09/28 15:31:44 obrien Exp $
 .\"
 .Dd May 10, 2007
 .Dt FLOPEN 3
@@ -93,6 +93,11 @@
 .Xr errno 2 ,
 .Xr flock 2 ,
 .Xr open 2
+.Sh HISTORY
+The
+.Fn flopen
+function first appeared in
+.Fx 6.3 .
 .Sh AUTHORS
 .An -nosplit
 The

==== //depot/projects/arm/src/lib/libutil/humanize_number.3#4 (text+ko) ====

@@ -1,5 +1,5 @@
 .\"	$NetBSD: humanize_number.3,v 1.4 2003/04/16 13:34:37 wiz Exp $
-.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.11 2007/09/05 14:25:16 pjd Exp $
+.\" $FreeBSD: src/lib/libutil/humanize_number.3,v 1.12 2007/09/28 15:31:44 obrien Exp $
 .\"
 .\" Copyright (c) 1999, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -147,9 +147,11 @@
 .Dv HN_GETSCALE
 is specified, the prefix index number will be returned instead.
 .Sh SEE ALSO
-.Xr expand_number 3 
+.Xr expand_number 3
 .Sh HISTORY
 The
 .Fn humanize_number
 function first appeared in
-.Nx 2.0 .
+.Nx 2.0
+and then in
+.Fx 5.3 .

==== //depot/projects/arm/src/lib/libutil/kld.3#3 (text) ====

@@ -23,7 +23,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/lib/libutil/kld.3,v 1.3 2006/09/30 10:34:13 ru Exp $
+.\" $FreeBSD: src/lib/libutil/kld.3,v 1.4 2007/09/28 15:31:44 obrien Exp $
 .\"
 .Dd February 18, 2006
 .Os
@@ -83,7 +83,7 @@
 and
 .Fn kld_load
 functions first appeared in
-.Fx 7.0 .
+.Fx 6.3 .
 .Sh AUTHORS
 The
 .Fn kld_isloaded

==== //depot/projects/arm/src/libexec/atrun/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/libexec/atrun/Makefile,v 1.14 2007/06/15 12:02:16 yar Exp $
+# $FreeBSD: src/libexec/atrun/Makefile,v 1.15 2007/10/01 18:17:23 ru Exp $
 
 MAINSRC=${.CURDIR}/../../usr.bin/at
 
@@ -16,7 +16,7 @@
 WFORMAT=0
 
 DPADD=	${LIBPAM} ${LIBUTIL}
-LDADD=	-lpam -lutil
+LDADD=	${MINUSLPAM} -lutil
 
 atrun.8: atrun.man
 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \

==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#21 (text+ko) ====

@@ -20,7 +20,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1065 2007/09/15 05:37:31 jkoshy Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1067 2007/09/28 05:14:39 bmah Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -1366,6 +1366,12 @@
 	utility has been added to control the behavior of disk devices
 	using this feature.</para>
 
+      <para>A new <literal>GEOM_VIRSTOR</literal> class has been added
+	to provide virtual storage devices of arbitrary size with
+	physical devices as backing store.  More information can be
+	found in the manual page for its control utility,
+	&man.gvirstor.8;.</para>
+
       <para>A new GEOM class <literal>GEOM_ZERO</literal> has been added.
 	It creates a very huge provider (41PB) <filename>/dev/gzero</filename>
 	and is mainly useful for performance testing.
@@ -1549,8 +1555,8 @@
       MIB described in RFC 2790.  &merged;</para>
 
     <para>The &man.camcontrol.8; utility now supports
-      a <command>readcap</command> to display the size of
-      devices.</para>
+      a <command>readcap</command> command to display the size of
+      devices. &merged;</para>
 
     <para>The &man.cmp.1; utility now supports an <option>-h</option>
       flag to compare the symbolic link itself rather than the
@@ -1902,7 +1908,7 @@
     <para>The objformat(1) utility and getobjformat(3) library (the
       last remnants of a.out object file support) have been removed.</para>
 
-    <para>The &man.pam.nologin.8; module no longer provides a
+    <para>The &man.pam.nologin.8; module no longer provides
       an authentication function; instead it now provides an account
       management function.  Third-party files in
       <filename>/usr/local/etc/pam.d</filename> may  

==== //depot/projects/arm/src/sbin/ggate/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sbin/ggate/Makefile,v 1.7 2006/11/26 14:36:33 ru Exp $
+# $FreeBSD: src/sbin/ggate/Makefile,v 1.8 2007/10/01 18:22:31 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -6,8 +6,7 @@
 	${_ggated} \
 	ggatel
 
-.if ${MK_LIBTHR} != "no" || \
-    (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")   
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _ggatec=	ggatec
 _ggated=	ggated
 .endif

==== //depot/projects/arm/src/share/man/man4/pci.4#3 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/pci.4,v 1.18 2007/04/07 14:36:18 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/pci.4,v 1.19 2007/09/30 11:05:12 marius Exp $
 .\"
-.Dd October 24, 1999
+.Dd September 30, 2007
 .Dt PCI 4
 .Os
 .Sh NAME
@@ -109,7 +109,7 @@
 .Bl -tag -width pd_vendor
 .It pc_sel
 .Tn PCI
-bus, slot and function.
+domain, bus, slot and function.
 .It pd_name
 .Tn PCI
 device driver name.
@@ -150,7 +150,7 @@
 .Bl -tag -width pc_subvendor
 .It pc_sel
 .Tn PCI
-bus, slot and function.
+domain, bus, slot and function.
 .It pc_hdr
 .Tn PCI
 header type.
@@ -257,9 +257,10 @@
 .It pi_sel
 A
 .Va pcisel
-structure which specifies the bus, slot and function the user would like to
-query.
-If the specific bus is not found, errno will be set to ENODEV and -1 returned from the ioctl.
+structure which specifies the domain, bus, slot and function the user would
+like to query.
+If the specific bus is not found, errno will be set to ENODEV and -1 returned
+from the ioctl.
 .It pi_reg
 The
 .Tn PCI

==== //depot/projects/arm/src/share/man/man9/pci.9#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/man9/pci.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/pci.9,v 1.10 2007/09/30 11:05:13 marius Exp $
 .\"
-.Dd January 22, 2005
+.Dd September 30, 2007
 .Dt PCI 9
 .Os
 .Sh NAME
@@ -39,6 +39,7 @@
 .Nm pci_set_powerstate ,
 .Nm pci_get_powerstate ,
 .Nm pci_find_bsf ,
+.Nm pci_find_dbsf ,
 .Nm pci_find_device
 .Nd PCI bus interface
 .Sh SYNOPSIS
@@ -65,6 +66,8 @@
 .Ft device_t
 .Fn pci_find_bsf "uint8_t bus" "uint8_t slot" "uint8_t func"
 .Ft device_t
+.Fn pci_find_dbsf "uint32_t domain" "uint8_t bus" "uint8_t slot" "uint8_t func"
+.Ft device_t
 .Fn pci_find_device "uint16_t vendor" "uint16_t device"
 .Sh DESCRIPTION
 The
@@ -198,6 +201,30 @@
 number actually refers to the number of the device on the bus,
 which does not necessarily indicate its geographic location
 in terms of a physical slot.
+Note that in case the system has multiple PCI domains,
+the
+.Fn pci_find_bsf
+function only searches the first one.
+Actually, it is equivalent to:
+.Bd -literal -offset indent
+pci_find_dbsf(0, bus, slot, func);
+.Ed
+.Pp
+The
+.Fn pci_find_dbsf
+function looks up the
+.Vt device_t
+of a PCI device, given its
+.Fa domain ,
+.Fa bus ,
+.Fa slot ,
+and
+.Fa func .
+The
+.Fa slot
+number actually refers to the number of the device on the bus,
+which does not necessarily indicate its geographic location
+in terms of a physical slot.
 .Pp
 The
 .Fn pci_find_device

==== //depot/projects/arm/src/share/man/man9/sleepqueue.9#4 (text+ko) ====

@@ -21,9 +21,9 @@
 .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
 .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man9/sleepqueue.9,v 1.15 2007/03/09 22:41:01 jhb Exp $
+.\" $FreeBSD: src/share/man/man9/sleepqueue.9,v 1.16 2007/09/28 11:13:40 gabor Exp $
 .\"
-.Dd March 10, 2004
+.Dd August 13, 2007
 .Dt SLEEPQUEUE 9
 .Os
 .Sh NAME
@@ -54,11 +54,11 @@
 .Ft void
 .Fn sleepq_abort "struct thread *td"
 .Ft void
-.Fn sleepq_add "void *wchan" "struct lock_object *lock" "const char *wmesg" "int flags"
+.Fn sleepq_add "void *wchan" "struct lock_object *lock" "const char *wmesg" "int flags" "int queue"
 .Ft struct sleepqueue *
 .Fn sleepq_alloc "void"
 .Ft void
-.Fn sleepq_broadcast "void *wchan" "int flags" "int pri"
+.Fn sleepq_broadcast "void *wchan" "int flags" "int pri" "int queue"
 .Ft int
 .Fn sleepq_calc_signal_retval "int sig"
 .Ft int
@@ -74,7 +74,7 @@
 .Ft void
 .Fn sleepq_remove "struct thread *td" "void *wchan"
 .Ft void
-.Fn sleepq_signal "void *wchan" "int flags" "int pri"

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 08:49:12 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1854C16A474; Wed,  3 Oct 2007 08:49:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BE50A16A46B
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 08:49:11 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B38A713C4C8
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 08:49:11 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l938nBkO009480
	for <perforce@freebsd.org>; Wed, 3 Oct 2007 08:49:11 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l938nBeZ009477
	for perforce@freebsd.org; Wed, 3 Oct 2007 08:49:11 GMT
	(envelope-from thompsa@freebsd.org)
Date: Wed, 3 Oct 2007 08:49:11 GMT
Message-Id: <200710030849.l938nBeZ009477@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127127 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 08:49:12 -0000

http://perforce.freebsd.org/chv.cgi?CH=127127

Change 127127 by thompsa@thompsa_heff on 2007/10/03 08:48:35

	Pass all state changes through ieee80211_newstate.

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#35 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#35 (text+ko) ====

@@ -851,14 +851,13 @@
 	switch (nstate) {
 	case IEEE80211_S_SCAN:
 	case IEEE80211_S_RUN:
-		return (*sc->sc_newstate)(ic, nstate, arg);
+		break;
 
 	case IEEE80211_S_INIT:
 		if (sc->flags & IPW_FLAG_ASSOCIATED)
 			taskqueue_enqueue_fast(taskqueue_fast,
 			    &sc->sc_disassoc_task);
-
-		return sc->sc_newstate(ic, nstate, arg);
+		break;
 
 	case IEEE80211_S_AUTH:
 		taskqueue_enqueue_fast(taskqueue_fast, &sc->sc_assoc_task);
@@ -877,9 +876,7 @@
 	default:
 		break;
 	}
-	ic->ic_state = nstate;
-
-	return 0;
+	return (*sc->sc_newstate)(ic, nstate, arg);
 }
 
 /*

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 20:32:30 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B159516A421; Wed,  3 Oct 2007 20:32:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6895D16A41A
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 20:32:29 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4504C13C4A6
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 20:32:29 +0000 (UTC)
	(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93KWT7g083476
	for <perforce@freebsd.org>; Wed, 3 Oct 2007 20:32:29 GMT
	(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93KWTjm083473
	for perforce@freebsd.org; Wed, 3 Oct 2007 20:32:29 GMT
	(envelope-from thompsa@freebsd.org)
Date: Wed, 3 Oct 2007 20:32:29 GMT
Message-Id: <200710032032.l93KWTjm083473@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127136 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 20:32:30 -0000

http://perforce.freebsd.org/chv.cgi?CH=127136

Change 127136 by thompsa@thompsa_heff on 2007/10/03 20:32:00

	Fix adhoc mode.
	
	Obtained from:	sam

Affected files ...

.. //depot/projects/wifi/sys/dev/ipw/if_ipw.c#36 edit

Differences ...

==== //depot/projects/wifi/sys/dev/ipw/if_ipw.c#36 (text+ko) ====

@@ -849,8 +849,20 @@
 		ieee80211_state_name[nstate], sc->flags));
 
 	switch (nstate) {
-	case IEEE80211_S_SCAN:
 	case IEEE80211_S_RUN:
+		if (ic->ic_opmode == IEEE80211_M_IBSS) {
+			/*
+			 * XXX when joining an ibss network we are called
+			 * with a SCAN -> RUN transition on scan complete.
+			 * Use that to call ipw_auth_and_assoc.  On completing
+			 * the join we are then called again with an
+			 * AUTH -> RUN transition and we want to do nothing.
+			 * This is all totally bogus and needs to be redone.
+			 */
+			if (ic->ic_state == IEEE80211_S_SCAN)
+				taskqueue_enqueue_fast(taskqueue_fast,
+				    &sc->sc_assoc_task);
+		}
 		break;
 
 	case IEEE80211_S_INIT:
@@ -967,12 +979,13 @@
 	case IPW_STATE_ASSOCIATED:
 		DPRINTFN(2, ("Association succeeded (%s flags 0x%x)\n",
 			IEEESTATE(ic), sc->flags));
-		if (sc->flags & IPW_FLAG_SCANNING) {
-			ieee80211_cancel_scan(ic);
-			sc->flags &= ~IPW_FLAG_SCANNING;
-		}
 		sc->flags |= IPW_FLAG_ASSOCIATED;
-		ieee80211_new_state(ic, IEEE80211_S_RUN, -1);
+		/* XXX suppress state change in case the fw auto-associates */
+		if (ic->ic_state != IEEE80211_S_ASSOC) {
+			DPRINTF(("Unexpected association (state %u)\n",
+				ic->ic_state));
+		} else
+			ieee80211_new_state(ic, IEEE80211_S_RUN, -1);
 		break;
 
 	case IPW_STATE_SCANNING:
@@ -2794,8 +2807,7 @@
 	IPW_LOCK_DECL;
 
 	IPW_LOCK(sc);
-	if (ic->ic_opmode == IEEE80211_M_IBSS ||
-	    ic->ic_opmode == IEEE80211_M_MONITOR) {
+	if (ic->ic_opmode == IEEE80211_M_MONITOR) {
 		ipw_disable(sc);
 		ipw_setchannel(sc, ic->ic_curchan);
 		ipw_enable(sc);

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 20:37:39 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 63F9816A475; Wed,  3 Oct 2007 20:37:39 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1207D16A419
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 20:37:39 +0000 (UTC)
	(envelope-from delphij@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A272413C45D
	for <perforce@freebsd.org>; Wed,  3 Oct 2007 20:37:36 +0000 (UTC)
	(envelope-from delphij@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93KbafN083698
	for <perforce@freebsd.org>; Wed, 3 Oct 2007 20:37:36 GMT
	(envelope-from delphij@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93KbYug083695
	for perforce@freebsd.org; Wed, 3 Oct 2007 20:37:34 GMT
	(envelope-from delphij@freebsd.org)
Date: Wed, 3 Oct 2007 20:37:34 GMT
Message-Id: <200710032037.l93KbYug083695@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	delphij@freebsd.org using -f
From: Xin LI <delphij@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127137 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 20:37:39 -0000

http://perforce.freebsd.org/chv.cgi?CH=127137

Change 127137 by delphij@tarsier on 2007/10/03 20:37:04

	IFC

Affected files ...

.. //depot/projects/delphij_fork/sys/amd64/amd64/legacy.c#2 integrate
.. //depot/projects/delphij_fork/sys/amd64/conf/GENERIC#2 integrate
.. //depot/projects/delphij_fork/sys/amd64/include/legacyvar.h#2 integrate
.. //depot/projects/delphij_fork/sys/amd64/include/vmparam.h#2 integrate
.. //depot/projects/delphij_fork/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/delphij_fork/sys/arm/conf/AVILA#2 integrate
.. //depot/projects/delphij_fork/sys/arm/include/vmparam.h#2 integrate
.. //depot/projects/delphij_fork/sys/arm/xscale/i80321/i80321_pci.c#3 integrate
.. //depot/projects/delphij_fork/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/delphij_fork/sys/arm/xscale/ixp425/ixp425_npe.c#2 integrate
.. //depot/projects/delphij_fork/sys/arm/xscale/ixp425/ixp425_npevar.h#2 integrate
.. //depot/projects/delphij_fork/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/delphij_fork/sys/compat/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/delphij_fork/sys/conf/NOTES#11 integrate
.. //depot/projects/delphij_fork/sys/contrib/dev/acpica/evmisc.c#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/dev/acpica/evxface.c#2 integrate
.. //depot/projects/delphij_fork/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch
.. //depot/projects/delphij_fork/sys/contrib/dev/npe/LICENSE#1 branch
.. //depot/projects/delphij_fork/sys/dev/acpica/acpi_ec.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/cardbus/cardbus.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/gem/if_gem.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/gem/if_gemreg.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/gem/if_gemvar.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/pccbb/pccbb.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/pccbb/pccbb_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/pccbb/pccbbvar.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/pci/pci.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/pci/pci_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/pci/pci_private.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/delphij_fork/sys/dev/pci/pcib_private.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/pci/pcivar.h#2 integrate
.. //depot/projects/delphij_fork/sys/dev/usb/if_axe.c#3 integrate
.. //depot/projects/delphij_fork/sys/dev/usb/if_axereg.h#3 integrate
.. //depot/projects/delphij_fork/sys/geom/geom_event.c#2 integrate
.. //depot/projects/delphij_fork/sys/i386/conf/GENERIC#2 integrate
.. //depot/projects/delphij_fork/sys/i386/i386/legacy.c#2 integrate
.. //depot/projects/delphij_fork/sys/i386/include/legacyvar.h#2 integrate
.. //depot/projects/delphij_fork/sys/i386/include/vmparam.h#2 integrate
.. //depot/projects/delphij_fork/sys/i386/pci/pci_bus.c#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/delphij_fork/sys/ia64/include/vmparam.h#2 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_exec.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/kern_sx.c#3 integrate
.. //depot/projects/delphij_fork/sys/kern/sched_ule.c#7 integrate
.. //depot/projects/delphij_fork/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/delphij_fork/sys/modules/Makefile#6 integrate
.. //depot/projects/delphij_fork/sys/modules/acpi/acpi/Makefile#2 integrate
.. //depot/projects/delphij_fork/sys/netinet/ip_fw2.c#6 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_asconf.c#10 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_constants.h#8 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_indata.c#8 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_input.c#11 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_output.c#10 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_output.h#4 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_pcb.c#10 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_timer.c#8 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_usrreq.c#11 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctp_var.h#7 integrate
.. //depot/projects/delphij_fork/sys/netinet/sctputil.c#10 integrate
.. //depot/projects/delphij_fork/sys/netinet/tcp_timer.c#3 integrate
.. //depot/projects/delphij_fork/sys/nfsclient/nfs_bio.c#2 integrate
.. //depot/projects/delphij_fork/sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/delphij_fork/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/delphij_fork/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/delphij_fork/sys/powerpc/conf/NOTES#2 integrate
.. //depot/projects/delphij_fork/sys/powerpc/include/vmparam.h#2 integrate
.. //depot/projects/delphij_fork/sys/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/delphij_fork/sys/powerpc/powermac/uninorth.c#2 integrate
.. //depot/projects/delphij_fork/sys/sparc64/conf/GENERIC#2 integrate
.. //depot/projects/delphij_fork/sys/sparc64/include/vmparam.h#2 integrate
.. //depot/projects/delphij_fork/sys/sparc64/pci/apb.c#2 integrate
.. //depot/projects/delphij_fork/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/delphij_fork/sys/sparc64/pci/psycho.c#4 integrate
.. //depot/projects/delphij_fork/sys/sun4v/conf/GENERIC#2 integrate
.. //depot/projects/delphij_fork/sys/sun4v/include/vmparam.h#2 integrate
.. //depot/projects/delphij_fork/sys/sun4v/sun4v/hv_pci.c#2 integrate
.. //depot/projects/delphij_fork/sys/sys/param.h#3 integrate
.. //depot/projects/delphij_fork/sys/sys/pciio.h#2 integrate
.. //depot/projects/delphij_fork/sys/sys/vmmeter.h#3 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_contig.c#2 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_fault.c#5 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_map.c#3 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_object.c#2 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_object.h#2 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_page.c#5 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_page.h#3 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_pageout.c#3 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_pageq.c#2 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_phys.c#3 integrate
.. //depot/projects/delphij_fork/sys/vm/vm_phys.h#3 integrate

Differences ...

==== //depot/projects/delphij_fork/sys/amd64/amd64/legacy.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.60 2007/03/20 20:21:44 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.61 2007/09/30 11:05:13 marius Exp $");
 
 /*
  * This code implements a system driver for legacy systems that do not
@@ -207,6 +207,9 @@
 	struct legacy_device *atdev = DEVTOAT(child);
 
 	switch (which) {
+	case LEGACY_IVAR_PCIDOMAIN:
+		*result = 0;
+		break;
 	case LEGACY_IVAR_PCIBUS:
 		*result = atdev->lg_pcibus;
 		break;
@@ -223,6 +226,8 @@
 	struct legacy_device *atdev = DEVTOAT(child);
 
 	switch (which) {
+	case LEGACY_IVAR_PCIDOMAIN:
+		return EINVAL;
 	case LEGACY_IVAR_PCIBUS:
 		atdev->lg_pcibus = value;
 		break;

==== //depot/projects/delphij_fork/sys/amd64/conf/GENERIC#2 (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.483 2007/07/01 21:47:45 njl Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484 2007/09/26 20:05:06 brueffer Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -30,7 +30,7 @@
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options 	SCTP			# Stream Transmission Control Protocol 
+options 	SCTP			# Stream Control Transmission Protocol 
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
 options 	UFS_ACL			# Support for access control lists

==== //depot/projects/delphij_fork/sys/amd64/include/legacyvar.h#2 (text+ko) ====

@@ -23,19 +23,21 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.7 2005/09/18 01:42:43 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.8 2007/09/30 11:05:13 marius Exp $
  */
 
 #ifndef _MACHINE_LEGACYVAR_H_
 #define	_MACHINE_LEGACYVAR_H_
 
 enum legacy_device_ivars {
+	LEGACY_IVAR_PCIDOMAIN,
 	LEGACY_IVAR_PCIBUS
 };
 
 #define LEGACY_ACCESSOR(var, ivar, type)				\
     __BUS_ACCESSOR(legacy, var, LEGACY, ivar, type)
 
+LEGACY_ACCESSOR(pcidomain,		PCIDOMAIN,	uint32_t)
 LEGACY_ACCESSOR(pcibus,			PCIBUS,		uint32_t)
 
 #undef LEGACY_ACCESSOR

==== //depot/projects/delphij_fork/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.48 2007/06/03 23:18:29 alc Exp $
+ * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.49 2007/09/25 06:25:04 alc Exp $
  */
 
 
@@ -101,12 +101,13 @@
 #define	VM_PHYSSEG_MAX		31
 
 /*
- * Create two free page pools: VM_FREEPOOL_DEFAULT is the default pool
+ * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool
  * from which physical pages are allocated and VM_FREEPOOL_DIRECT is
  * the pool from which physical pages for page tables and small UMA
  * objects are allocated.
  */
-#define	VM_NFREEPOOL		2
+#define	VM_NFREEPOOL		3
+#define	VM_FREEPOOL_CACHE	2
 #define	VM_FREEPOOL_DEFAULT	0
 #define	VM_FREEPOOL_DIRECT	1
 

==== //depot/projects/delphij_fork/sys/amd64/pci/pci_bus.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.121 2007/05/02 17:50:34 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.122 2007/09/30 11:05:13 marius Exp $");
 
 #include "opt_cpu.h"
 
@@ -276,6 +276,9 @@
 {
 
 	switch (which) {
+	case  PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return 0;
 	case  PCIB_IVAR_BUS:
 		*result = legacy_get_pcibus(dev);
 		return 0;
@@ -289,6 +292,8 @@
 {
 
 	switch (which) {
+	case  PCIB_IVAR_DOMAIN:
+		return EINVAL;
 	case  PCIB_IVAR_BUS:
 		legacy_set_pcibus(dev, value);
 		return 0;

==== //depot/projects/delphij_fork/sys/arm/arm/locore.S#2 (text+ko) ====

@@ -37,7 +37,7 @@
 #include <machine/asm.h>
 #include <machine/armreg.h>
 #include <machine/pte.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.16 2007/02/26 02:03:48 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.17 2007/09/27 20:52:17 cognet Exp $");
 
 /* What size should this really be ? It is only used by initarm() */
 #define INIT_ARM_STACK_SIZE	2048
@@ -134,7 +134,7 @@
 	adds	r1, r1, #-1
 	bhi	2b
 3:
-	ldmia	r4!, {r1,r2,r3}   /* # of sections, PA|attr, VA */
+	ldmia	r4!, {r1,r2,r3}   /* # of sections, VA, PA|attr */
 	cmp	r1, #0
 	adrne	r5, 2b
 	bicne	r5, r5, #0xff000000

==== //depot/projects/delphij_fork/sys/arm/conf/AVILA#2 (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/arm/conf/AVILA,v 1.4 2007/05/24 16:27:48 sam Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.6 2007/09/27 22:39:49 cognet Exp $
 
 machine		arm
 ident		AVILA
@@ -104,8 +104,8 @@
 device		avila_ata	# Gateworks CF/IDE support
 
 device		npe		# Network Processing Engine
-device		npe_fw		# NPE firmware
-device		firmware	# firmware support for npe_fw
+device		npe_fw
+device		firmware
 device		qmgr		# Q Manager (required by npe)
 device		miibus		# NB: required by npe
 device		ether

==== //depot/projects/delphij_fork/sys/arm/include/vmparam.h#2 (text+ko) ====

@@ -28,7 +28,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.10 2007/06/04 08:02:22 alc Exp $
+ * $FreeBSD: src/sys/arm/include/vmparam.h,v 1.11 2007/09/25 06:25:04 alc Exp $
  */
 
 #ifndef	_MACHINE_VMPARAM_H_
@@ -59,12 +59,13 @@
 #define	VM_PHYSSEG_DENSE
 
 /*
- * Create two free page pools: VM_FREEPOOL_DEFAULT is the default pool
+ * Create three free page pools: VM_FREEPOOL_DEFAULT is the default pool
  * from which physical pages are allocated and VM_FREEPOOL_DIRECT is
  * the pool from which physical pages for small UMA objects are
  * allocated.
  */
-#define	VM_NFREEPOOL		2
+#define	VM_NFREEPOOL		3
+#define	VM_FREEPOOL_CACHE	2
 #define	VM_FREEPOOL_DEFAULT	0
 #define	VM_FREEPOOL_DIRECT	1
 

==== //depot/projects/delphij_fork/sys/arm/xscale/i80321/i80321_pci.c#3 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.11 2007/07/27 14:53:42 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.12 2007/09/30 11:05:13 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -250,8 +250,10 @@
 {
 	struct i80321_pci_softc *sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
-
 		*result = sc->sc_busno;
 		return (0);
 		
@@ -265,6 +267,8 @@
 	struct i80321_pci_softc * sc = device_get_softc(dev);
 
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_busno = result;
 		return (0);

==== //depot/projects/delphij_fork/sys/arm/xscale/i8134x/i81342_pci.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -481,8 +481,10 @@
 {
 	struct i81342_pci_softc *sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
-
 		*result = sc->sc_busno;
 		return (0);
 		
@@ -496,6 +498,8 @@
 	struct i81342_pci_softc * sc = device_get_softc(dev);
 
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_busno = result;
 		return (0);

==== //depot/projects/delphij_fork/sys/arm/xscale/ixp425/files.ixp425#2 (text+ko) ====

@@ -1,4 +1,4 @@
-#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.2 2006/12/07 00:49:33 sam Exp $
+#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.4 2007/09/27 22:39:49 cognet Exp $
 arm/arm/cpufunc_asm_xscale.S		standard
 arm/arm/irq_dispatch.S			standard
 arm/xscale/ixp425/ixp425.c		standard
@@ -16,12 +16,7 @@
 arm/xscale/ixp425/ixp425_a4x_io.S	optional	uart
 dev/uart/uart_dev_ns8250.c		optional	uart
 #
-# NPE-based Ethernet support (requires qmgr also).  Note the
-# firmware images must be downloaded from the Intel web site.
-# The URL seems to change frequently; try this as a starting
-# place:
-#
-# http://www.intel.com/design/network/products/npfamily/download_ixp400.htm
+# NPE-based Ethernet support (requires qmgr also).
 #
 arm/xscale/ixp425/if_npe.c		optional npe
 arm/xscale/ixp425/ixp425_npe.c		optional npe
@@ -41,7 +36,7 @@
 	clean		"IxNpeMicrocode.fwo"
 IxNpeMicrocode.dat			optional npe_fw			\
 	dependency	".PHONY"					\
-	compile-with	"if [ -e $S/arm/xscale/ixp425/IxNpeMicrocode.dat ]; then ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat .; else echo 'WARNING, no IxNpeMicrocode.dat file; you must obtain this from the Intel web site'; false; fi" \
+	compile-with	"uudecode < $S/contrib/dev/npe/IxNpeMicrocode.dat.uu" \
 	no-obj no-implicit-rule						\
 	clean		"IxNpeMicrocode.dat"
 #

==== //depot/projects/delphij_fork/sys/arm/xscale/ixp425/ixp425_npe.c#2 (text+ko) ====

@@ -57,7 +57,7 @@
  * SUCH DAMAGE.
 */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.6 2007/05/24 16:31:22 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.8 2007/09/27 22:39:49 cognet Exp $");
 
 /*
  * Intel XScale Network Processing Engine (NPE) support.

==== //depot/projects/delphij_fork/sys/arm/xscale/ixp425/ixp425_npevar.h#2 (text+ko) ====

@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npevar.h,v 1.2 2007/05/24 16:31:22 sam Exp $
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npevar.h,v 1.4 2007/09/27 22:39:49 cognet Exp $
  */
 
 #ifndef _IXP425_NPEVAR_H_

==== //depot/projects/delphij_fork/sys/arm/xscale/ixp425/ixp425_pci.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.4 2007/03/06 10:58:22 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.5 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -229,6 +229,9 @@
 
 	sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
 		*result = sc->sc_bus;
 		return (0);
@@ -244,6 +247,8 @@
 
 	sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_bus = value;
 		return (0);

==== //depot/projects/delphij_fork/sys/boot/forth/loader.conf#2 (text+ko) ====

@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.121 2007/06/25 05:06:55 rafan Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.122 2007/09/26 08:38:25 ru Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
@@ -44,7 +44,8 @@
 #autoboot_delay="10"		# Delay in seconds before autobooting,
 				# set to -1 if you don't want user to be
 				# allowed to interrupt autoboot process and
-				# escape to the loader prompt
+				# escape to the loader prompt, set to
+				# "NO" to disable autobooting
 #beastie_disable="NO"		# Turn the beastie boot menu on and off
 #loader_logo="fbsdbw"		# Desired logo: fbsdbw, beastiebw, beastie, none
 #comconsole_speed="9600"	# Set the current serial console speed

==== //depot/projects/delphij_fork/sys/compat/ia32/ia32_sysvec.c#3 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.26 2007/07/12 18:01:30 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/ia32/ia32_sysvec.c,v 1.27 2007/09/24 20:49:39 jhb Exp $");
 
 #include "opt_compat.h"
 
@@ -102,10 +102,13 @@
 
 static u_long	ia32_maxdsiz = IA32_MAXDSIZ;
 SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxdsiz, CTLFLAG_RW, &ia32_maxdsiz, 0, "");
+TUNABLE_ULONG("compat.ia32.maxdsiz", &ia32_maxdsiz);
 static u_long	ia32_maxssiz = IA32_MAXSSIZ;
 SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxssiz, CTLFLAG_RW, &ia32_maxssiz, 0, "");
+TUNABLE_ULONG("compat.ia32.maxssiz", &ia32_maxssiz);
 static u_long	ia32_maxvmem = IA32_MAXVMEM;
 SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, "");
+TUNABLE_ULONG("compat.ia32.maxvmem", &ia32_maxvmem);
 
 struct sysentvec ia32_freebsd_sysvec = {
 	FREEBSD32_SYS_MAXSYSCALL,

==== //depot/projects/delphij_fork/sys/conf/NOTES#11 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1453 2007/09/23 07:34:22 pjd Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1454 2007/09/26 21:14:17 marius Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -1766,6 +1766,7 @@
 # fpa:  Support for the Digital DEFPA PCI FDDI. `device fddi' is also needed.
 # fxp:  Intel EtherExpress Pro/100B
 #	(hint of prefer_iomap can be done to prefer I/O instead of Mem mapping)
+# gem:  Apple GMAC/Sun ERI/Sun GEM
 # hme:  Sun HME (Happy Meal Ethernet)
 # le:   AMD Am7900 LANCE and Am79C9xx PCnet
 # lge:	Support for PCI gigabit ethernet adapters based on the Level 1
@@ -1880,6 +1881,7 @@
 device		dc		# DEC/Intel 21143 and various workalikes
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 hint.fxp.0.prefer_iomap="0"
+device		gem		# Apple GMAC/Sun ERI/Sun GEM
 device		hme		# Sun HME (Happy Meal Ethernet)
 device		lge		# Level 1 LXT1001 gigabit Ethernet
 device		my		# Myson Fast Ethernet (MTD80X, MTD89X)

==== //depot/projects/delphij_fork/sys/contrib/dev/acpica/evmisc.c#2 (text+ko) ====

@@ -568,6 +568,20 @@
     }
 
     /*
+     * Update the global lock handle and check for wraparound. The handle is
+     * only used for the external global lock interfaces, but it is updated
+     * here to properly handle the case where a single thread may acquire the
+     * lock via both the AML and the AcpiAcquireGlobalLock interfaces. The
+     * handle is therefore updated on the first acquire from a given thread
+     * regardless of where the acquisition request originated.
+     */
+    AcpiGbl_GlobalLockHandle++;
+    if (AcpiGbl_GlobalLockHandle == 0)
+    {
+        AcpiGbl_GlobalLockHandle = 1;
+    }
+
+    /*
      * Make sure that a global lock actually exists. If not, just treat
      * the lock as a standard mutex.
      */

==== //depot/projects/delphij_fork/sys/contrib/dev/acpica/evxface.c#2 (text+ko) ====

@@ -921,16 +921,7 @@
 
     if (ACPI_SUCCESS (Status))
     {
-        /*
-         * If this was the first acquisition of the Global Lock by this thread,
-         * create a new handle. Otherwise, return the existing handle.
-         */
-        if (AcpiGbl_GlobalLockMutex->Mutex.AcquisitionDepth == 1)
-        {
-            AcpiGbl_GlobalLockHandle++;
-        }
-
-        /* Return the global lock handle */
+        /* Return the global lock handle (updated in AcpiEvAcquireGlobalLock) */
 
         *Handle = AcpiGbl_GlobalLockHandle;
     }

==== //depot/projects/delphij_fork/sys/dev/acpica/acpi_ec.c#2 (text+ko) ====

@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2003 Nate Lawson
+ * Copyright (c) 2003-2007 Nate Lawson
  * Copyright (c) 2000 Michael Smith
  * Copyright (c) 2000 BSDi
  * All rights reserved.
@@ -25,118 +25,9 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/*-
- ******************************************************************************
- *
- * 1. Copyright Notice
- *
- * Some or all of this work - Copyright (c) 1999, Intel Corp.  All rights
- * reserved.
- *
- * 2. License
- *
- * 2.1. This is your license from Intel Corp. under its intellectual property
- * rights.  You may have additional license terms from the party that provided
- * you this software, covering your right to use that party's intellectual
- * property rights.
- *
- * 2.2. Intel grants, free of charge, to any person ("Licensee") obtaining a
- * copy of the source code appearing in this file ("Covered Code") an
- * irrevocable, perpetual, worldwide license under Intel's copyrights in the
- * base code distributed originally by Intel ("Original Intel Code") to copy,
- * make derivatives, distribute, use and display any portion of the Covered
- * Code in any form, with the right to sublicense such rights; and
- *
- * 2.3. Intel grants Licensee a non-exclusive and non-transferable patent
- * license (with the right to sublicense), under only those claims of Intel
- * patents that are infringed by the Original Intel Code, to make, use, sell,
- * offer to sell, and import the Covered Code and derivative works thereof
- * solely to the minimum extent necessary to exercise the above copyright
- * license, and in no event shall the patent license extend to any additions
- * to or modifications of the Original Intel Code.  No other license or right
- * is granted directly or by implication, estoppel or otherwise;
- *
- * The above copyright and patent license is granted only if the following
- * conditions are met:
- *
- * 3. Conditions 
- *
- * 3.1. Redistribution of Source with Rights to Further Distribute Source.  
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification with rights to further distribute source must include
- * the above Copyright Notice, the above License, this list of Conditions,
- * and the following Disclaimer and Export Compliance provision.  In addition,
- * Licensee must cause all Covered Code to which Licensee contributes to
- * contain a file documenting the changes Licensee made to create that Covered
- * Code and the date of any change.  Licensee must include in that file the
- * documentation of any changes made by any predecessor Licensee.  Licensee 
- * must include a prominent statement that the modification is derived,
- * directly or indirectly, from Original Intel Code.
- *
- * 3.2. Redistribution of Source with no Rights to Further Distribute Source.  
- * Redistribution of source code of any substantial portion of the Covered
- * Code or modification without rights to further distribute source must
- * include the following Disclaimer and Export Compliance provision in the
- * documentation and/or other materials provided with distribution.  In
- * addition, Licensee may not authorize further sublicense of source of any
- * portion of the Covered Code, and must include terms to the effect that the
- * license from Licensee to its licensee is limited to the intellectual
- * property embodied in the software Licensee provides to its licensee, and
- * not to intellectual property embodied in modifications its licensee may
- * make.
- *
- * 3.3. Redistribution of Executable. Redistribution in executable form of any
- * substantial portion of the Covered Code or modification must reproduce the
- * above Copyright Notice, and the following Disclaimer and Export Compliance
- * provision in the documentation and/or other materials provided with the
- * distribution.
- *
- * 3.4. Intel retains all right, title, and interest in and to the Original
- * Intel Code.
- *
- * 3.5. Neither the name Intel nor any other trademark owned or controlled by
- * Intel shall be used in advertising or otherwise to promote the sale, use or
- * other dealings in products derived from or relating to the Covered Code
- * without prior written authorization from Intel.
- *
- * 4. Disclaimer and Export Compliance
- *
- * 4.1. INTEL MAKES NO WARRANTY OF ANY KIND REGARDING ANY SOFTWARE PROVIDED
- * HERE.  ANY SOFTWARE ORIGINATING FROM INTEL OR DERIVED FROM INTEL SOFTWARE
- * IS PROVIDED "AS IS," AND INTEL WILL NOT PROVIDE ANY SUPPORT,  ASSISTANCE,
- * INSTALLATION, TRAINING OR OTHER SERVICES.  INTEL WILL NOT PROVIDE ANY
- * UPDATES, ENHANCEMENTS OR EXTENSIONS.  INTEL SPECIFICALLY DISCLAIMS ANY
- * IMPLIED WARRANTIES OF MERCHANTABILITY, NONINFRINGEMENT AND FITNESS FOR A
- * PARTICULAR PURPOSE. 
- *
- * 4.2. IN NO EVENT SHALL INTEL HAVE ANY LIABILITY TO LICENSEE, ITS LICENSEES
- * OR ANY OTHER THIRD PARTY, FOR ANY LOST PROFITS, LOST DATA, LOSS OF USE OR
- * COSTS OF PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, OR FOR ANY INDIRECT,
- * SPECIAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THIS AGREEMENT, UNDER ANY
- * CAUSE OF ACTION OR THEORY OF LIABILITY, AND IRRESPECTIVE OF WHETHER INTEL
- * HAS ADVANCE NOTICE OF THE POSSIBILITY OF SUCH DAMAGES.  THESE LIMITATIONS
- * SHALL APPLY NOTWITHSTANDING THE FAILURE OF THE ESSENTIAL PURPOSE OF ANY
- * LIMITED REMEDY.
- *
- * 4.3. Licensee shall not export, either directly or indirectly, any of this
- * software or system incorporating such software without first obtaining any
- * required license or other approval from the U. S. Department of Commerce or
- * any other agency or department of the United States Government.  In the
- * event Licensee exports any such software from the United States or
- * re-exports any such software from a foreign destination, Licensee shall
- * ensure that the distribution and export/re-export of the software is in
- * compliance with all laws, regulations, orders, or other restrictions of the
- * U.S. Export Administration Regulations. Licensee agrees that neither it nor
- * any of its subsidiaries will export/re-export any technical data, process,
- * software, or service, directly or indirectly, to any country for which the
- * United States government or any agency thereof requires an export license,
- * other governmental approval, or letter of assurance, without first obtaining
- * such license, approval or letter.
- *
- *****************************************************************************/
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.75 2007/06/15 18:02:33 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_ec.c,v 1.76 2007/09/24 16:59:06 njl Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -171,7 +62,7 @@
 #define EC_COMMAND_BURST_DISABLE	((EC_COMMAND) 0x83)
 #define EC_COMMAND_QUERY		((EC_COMMAND) 0x84)
 
-/* 
+/*
  * EC_STATUS:
  * ----------
  * The encoding of the EC status register is illustrated below.
@@ -248,8 +139,7 @@
     int			ec_uid;
     ACPI_HANDLE		ec_gpehandle;
     UINT8		ec_gpebit;
-    UINT8		ec_csrvalue;
-    
+
     int			ec_data_rid;
     struct resource	*ec_data_res;
     bus_space_tag_t	ec_data_tag;
@@ -260,11 +150,11 @@
     bus_space_tag_t	ec_csr_tag;
     bus_space_handle_t	ec_csr_handle;
 
-    struct mtx		ec_mtx;
     int			ec_glk;
     int			ec_glkhandle;
     int			ec_burstactive;
     int			ec_sci_pend;
+    u_int		ec_gencount;
 };
 
 /*
@@ -275,13 +165,10 @@
 #define EC_LOCK_TIMEOUT	1000
 
 /* Default delay in microseconds between each run of the status polling loop. */
-#define EC_POLL_DELAY	10
-
-/* Default time in microseconds spent polling before sleep waiting. */
-#define EC_POLL_TIME	500
+#define EC_POLL_DELAY	5
 
 /* Total time in ms spent waiting for a response from EC. */
-#define EC_TIMEOUT	500
+#define EC_TIMEOUT	750
 
 #define EVENT_READY(event, status)			\
 	(((event) == EC_EVENT_OUTPUT_BUFFER_FULL &&	\
@@ -298,17 +185,17 @@
 TUNABLE_INT("debug.acpi.ec.burst", &ec_burst_mode);
 SYSCTL_INT(_debug_acpi_ec, OID_AUTO, burst, CTLFLAG_RW, &ec_burst_mode, 0,
     "Enable use of burst mode (faster for nearly all systems)");
-static int	ec_poll_time = EC_POLL_TIME;
-TUNABLE_INT("debug.acpi.ec.poll_time", &ec_poll_time);
-SYSCTL_INT(_debug_acpi_ec, OID_AUTO, poll_time, CTLFLAG_RW, &ec_poll_time,
-    EC_POLL_TIME, "Time spent polling vs. sleeping (CPU intensive)");
+static int	ec_polled_mode;
+TUNABLE_INT("debug.acpi.ec.polled", &ec_polled_mode);
+SYSCTL_INT(_debug_acpi_ec, OID_AUTO, polled, CTLFLAG_RW, &ec_polled_mode, 0,
+    "Force use of polled mode (only if interrupt mode doesn't work)");
 static int	ec_timeout = EC_TIMEOUT;
 TUNABLE_INT("debug.acpi.ec.timeout", &ec_timeout);
 SYSCTL_INT(_debug_acpi_ec, OID_AUTO, timeout, CTLFLAG_RW, &ec_timeout,
     EC_TIMEOUT, "Total time spent waiting for a response (poll+sleep)");
 
-static __inline ACPI_STATUS
-EcLock(struct acpi_ec_softc *sc, int serialize)
+static ACPI_STATUS
+EcLock(struct acpi_ec_softc *sc)
 {
     ACPI_STATUS	status;
 
@@ -319,37 +206,27 @@
 	if (ACPI_FAILURE(status))
 	    return (status);
     }
-
-    /*
-     * If caller is executing a series of commands, acquire the exclusive lock
-     * to serialize with other users.
-     * To sync with bottom-half interrupt handler, always acquire the mutex.
-     */
-    if (serialize)
-	ACPI_SERIAL_BEGIN(ec);
-    mtx_lock(&sc->ec_mtx);
-
+    ACPI_SERIAL_BEGIN(ec);
     return (status);
 }
 
-static __inline void
+static void
 EcUnlock(struct acpi_ec_softc *sc)
 {
-    mtx_unlock(&sc->ec_mtx);
-    if (sx_xlocked(&ec_sxlock))
-	ACPI_SERIAL_END(ec);
+    ACPI_SERIAL_END(ec);
     if (sc->ec_glk)
 	AcpiReleaseGlobalLock(sc->ec_glkhandle);
 }
 
 static uint32_t		EcGpeHandler(void *Context);
-static ACPI_STATUS	EcSpaceSetup(ACPI_HANDLE Region, UINT32 Function, 
+static ACPI_STATUS	EcSpaceSetup(ACPI_HANDLE Region, UINT32 Function,
 				void *Context, void **return_Context);
 static ACPI_STATUS	EcSpaceHandler(UINT32 Function,
 				ACPI_PHYSICAL_ADDRESS Address,
 				UINT32 width, ACPI_INTEGER *Value,
 				void *Context, void *RegionContext);
-static ACPI_STATUS	EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT Event);
+static ACPI_STATUS	EcWaitEvent(struct acpi_ec_softc *sc, EC_EVENT Event,
+				u_int gen_count);
 static ACPI_STATUS	EcCommand(struct acpi_ec_softc *sc, EC_COMMAND cmd);
 static ACPI_STATUS	EcRead(struct acpi_ec_softc *sc, UINT8 Address,
 				UINT8 *Data);
@@ -387,10 +264,12 @@
 MODULE_DEPEND(acpi_ec, acpi, 1, 1, 1);
 
 /*
- * Look for an ECDT and if we find one, set up default GPE and 
+ * Look for an ECDT and if we find one, set up default GPE and
  * space handlers to catch attempts to access EC space before
  * we have a real driver instance in place.
- * TODO: if people report invalid ECDTs, add a tunable to disable them.
+ *
+ * TODO: Some old Gateway laptops need us to fake up an ECDT or
+ * otherwise attach early so that _REG methods can run.
  */
 void
 acpi_ec_ecdt_probe(device_t parent)
@@ -578,7 +457,6 @@
     params = acpi_get_private(dev);
     sc->ec_dev = dev;
     sc->ec_handle = acpi_get_handle(dev);
-    mtx_init(&sc->ec_mtx, "ACPI EC lock", NULL, MTX_DEF);
 
     /* Retrieve previously probed values via device ivars. */
     sc->ec_glk = params->glk;
@@ -621,7 +499,7 @@
 	goto error;
     }
 
-    /* 
+    /*
      * Install address space handler
      */
     ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, "attaching address space handler\n"));
@@ -656,12 +534,11 @@
     AcpiRemoveAddressSpaceHandler(sc->ec_handle, ACPI_ADR_SPACE_EC,
 	EcSpaceHandler);
     if (sc->ec_csr_res)
-	bus_release_resource(sc->ec_dev, SYS_RES_IOPORT, sc->ec_csr_rid, 
+	bus_release_resource(sc->ec_dev, SYS_RES_IOPORT, sc->ec_csr_rid,
 			     sc->ec_csr_res);
     if (sc->ec_data_res)
 	bus_release_resource(sc->ec_dev, SYS_RES_IOPORT, sc->ec_data_rid,
 			     sc->ec_data_res);
-    mtx_destroy(&sc->ec_mtx);
     return (ENXIO);
 }
 
@@ -715,57 +592,55 @@
     KASSERT(Context != NULL, ("EcGpeQueryHandler called with NULL"));
 
     /* Serialize user access with EcSpaceHandler(). */
-    Status = EcLock(sc, TRUE);
+    Status = EcLock(sc);
     if (ACPI_FAILURE(Status)) {
-	ACPI_VPRINT(sc->ec_dev, acpi_device_get_parent_softc(sc->ec_dev),
-		    "GpeQuery lock error: %s\n", AcpiFormatException(Status));
+	device_printf(sc->ec_dev, "GpeQuery lock error: %s\n",
+	    AcpiFormatException(Status));
 	return;
     }
 
     /*
      * Send a query command to the EC to find out which _Qxx call it
      * wants to make.  This command clears the SCI bit and also the
-     * interrupt source since we are edge-triggered.
+     * interrupt source since we are edge-triggered.  To prevent the GPE
+     * that may arise from running the query from causing another query
+     * to be queued, we clear the pending flag only after running it.
      */
     Status = EcCommand(sc, EC_COMMAND_QUERY);
+    sc->ec_sci_pend = FALSE;
     if (ACPI_FAILURE(Status)) {
 	EcUnlock(sc);
-	ACPI_VPRINT(sc->ec_dev, acpi_device_get_parent_softc(sc->ec_dev),
-		    "GPE query failed - %s\n", AcpiFormatException(Status));
-	goto re_enable;
+	device_printf(sc->ec_dev, "GPE query failed: %s\n",
+	    AcpiFormatException(Status));
+	return;
     }
     Data = EC_GET_DATA(sc);
-    sc->ec_sci_pend = FALSE;
 
-    /* Drop locks before evaluating _Qxx method since it may trigger GPEs. */
+    /*
+     * We have to unlock before running the _Qxx method below since that
+     * method may attempt to read/write from EC address space, causing
+     * recursive acquisition of the lock.
+     */
     EcUnlock(sc);
 
     /* Ignore the value for "no outstanding event". (13.3.5) */
-    CTR2(KTR_ACPI, "ec query ok,%s running _Q%02x", Data ? "" : " not", Data);
+    CTR2(KTR_ACPI, "ec query ok,%s running _Q%02X", Data ? "" : " not", Data);
     if (Data == 0)
-	goto re_enable;
+	return;
 
     /* Evaluate _Qxx to respond to the controller. */
-    snprintf(qxx, sizeof(qxx), "_Q%02x", Data);
+    snprintf(qxx, sizeof(qxx), "_Q%02X", Data);
     AcpiUtStrupr(qxx);
     Status = AcpiEvaluateObject(sc->ec_handle, qxx, NULL, NULL);
     if (ACPI_FAILURE(Status) && Status != AE_NOT_FOUND) {
-	ACPI_VPRINT(sc->ec_dev, acpi_device_get_parent_softc(sc->ec_dev),
-		    "evaluation of GPE query method %s failed - %s\n", 
-		    qxx, AcpiFormatException(Status));
+	device_printf(sc->ec_dev, "evaluation of query method %s failed: %s\n",
+	    qxx, AcpiFormatException(Status));
     }
-
-re_enable:
-    /* Re-enable the GPE event so we'll get future requests. */
-    Status = AcpiEnableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_ISR);
-    if (ACPI_FAILURE(Status))
-	printf("EcGpeQueryHandler: AcpiEnableEvent failed\n");
 }
 
 /*
- * Handle a GPE.  Currently we only handle SCI events as others must
- * be handled by polling in EcWaitEvent().  This is because some ECs
- * treat events as level when they should be edge-triggered.
+ * The GPE handler is called when IBE/OBF or SCI events occur.  We are
+ * called from an unknown lock context.
  */
 static uint32_t
 EcGpeHandler(void *Context)
@@ -773,68 +648,32 @@
     struct acpi_ec_softc *sc = Context;
     ACPI_STATUS		       Status;
     EC_STATUS		       EcStatus;
-    int			       query_pend;
 
     KASSERT(Context != NULL, ("EcGpeHandler called with NULL"));
+    CTR0(KTR_ACPI, "ec gpe handler start");
 
     /*
-     * Disable further GPEs while we handle this one.  Since we are directly
-     * called by ACPI-CA and it may have unknown locks held, we specify the
-     * ACPI_ISR flag to keep it from acquiring any more mutexes (although
-     * sleeping would be ok since we're in an ithread.)
+     * Notify EcWaitEvent() that the status register is now fresh.  If we
+     * didn't do this, it wouldn't be possible to distinguish an old IBE
+     * from a new one, for example when doing a write transaction (writing
+     * address and then data values.)
      */
-    AcpiDisableGpe(sc->ec_gpehandle, sc->ec_gpebit, ACPI_ISR);
+    atomic_add_int(&sc->ec_gencount, 1);
+    wakeup(&sc->ec_gencount);
 
-    /* For interrupt (GPE) handler, don't acquire serialization lock. */
-    Status = EcLock(sc, FALSE);
-    if (ACPI_FAILURE(Status)) {
-	ACPI_VPRINT(sc->ec_dev, acpi_device_get_parent_softc(sc->ec_dev),
-		    "GpeQuery lock error: %s\n", AcpiFormatException(Status));
-	return (-1);
-    }
-
     /*
-     * If burst was active, but the status bit was cleared, the EC had to
-     * exit burst mode for some reason.  Record this for later.
+     * If the EC_SCI bit of the status register is set, queue a query handler.
+     * It will run the query and _Qxx method later, under the lock.
      */
     EcStatus = EC_GET_CSR(sc);
-    if (sc->ec_burstactive && (EcStatus & EC_FLAG_BURST_MODE) == 0) {
-	CTR0(KTR_ACPI, "ec burst disabled in query handler");
-	sc->ec_burstactive = FALSE;
-    }

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 20:55:58 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 407D316A419; Wed,  3 Oct 2007 20:55:58 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B1A5816A417
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 20:55:57 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8C36113C43E
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 20:55:57 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93KtvTw093843
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 20:55:57 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93Ktvvs093840
	for perforce@freebsd.org; Wed, 3 Oct 2007 20:55:57 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 20:55:57 GMT
Message-Id: <200710032055.l93Ktvvs093840@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127139 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 20:55:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=127139

Change 127139 by fli@fli_nexus on 2007/10/03 20:55:24

	- Add proper support for other classes than IN.
	- Make the "API" more flexible and easier to use.
	- Add better search and traverse functions.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.c#6 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.h#4 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.c#6 (text+ko) ====

@@ -37,97 +37,166 @@
 	dprintf(DEBUG_REC, "Refcount on r=%x increased to %d",\
 	    r, (r)->r_refcnt);
 
+#define record_class_aquire(rc) (rc)->rc_refcnt++; \
+	dprintf(DEBUG_REC, "Refcount on rc=%x increased to %d",\
+	    rc, (rc)->rc_refcnt);
+
 #define record_type_aquire(rt) (rt)->rt_refcnt++; \
 	dprintf(DEBUG_REC, "Refcount on rt=%x increased to %d",\
 	    rt, (rt)->rt_refcnt);
 
+static inline int notify_parent(struct recpar *);
+
 /*
  * Initialize a record set for `class'
  */
-void
-records_init(struct records *recs, int class)
+int
+records_init(struct records *recs)
 {
+	int error;
 
-	recs->r_class = class;
-	hashtbl_init(&recs->r_recs, 2, 131072, 5);
+	error = hashtbl_init(&recs->r_recs, 2, 131072, 5);
+	if (error != 0)
+		return (-1);
+	TAILQ_INIT(&recs->r_rec_list);
 	MDNS_INIT_SET(recs, r_magic);
+	return (0);
 }
 
-static void
-rec_free(__unused struct hashtbl *ht, __unused const void *key,
-    __unused size_t keylen, void *data, __unused void *arg)
+void
+records_destroy(struct records *recs)
 {
-	struct record *r = (struct record *)data;
+	struct record *r, *r2;
+	struct record_class *rc, *rc2;
 	struct record_type *rt, *rt2;
 	struct record_res *rr, *rr2;
+	int refcnt;
+
+	MDNS_INIT_ASSERT(recs, r_magic);
+
+	TAILQ_FOREACH_SAFE(r, &recs->r_rec_list, r_next, r2) {
+		r->r_flags |= REC_FORCE;
+		TAILQ_FOREACH_SAFE(rc, &r->r_list, rc_next, rc2) {
+			rc->rc_flags |= REC_FORCE;
+			TAILQ_FOREACH_SAFE(rt, &rc->rc_list, rt_next, rt2) {
+				rt->rt_flags |= REC_FORCE;
+				TAILQ_FOREACH_SAFE(rr, &rt->rt_list, rr_next,
+				    rr2) {
+					rr->rr_flags |= REC_FORCE;
+					record_res_del(rr);	
+				}
+			}
+		}
+	}
 
-	MDNS_INIT_ASSERT(r, r_magic);
+	TAILQ_FOREACH_SAFE(r, &recs->r_rec_list, r_next, r2) {
+		TAILQ_FOREACH_SAFE(rc, &r->r_list, rc_next, rc2) {
+			TAILQ_FOREACH_SAFE(rt, &rc->rc_list, rt_next, rt2) {
+				refcnt = rt->rt_refcnt;
+				while (refcnt-- > 0)
+					record_type_release(rt);
+			}
+		}
+	}
 
-	/*
-	 * Release record resources, note that we do not need an explicit call
-	 * to record_type_release, it will be called by record_res_del.
-	 */
-	TAILQ_FOREACH_SAFE(rt, &r->r_list, rt_next, rt2) {
-		TAILQ_FOREACH_SAFE(rr, &rt->rt_list, rr_next, rr2) {
-			record_res_del(rr);
+	TAILQ_FOREACH_SAFE(r, &recs->r_rec_list, r_next, r2) {
+		TAILQ_FOREACH_SAFE(rc, &r->r_list, rc_next, rc2) {
+			refcnt = rc->rc_refcnt;
+			while (refcnt-- > 0) {
+				record_class_release(rc);
+			}
 		}
 	}
+
+	TAILQ_FOREACH_SAFE(r, &recs->r_rec_list, r_next, r2) {
+		refcnt = r->r_refcnt;
+		while (refcnt-- > 0)
+			record_release(r);
+	}
+
+	hashtbl_destroy(&recs->r_recs);
+	MDNS_INIT_UNSET(recs, r_magic);
 }
 
-/*
- * Destroy a record set and free all resources
- */
-void
-records_destroy(struct records *recs)
+static inline int
+notify_parent(struct recpar *rp)
 {
+	int error;
 
-	hashtbl_walk(&recs->r_recs, rec_free, NULL);
-	hashtbl_destroy(&recs->r_recs);
-	MDNS_INIT_UNSET(recs, r_magic);
+	if (rp->rp_del_cb != NULL && rp->rp_handle != NULL) {
+		error = rp->rp_del_cb(rp->rp_handle);
+		if (error != 0) {
+			dprintf(DEBUG_REC, "Parent handle failed to remove "
+			    "itself, handle=%p, cb=%p", rp->rp_handle,
+			    rp->rp_del_cb);
+			return (-1);
+		}
+	}
+	return (0);
 }
 
 /*
  * Get handle to record `name', initialize if this is the first reference
- *  recs - Record set
- *  r    - Pointer to record
- *  name - Resource name
- *  flags - RECORD_NOALLOC will supress memory allocation
+ *  recs   - Record set
+ *  r      - Pointer to record
+ *  parent - Pointer to parent record or NULL
+ *  flags  - RECORD_* flags
+ *  name   - Record resource name (utf-8)
  */
 int
-record_get(struct records *recs, struct record **r, int flags, char *name)
+record_get(struct records *recs, struct record **r, struct recpar *parent,
+    int flags, const char *name)
 {
-	ssize_t len;
+	int error;
+	ssize_t len, namlen;
 	struct record *rec;
-	char namlc[MDNS_RECORD_LEN+1];
+	char namlc[MDNS_RECORD_LEN];
 
 	MDNS_INIT_ASSERT(recs, r_magic);
 
 	len = utf8_tolower(name, namlc, MDNS_RECORD_LEN);
-	if (len <= 0)
-		return (-1);
+	if (len <= 0 || len >= MDNS_RECORD_LEN) {
+		goto record_get_fail;
+	}
 	
 	rec = hashtbl_find(&recs->r_recs, namlc, len);
-	if (rec == NULL && (flags & RECORD_NOINIT)) {
+	if (rec == NULL && (flags & REC_NOINIT)) {
 		*r = NULL;
 		return (0);
 	}
 
-	if (len > MDNS_RECORD_LEN) {
-		*r = NULL;
-		return (-1);
-	}
-
 	if (rec == NULL) {
-		if (!(flags & RECORD_NOALLOC))
+		namlen = strlen(name);
+		if (namlen <= 0 || namlen >= MDNS_RECORD_LEN)
+			goto record_get_fail;
+		if (!(flags & REC_NOALLOC))
 			*r = malloc(sizeof(struct record));
+		if (*r == NULL)
+			goto record_get_fail;
+
 		MDNS_INIT_SET((*r), r_magic);
 		(*r)->r_recs = recs;
-		(*r)->r_parent = NULL;
+
+		if (parent != NULL)
+			memcpy(&((*r)->r_parent), parent,
+			    sizeof(struct recpar));
+		else {
+			(*r)->r_parent.rp_handle = NULL;
+			(*r)->r_parent.rp_del_cb = NULL;
+		}
+
 		(*r)->r_refcnt = 0;
 		(*r)->r_flags = flags;
 		TAILQ_INIT(&((*r)->r_list));
-		memcpy((*r)->r_name, name, len+1);
-		hashtbl_add(&recs->r_recs, namlc, len, *r, HASHTBL_KEYDUP);
+		memcpy((*r)->r_name, name, namlen+1);
+		error = hashtbl_add(&recs->r_recs, namlc, len, *r,
+		    HASHTBL_KEYDUP);
+		if (error < 0) {
+			if (!(flags & REC_NOALLOC))
+				free(*r);
+			goto record_get_fail;
+		}
+		TAILQ_INSERT_TAIL(&recs->r_rec_list, (*r), r_next);
 	}
 	else {
 		*r = rec;
@@ -136,6 +205,9 @@
 	dprintf(DEBUG_REC, "Record aquired r=%x, name=%s, refcnt=%d",
 	    *r, (*r)->r_name, (*r)->r_refcnt);
 	return (0);
+record_get_fail:
+	dprintf(DEBUG_REC, "Failed to aquire record name=%s", name);
+	return (-1);
 }
 
 /*
@@ -143,12 +215,13 @@
  * was the last reference.
  *  r    - Record to release
  */
-void
+int
 record_release(struct record *r)
 {
+	int error, flags;
 	ssize_t len;
 	struct records *recs;
-	char namlc[MDNS_RECORD_LEN+1];
+	char namlc[MDNS_RECORD_LEN];
 
 	MDNS_INIT_ASSERT(r, r_magic);
 	recs = r->r_recs;
@@ -156,112 +229,291 @@
 
 	if (--r->r_refcnt == 0) {
 		assert(TAILQ_EMPTY(&r->r_list) == 1);
+		flags = r->r_flags;
+
 		len = utf8_tolower(r->r_name, namlc, MDNS_RECORD_LEN);
-		hashtbl_del(&recs->r_recs, namlc, len);
+		if (len <= 0 || len >= MDNS_RECORD_LEN)
+			goto record_release_fail;
+
+		error = hashtbl_del(&recs->r_recs, namlc, len);
+		if (error < 0)
+			goto record_release_fail;
+		TAILQ_REMOVE(&recs->r_rec_list, r, r_next);
 		MDNS_INIT_UNSET(r, r_magic);
-		if (!(r->r_flags & RECORD_NOALLOC))
+
+		error = notify_parent(&r->r_parent);
+		if (error != 0 && !(flags & REC_FORCE)) {
+			MDNS_INIT_SET(r, r_magic);
+			TAILQ_INSERT_TAIL(&recs->r_rec_list, r, r_next);
+			hashtbl_add(&recs->r_recs, namlc, len, r,
+			    HASHTBL_KEYDUP);
+			goto record_release_fail;
+		}
+
+		if (!(flags & REC_NOALLOC))
 			free(r);
-		dprintf(DEBUG_REC, "References cleared on r=%x, removed", r);
+		dprintf(DEBUG_REC, "References cleared on r=%p, removed", r);
 	}
 	else {
-		dprintf(DEBUG_REC, "Record released r=%x, refs=%d",
+		dprintf(DEBUG_REC, "Record released r=%p, refs=%d",
 		    r, r->r_refcnt);
 	}
+	return (0);
+record_release_fail:
+	r->r_refcnt++;
+	dprintf(DEBUG_REC, "Failed to release record %p", r);
+	return (-1);
 }
 
 /*
  * Modify the name of a record in-place without releasing
  * types and resources.
  */
-void
-record_setname(struct record *r, char *name)
+int
+record_setname(struct record *r, const char *name)
 {
 	struct records *recs;
-	size_t len;
+	size_t len, namlen, rlen;
+	int error;
+	char namlc[MDNS_RECORD_LEN], namlc2[MDNS_RECORD_LEN];
 
 	MDNS_INIT_ASSERT(r, r_magic);
 	recs = r->r_recs;
 	MDNS_INIT_ASSERT(recs, r_magic);
 
-	len = strlen(r->r_name);
-	hashtbl_del(&recs->r_recs, r->r_name, len);
-	len = strlen(name);
-	memcpy(r->r_name, name, len+1);
-	hashtbl_add(&recs->r_recs, r->r_name, len, r, 0);
-	dprintf(DEBUG_REC, "Record name set to %s on r=%x", r->r_name, r);
+	namlen = strlen(name);
+	if (namlen <= 0 || namlen >= MDNS_RECORD_LEN)
+		goto record_setname_fail;
+
+	len = utf8_tolower(name, namlc, MDNS_RECORD_LEN);
+	if (len <= 0 || len >= MDNS_RECORD_LEN)
+		goto record_setname_fail;
+
+	rlen = utf8_tolower(r->r_name, namlc2, MDNS_RECORD_LEN);
+	if (rlen <= 0 || rlen >= MDNS_RECORD_LEN)
+		goto record_setname_fail;
+
+	error = hashtbl_add(&recs->r_recs, namlc, len, r, HASHTBL_KEYDUP);
+	if (error < 0)
+		goto record_setname_fail;
+
+	error = hashtbl_del(&recs->r_recs, namlc2, rlen);
+	if (error < 0) {
+		hashtbl_del(&recs->r_recs, namlc, len);
+		goto record_setname_fail;
+	}
+
+	memcpy(r->r_name, name, namlen + 1);
+
+	dprintf(DEBUG_REC, "Record name set to %s on r=%p", r->r_name, r);
+	return (0);
+record_setname_fail:
+	dprintf(DEBUG_REC, "Failed to set name on r=%p to %s", r, name);
+	return (-1);
+}
+
+int
+record_class_get(struct records *recs, struct record_class **rc, int flags,
+    struct recpar *rp, void *record, uint16_t class)
+{
+	int error, nflags;
+	struct record *r;
+	struct record_class *rc2;
+
+	MDNS_INIT_ASSERT(recs, r_magic);
+
+	if (flags & REC_OBJNAME) {
+		r = record;
+		MDNS_INIT_ASSERT(r, r_magic);
+		record_aquire(r);
+	}
+	else {
+		nflags = flags & ~(REC_NOALLOC | REC_NOINIT);
+		error = record_get(recs, &r, NULL, nflags, record);
+		if (error < 0)
+			goto record_class_get_fail;
+	}
+
+	TAILQ_FOREACH(rc2, &r->r_list, rc_next)
+		if (class == rc2->rc_class)
+			break;
+	if (rc2 == NULL && (flags & REC_NOINIT)) {
+		record_release(r);
+		*rc = NULL;
+		return (0);
+	}
+
+	if (rc2 == NULL) {
+		if (!(flags & REC_NOALLOC))
+			*rc = malloc(sizeof(struct record_class));
+		if (*rc == NULL)
+			goto record_class_get_fail;
+		MDNS_INIT_SET((*rc), rc_magic);
+		(*rc)->rc_class = class;
+		(*rc)->rc_record = r;
+		(*rc)->rc_refcnt = 0;
+		(*rc)->rc_flags = flags;
+
+		if (rp != NULL)
+			memcpy(&(*rc)->rc_parent, rp, sizeof(struct recpar));
+		else {
+			(*rc)->rc_parent.rp_handle = NULL;
+			(*rc)->rc_parent.rp_del_cb = NULL;
+		}
+
+		TAILQ_INIT(&((*rc)->rc_list));
+		TAILQ_FOREACH(rc2, &r->r_list, rc_next)
+			if (rc2->rc_class > class)
+				break;
+		if (rc2 != NULL)
+			TAILQ_INSERT_BEFORE(rc2, *rc, rc_next);
+		else
+			TAILQ_INSERT_TAIL(&r->r_list, *rc, rc_next);
+	}
+	else {
+		*rc = rc2;
+	}
+
+	record_class_aquire(*rc);
+	dprintf(DEBUG_REC, "Record class aquired rc=%x, refcnt=%d", *rc,
+	    (*rc)->rc_refcnt);
+	return (0);
+record_class_get_fail:
+	dprintf(DEBUG_REC, "Failed to aquire class %d", class);
+	return (-1);
 }
 
 /*
- * Lookup if a record exists
+ * Release a record class
  */
-struct record *
-record_find(struct records *recs, char *name)
+int
+record_class_release(struct record_class *rc)
 {
 	struct record *r;
-	ssize_t len;
-	char namlc[MDNS_RECORD_LEN+1];
+	struct record_class *rc2;
+	int error, flags;
+
+	MDNS_INIT_ASSERT(rc, rc_magic);
+	r = rc->rc_record;
+	MDNS_INIT_ASSERT(r, r_magic);
+
+	if (--rc->rc_refcnt == 0) {
+		assert(TAILQ_EMPTY(&rc->rc_list) == 1);
+		flags = rc->rc_flags;
 
-	MDNS_INIT_ASSERT(recs, r_magic);
+		TAILQ_REMOVE(&r->r_list, rc, rc_next);
+		MDNS_INIT_UNSET(rc, rc_magic);
 
-	len = utf8_tolower(name, namlc, MDNS_RECORD_LEN);
-	if (len <= 0)
-		return (NULL);
+		error = notify_parent(&rc->rc_parent);
+		if (error != 0 && !(flags & REC_FORCE)) {
+			MDNS_INIT_SET(rc, rc_magic);
+			TAILQ_FOREACH(rc2, &r->r_list, rc_next)
+			if (rc->rc_class > rc2->rc_class)
+				break;
+			if (rc2 != NULL)
+				TAILQ_INSERT_BEFORE(rc2, rc, rc_next);
+			else
+				TAILQ_INSERT_TAIL(&r->r_list, rc, rc_next);
+			goto record_class_release_fail;
+		}
 
-	r = hashtbl_find(&recs->r_recs, namlc, len);
-	return (r);
+		if (!(flags & REC_NOALLOC))
+			free(rc);
+		dprintf(DEBUG_REC, "References cleared on rc=%x, removed", rc);
+	}
+	else {
+		dprintf(DEBUG_REC, "Record class released rc=%x, refcnt=%d",
+		    rc, rc->rc_refcnt);
+	}
+	record_release(r);
+	return (0);
+record_class_release_fail:
+	rc->rc_refcnt++;
+	dprintf(DEBUG_REC, "Failed to release record class rc=%p", rc);
+	return (-1);
 }
 
+
 /*
- * Get a record type for a record, will be intialized if needed
- *  r  - Record
- *  rt - Pointer to the new record type
- *  flags - RECORD_NOALLOC will supress memory allocation
- *  type - DNS type
+ * Aquire reference to a record type
  */
 int
-record_type_get(struct record *r, struct record_type **rt, int flags,
-    uint16_t type)
+record_type_get(struct records *recs, struct record_type **rt, int flags,
+    struct recpar *rp, void *record, uintptr_t class, uint16_t type)
 {
+	int error, nflags;
 	struct record_type *rt2;
+	struct record_class *rc = NULL;
+
+	MDNS_INIT_ASSERT(recs, r_magic);
 
-	MDNS_INIT_ASSERT(r, r_magic);
+	if (flags & REC_OBJCLASS) {
+		rc = (struct record_class *)class;
+		MDNS_INIT_ASSERT(rc, rc_magic);
+		record_aquire(rc->rc_record);
+		record_class_aquire(rc);
+	}
+	else {
+		nflags = flags & ~(REC_NOALLOC | REC_NOINIT);
+		error = record_class_get(recs, &rc, nflags, NULL,
+		    record, class);
+		if (error < 0)
+			goto record_type_get_fail2;
+	}
+
+	assert(rc != NULL);
 
-	TAILQ_FOREACH(rt2, &r->r_list, rt_next) {
+	TAILQ_FOREACH(rt2, &rc->rc_list, rt_next) {
 		if (type == rt2->rt_type)
 			break;
 	}
-	if (rt2 == NULL && (flags & RECORD_NOINIT)) {
+
+	if ((rt2 == NULL) && (flags & REC_NOINIT)) {
 		*rt = NULL;
+		record_class_release(rc);
 		return (0);
 	}
+	else if (rt2 != NULL) {
+		*rt = rt2;
+		goto record_type_get_out;
+	}
+
+	assert(rt2 == NULL);
+	if (!(flags & REC_NOALLOC))
+		*rt = malloc(sizeof(struct record_type));
+	if (*rt == NULL)
+		goto record_type_get_fail;
 
-	if (rt2 == NULL) {
-		if (!(flags & RECORD_NOALLOC))
-			*rt = malloc(sizeof(struct record_type));
-		MDNS_INIT_SET((*rt), rt_magic);
-		(*rt)->rt_parent = NULL;
-		(*rt)->rt_type = type;
-		(*rt)->rt_flags = flags;
-		(*rt)->rt_record = r;
-		(*rt)->rt_refcnt = 0;
-		record_aquire(r);
-		TAILQ_INIT(&((*rt)->rt_list));
-		TAILQ_FOREACH(rt2, &r->r_list, rt_next) {
-			if (type > rt2->rt_type)
-				break;
-		}
-		if (rt2 != NULL)
-			TAILQ_INSERT_BEFORE(rt2, *rt, rt_next);
-		else
-			TAILQ_INSERT_TAIL(&r->r_list, *rt, rt_next);
-	}
+	MDNS_INIT_SET((*rt), rt_magic);
+	if (rp != NULL)
+		memcpy(&((*rt)->rt_parent), rp, sizeof(struct recpar));
 	else {
-		*rt = rt2;
+		(*rt)->rt_parent.rp_handle = NULL;
+		(*rt)->rt_parent.rp_del_cb = NULL;
 	}
+	(*rt)->rt_type = type;
+	(*rt)->rt_flags = flags;
+	(*rt)->rt_class = rc;
+	(*rt)->rt_refcnt = 0;
+	TAILQ_INIT(&((*rt)->rt_list));
+	TAILQ_FOREACH(rt2, &rc->rc_list, rt_next)
+		if (rt2->rt_type > type)
+			break;
+	if (rt2 != NULL)
+		TAILQ_INSERT_BEFORE(rt2, *rt, rt_next);
+	else
+		TAILQ_INSERT_TAIL(&rc->rc_list, *rt, rt_next);
+
+record_type_get_out:
 	record_type_aquire(*rt);
 	dprintf(DEBUG_REC, "Record type aquired rt=%x, refcnt=%d", *rt,
 	    (*rt)->rt_refcnt);
 	return (0);
+record_type_get_fail:
+	record_class_release(rc);
+record_type_get_fail2:
+	dprintf(DEBUG_REC, "Failed to aquire record type %d", type);
+	return (-1);
 }
 
 /*
@@ -269,79 +521,154 @@
  * was the last reference.
  *  rt - Record type to release
  */
-void
+int
 record_type_release(struct record_type *rt)
 {
-	struct record *r;
+	struct record_class *rc;
+	struct record_type *rt2;
+	int error, flags;
 
 	MDNS_INIT_ASSERT(rt, rt_magic);
+	rc = rt->rt_class;
+	MDNS_INIT_ASSERT(rc, rc_magic);
+
 	if (--rt->rt_refcnt == 0) {
-		r = rt->rt_record;
-		TAILQ_REMOVE(&r->r_list, rt, rt_next);
+		assert(TAILQ_EMPTY(&rt->rt_list) == 1);
+		flags = rt->rt_flags;
+
+		TAILQ_REMOVE(&rc->rc_list, rt, rt_next);
 		MDNS_INIT_UNSET(rt, rt_magic);
-		if (!(rt->rt_flags & RECORD_NOALLOC))
+
+		error = notify_parent(&rt->rt_parent);
+		if (error != 0 && !(flags & REC_FORCE)) {
+			MDNS_INIT_SET(rt, rt_magic);
+			TAILQ_FOREACH(rt2, &rc->rc_list, rt_next)
+				if (rt->rt_type > rt2->rt_type)
+					break;
+			if (rt2 != NULL)
+				TAILQ_INSERT_BEFORE(rt2, rt, rt_next);
+			else
+				TAILQ_INSERT_TAIL(&rc->rc_list, rt, rt_next);
+			goto record_type_release_fail;
+		}
+		if (!(flags & REC_NOALLOC))
 			free(rt);
+
 		dprintf(DEBUG_REC, "References cleared on rt=%x, removed", rt);
-		record_release(r);
 	}
 	else {
 		dprintf(DEBUG_REC, "Record type released rt=%x, refcnt=%d",
 		    rt, rt->rt_refcnt);
 	}
+	record_class_release(rc);
+	return (0);
+record_type_release_fail:
+	rt->rt_refcnt++;
+	dprintf(DEBUG_REC, "Failed to release record type rt=%p", rt);
+	return (-1);
 }
 
 /*
  * Add a resource record to a resource type
- *  r - Parent record
- *  rr - Initialized to the new resource record
- *  flags - RECORD_ALLOC will cause it to allocated memory if needed
- *  type - DNS type
- *  data - Pointer to resource data
- *  dlen - Length of resource data
  */
 int
-record_res_add(struct record *r, struct record_res **rr, int flags,
-	uint16_t type, void *data, size_t dlen)
+record_res_add(struct records *recs, struct record_res **rr, int flags,
+    struct recpar *rp, void *record, uintptr_t class, uintptr_t type,
+    void *data, size_t dlen)
 {
 	struct record_type *rt;
+	int error, nflags;
+
+	MDNS_INIT_ASSERT(recs, r_magic);
 
-	MDNS_INIT_ASSERT(r, r_magic);
+	if (flags & REC_OBJTYPE) {
+		rt = (struct record_type *)type;
+		MDNS_INIT_ASSERT(rt, rt_magic);
+		record_aquire(rt->rt_class->rc_record);
+		record_class_aquire(rt->rt_class);
+		record_type_aquire(rt);
+	}
+	else {
+		nflags = flags & ~(REC_NOALLOC | REC_NOINIT);
+		error = record_type_get(recs, &rt, nflags, NULL, record,
+		    class, type);
+		if (error != 0)
+			goto record_res_add_fail;
+	}
+
+	assert(rt != NULL);
 
-	record_type_get(r, &rt, 0, type);
-	if (!(flags & RECORD_NOALLOC))
+	if (!(flags & REC_NOALLOC))
 		*rr = malloc(sizeof(struct record_res));
+	if (*rr == NULL)
+		goto record_res_add_fail;
 	MDNS_INIT_SET((*rr), rr_magic);
-	(*rr)->rr_parent = NULL;
 	(*rr)->rr_flags = flags;
-	(*rr)->rr_data = data; /* FIXME: assumption, new flag */
+
+	if (rp != NULL)
+		memcpy(&((*rr)->rr_parent), rp, sizeof(struct recpar));
+	else {
+		(*rr)->rr_parent.rp_handle = NULL;
+		(*rr)->rr_parent.rp_del_cb = NULL;
+	}
+
+	if (flags & REC_RESDUP) {
+		(*rr)->rr_data = malloc(dlen);
+		if ((*rr)->rr_data == NULL)
+			goto record_res_add_fail;
+		memcpy((*rr)->rr_data, data, dlen);
+	}
+	else
+		(*rr)->rr_data = data;
 	(*rr)->rr_len = dlen;
 	(*rr)->rr_type = rt;
 	TAILQ_INSERT_TAIL(&rt->rt_list, *rr, rr_next);
-	dprintf(DEBUG_REC, "Resource rr=%x added on r=%x, rt=%x", *rr, r, rt);
+
+	dprintf(DEBUG_REC, "Resource rr=%p added rt=%p", *rr, rt);
 	return (0);
+record_res_add_fail:
+	if ((!(flags & REC_NOALLOC)) && *rr != NULL)
+		free(*rr);
+	record_type_release(rt);
+	dprintf(DEBUG_REC, "Failed to add resource data=%p, rt=%p", data, rt);
+	return (-1);
 }
 
 /*
  * Delete a resource record
  *  rr - Pointer to resource record
  */
-void
+int
 record_res_del(struct record_res *rr)
 {
-	int flags;
+	int flags, error;
 	struct record_type *rt;
+	void *dptr;
 
 	MDNS_INIT_ASSERT(rr, rr_magic);
 	rt = rr->rr_type;
 	MDNS_INIT_ASSERT(rt, rt_magic);
 	flags = rr->rr_flags;
+	dptr = rr->rr_data;
+
 	TAILQ_REMOVE(&rt->rt_list, rr, rr_next);
-	free(rr->rr_data); /* FIXME assumption */
-	record_type_release(rt);
 	MDNS_INIT_UNSET(rr, rr_magic);
-	if (!(flags & RECORD_NOALLOC))
+	error = notify_parent(&rr->rr_parent);
+	if (error != 0 && !(flags & REC_FORCE)) {
+		MDNS_INIT_SET(rr, rr_magic);
+		TAILQ_INSERT_TAIL(&rt->rt_list, rr, rr_next);
+		goto record_res_del_fail;
+	}
+	if (!(flags & REC_NOALLOC))
 		free(rr);
+	if (flags & (REC_RESOWN | REC_RESDUP))
+		free(dptr);
+	record_type_release(rt);
 	dprintf(DEBUG_REC, "Resource rr=%x removed, rt=%x", rr, rt);
+	return (0);
+record_res_del_fail:
+	dprintf(DEBUG_REC, "Failed to remove resource rr=%p", rr);
+	return (-1);
 }
 
 /*
@@ -350,34 +677,54 @@
  *   data - Data pointer
  *   dlen - Length of data
  */
-void
-record_res_setdata(struct record_res *rr, void *data, size_t dlen)
+int
+record_res_setdata(struct record_res *rr, int flags, void *data, size_t dlen)
 {
+	void *dptr, *dup;
 
 	MDNS_INIT_ASSERT(rr, rr_magic);
-	free(rr->rr_data); /* FIXME: assumption */
-	rr->rr_data = data;
+	dptr = rr->rr_data;
+
+	if (flags & REC_RESDUP) {
+		dup = malloc(dlen);
+		if (dup == NULL)
+			goto record_res_setdata_fail;
+		memcpy(dup, data, dlen);
+		rr->rr_data = dup;
+		rr->rr_flags |= REC_RESDUP;
+	}
+	else {
+		rr->rr_data = data;
+		rr->rr_flags &= ~REC_RESDUP;
+	}
+
+	if (rr->rr_flags & (REC_RESOWN | REC_RESDUP))
+		free(dptr);
+
+	if (flags & REC_RESOWN)
+		rr->rr_flags |= REC_RESOWN;
+	else
+		rr->rr_flags &= ~(REC_RESOWN);
+
 	rr->rr_len = dlen;
 	dprintf(DEBUG_REC, "Resource data set on rr=%x, data=%x, dlen=%d",
 	    rr, data, dlen);
+	return (0);
+record_res_setdata_fail:
+	dprintf(DEBUG_REC, "Failed to set resource data on rr=%p, data=%p, "
+	    "dlen=%d", rr, data, dlen);
+	return (-1);
 }
 
-
 /*
- * Returns a pointer to the first resource record identified by (name, type)
- *  recs - Record set
- *  name - Resource name
- *  type - Resource type
+ * Lookup if a record exists
  */
-struct record_res *
-record_res_find(struct records *recs, char *name, uint16_t type, char *data,
-    size_t dlen)
+struct record *
+record_find(struct records *recs, const char *name)
 {
 	struct record *r;
-	struct record_type *rt;
-	struct record_res *rr;
 	ssize_t len;
-	char namlc[MDNS_RECORD_LEN+1];
+	char namlc[MDNS_RECORD_LEN];
 
 	MDNS_INIT_ASSERT(recs, r_magic);
 
@@ -386,110 +733,154 @@
 		return (NULL);
 
 	r = hashtbl_find(&recs->r_recs, namlc, len);
-	if (r == NULL)
-		return (NULL);
+	return (r);
+}
+
+struct record_class *
+record_class_find(struct records *recs, int flags, const void *record,
+    uint16_t class)
+{
+	const struct record *r;
+	struct record_class *rc;
+
+	MDNS_INIT_ASSERT(recs, r_magic);
+	if (flags & REC_OBJNAME) {
+		r = (const struct record *)record;
+		MDNS_INIT_ASSERT(r, r_magic);
+	}
+	else {
+		r = record_find(recs, record);
+		if (r == NULL)
+			return (NULL);
+	}
+
+	if ((flags & REC_CTANY) && rc->rc_class == mdns_c_any) {
+		rc = record_class_first(r);
+		if (rc != NULL)
+			rc->rc_flags |= REC_CTANY;
+		return (rc);
+	}
 
-	TAILQ_FOREACH(rt, &r->r_list, rt_next) {
-		if (rt->rt_type == type)
-			break;
+	rc = NULL;
+	TAILQ_FOREACH(rc, &r->r_list, rc_next) {
+		if (rc->rc_class < class)
+			continue;
+		if (rc->rc_class > class)
+			rc = NULL;
+		break;
 	}
-	if (rt == NULL)
+	return (rc);
+}
+
+/*
+ * Obtain next logical record class, only applicable when the record class
+ * is mdns_c_any and the flag REC_CTANY is set.
+ */
+struct record_class *
+record_class_find_next(struct record_class *rc, uint16_t class)
+{
+	struct record_class *rc2;
+
+	if (!(rc->rc_flags & REC_CTANY))
+		return (NULL);
+	else if (class != mdns_c_any)
 		return (NULL);
 
-	TAILQ_FOREACH(rr, &rt->rt_list, rr_next) {
-		if (rr->rr_len == dlen)
-			if (memcmp(rr->rr_data, data, dlen) == 0)	
-				break;
-	}
-	return (rr);
+	rc->rc_flags &= ~REC_CTANY;
+	rc2 = record_class_next(rc);
+	if (rc2 != NULL)
+		rc2->rc_flags |= REC_CTANY;
+	return (rc2);
 }
 
 struct record_type *
-record_type_find(struct records *recs, char *name, uint16_t type)
+record_type_find(struct records *recs, int flags, const void *record,
+    uintptr_t class, uint16_t type)
 {
-	struct record *r;
+	struct record_class *rc;
 	struct record_type *rt;
-	ssize_t len;
-	char namlc[MDNS_RECORD_LEN+1];
 
 	MDNS_INIT_ASSERT(recs, r_magic);
 
-	len = utf8_tolower(name, namlc, MDNS_RECORD_LEN);
-	if (len <= 0)
-		return (NULL);
+	if (flags & REC_OBJCLASS) {
+		rc = (struct record_class *)class;
+		MDNS_INIT_ASSERT(rc, rc_magic);
+	}
+	else {
+		rc = record_class_find(recs, flags, record, class);
+		if (rc == NULL)
+			return (NULL);
+	}
 
-	r = hashtbl_find(&recs->r_recs, namlc, len);
-	if (r == NULL)
-		return (NULL);
+	if ((flags & REC_CTANY) && rt->rt_type == mdns_t_any) {
+		rt = record_type_first(rc);
+		if (rt != NULL)
+			rt->rt_flags |= REC_CTANY;
+		return (rt);
+	}
 
-	TAILQ_FOREACH(rt, &r->r_list, rt_next) {
-		if (rt->rt_type == type)
-			break;
+	rt = NULL;
+	TAILQ_FOREACH(rt, &rc->rc_list, rt_next) {
+		if (rt->rt_type < type)
+			continue;
+		if (rt->rt_type > type)
+			rt = NULL;
+		break;
 	}
 	return (rt);
 }
 
-static void
-rec_walk(__unused struct hashtbl *ht, __unused const void *key,
-    __unused size_t keylen, void *data, void *arg)
+struct record_type *
+record_type_find_next(struct record_type *rt, uint16_t type)
 {
-	void **args = (void **)arg;
-	record_foreach cb = args[0];
-	void *cbarg = args[1];
-	struct record *r = data;
+	struct record_type *rt2;
+
+	if (!(rt->rt_flags & REC_CTANY))
+		return (NULL);
+	else if (type != mdns_t_any)
+		return (NULL);
 
-	cb(r, cbarg);
+	rt->rt_flags &= ~REC_CTANY;
+	rt2 = record_type_next(rt);
+	if (rt2 != NULL)
+		rt2->rt_flags |= REC_CTANY;
+	return (rt2);
 }
 
-void

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 20:59:01 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B11E316A418; Wed,  3 Oct 2007 20:59:01 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2909116A41B
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 20:59:01 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 04FD313C46A
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 20:59:01 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93Kx0Mv093936
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 20:59:00 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93Kx0qV093933
	for perforce@freebsd.org; Wed, 3 Oct 2007 20:59:00 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 20:59:00 GMT
Message-Id: <200710032059.l93Kx0qV093933@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127140 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 20:59:01 -0000

http://perforce.freebsd.org/chv.cgi?CH=127140

Change 127140 by fli@fli_nexus on 2007/10/03 20:58:34

	- Fix off-by-one bug.
	- Make utf8_tolower() return an int instead of ssize_t
	- utf8_decode() returns the number of bytes needed if
	  the supplied buffer is too small.
	- Whitespace fixes.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/utf8.c#3 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/utf8.h#3 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/utf8.c#3 (text+ko) ====

@@ -41,11 +41,11 @@
  *   src  - Pointer to start of wide character string
  *   slen - Logical (not bytes) length of character string.
  *   dst  - Destination where the encoded string should be placed.
- *   dlen - Length of ``dst''
+ *   dlen - Length of ``dst'' (including terminating \0)
  * Return values
  *   The length of the encoded string is returned on success.
- *   On failure a number less than zero is returned, this absoute value of
- *   this number can be used as a hint if ``dst'' is too small.
+ *   If the destination buffer is too small, the value required (excluding
+ *   terminating \0) is returned as a negative value.
  *
  * This function is partially based on code from libarchive by Tim Kientzle
  */
@@ -62,15 +62,15 @@
 		wc = *wp;
 		if (wc <= 0x7f)
 			len++;
-        else if (wc <= 0x7ff)
+		else if (wc <= 0x7ff)
 			len += 2;
-        else if (wc <= 0xffff)
+		else if (wc <= 0xffff)
 			len += 3;
-        else if (wc <= 0x10ffff)
+		else if (wc <= 0x10ffff)
 			len += 4;
 	}
 
-	if (len > dlen)
+	if (len >= dlen)
 		return (-len);
 
 	for (wp = src, p = dst; *wp != L'\0'; wp++) {
@@ -104,11 +104,13 @@
  * Decodes an UTF-8 byte sequence into a wide character string
  * Arguments
  *   src  - Pointer to start of UTF-8 string
- *   slen - Length of UTF-8 byte sequence
+ *   slen - Length of UTF-8 byte sequence (excluding terminating \0)
  *   dst  - Destination where the decoded string should be placed
- *   dlen - Size of ``dst'' (logical length, not byte length)
+ *   dlen - Size of ``dst'' (logical length, not byte length), incl. \0
  * Return values
- *   Returns logical length of decoded string or -1 on failure
+ *   Returns logical length of decoded string or a value less than 0 on failure.
+ *   If the destination buffer is too small the required number of
+ *   characters (excluding terminating \0) is returned as a negative value.
  */
 ssize_t
 utf8_decode(const char *src, size_t slen, wchar_t *dst, size_t dlen)
@@ -118,8 +120,8 @@
 	char c;
 	wchar_t *wp;
 
-	if (dlen < slen)
-		return (-1);
+	if (dlen <= slen)
+		return (-slen);
 
 	len = 0;
 	for (p = src, wp = dst; *p != '\0'; wp++) {
@@ -305,18 +307,18 @@
  * Arguments
  *   src  - Original string ('\0'-terminated)
  *   dst  - Pointer to space where the new string is stored
- *   dlen - Length of destination buffer
+ *   dlen - Length of destination buffer (incl terminating \0)
  *
  * Returns the length of the converted lower case string or a value
  * less than 0 if a failure occurs.
  */
-int
+ssize_t
 utf8_tolower(const char *src, char *dst, size_t dlen)
 {
 	const char *p, *pe;
 	char *q, *qe;
 	uint32_t val, nval;
-	size_t slen, i;
+	size_t slen;
 	int l1, l2;
 
 	slen = strlen(src);
@@ -324,7 +326,7 @@
 	q = dst;
 	pe = src + slen;
 	qe = dst + dlen;
-	for (i = 0; i < slen; i++) {
+	while (p != pe && q != (qe - 1)) {
 		l1 = chrdec(p, &val, pe);
 		nval = chrlcase(val);
 		l2 = chrenc(q, nval, qe);
@@ -333,6 +335,8 @@
 		p += l1;
 		q += l2;
 	}
+	if (p != pe)
+		return (-1);
 	*q = '\0';
 	return (q - dst);
 }

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/utf8.h#3 (text+ko) ====

@@ -41,6 +41,6 @@
 ssize_t utf8_encode(const wchar_t *, char *, size_t);
 ssize_t utf8_decode(const char *, size_t, wchar_t *, size_t);
 int utf8_casecmp(const char *, const char *);
-int utf8_tolower(const char *, char *, size_t);
+ssize_t utf8_tolower(const char *, char *, size_t);
 
 #endif /* _UTF8_H_ */

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:02:05 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C0D8E16A421; Wed,  3 Oct 2007 21:02:05 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1D6AA16A418
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:02:05 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ED23113C46E
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:02:04 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93L24Sn094293
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:02:04 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93L24wa094290
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:02:04 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:02:04 GMT
Message-Id: <200710032102.l93L24wa094290@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127141 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:02:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=127141

Change 127141 by fli@fli_nexus on 2007/10/03 21:01:46

	- Add hashtbl_flush() that flushes all entries without
	  destroying the table itself.
	- Add missing checks for failed memory allocations.
	- Plug a memory leak, some memory wasn't freed properly
	  when the table was destroyed.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.c#7 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.h#7 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.c#7 (text+ko) ====

@@ -248,6 +248,8 @@
 		len = 1 << ht->ht_alloc_size;
 		hep = malloc(sizeof(struct he_pool) +
 		    (sizeof(struct hashentry) * len));
+		if (hep == NULL)
+			return (NULL);
 		hep->hep_size = len;
 		hep->hep_pos = 0;
 		SLIST_INSERT_HEAD(&ht->ht_new, hep, hep_next);
@@ -291,6 +293,8 @@
 	ht->ht_mask = ht->ht_tblsz - 1;
 
 	bkts = malloc(sizeof(struct hashbkt) * ht->ht_tblsz);
+	if (bkts == NULL)
+		return;
 	for (i = 0; i < ht->ht_tblsz; i++) {
 		TAILQ_INIT(&bkts[i].hb_table);
 		bkts[i].hb_len = 0;
@@ -320,6 +324,8 @@
 	size_t i;
 
 	ht->ht_bkts = malloc(sizeof(struct hashbkt) * len);
+	if (ht->ht_bkts == NULL)
+		return (-1);
 	ht->ht_tblsz = len;
 	ht->ht_grow = growsz;
 	ht->ht_col = col;
@@ -342,16 +348,9 @@
 void
 hashtbl_destroy(struct hashtbl *ht)
 {
-	struct hashentry *he;
 	struct he_pool *hep, *hep2;
-	size_t i;
 
-	for (i = 0; i < ht->ht_tblsz; i++) {
-		TAILQ_FOREACH(he, &ht->ht_bkts[i].hb_table, he_next) {
-			if (he->he_flags & HASHTBL_KEYDUP)
-				free(he->he_key.vol);
-		}
-	}
+	hashtbl_flush(ht);
 	SLIST_FOREACH_SAFE(hep, &ht->ht_new, hep_next, hep2) {
 		free(hep);
 	}
@@ -401,6 +400,8 @@
 		return (-1);
 
 	he = alloc_he(ht);
+	if (he == NULL)
+		return (-1);
 
 	he->he_hash = hval;
 	hval &= ht->ht_mask;
@@ -408,6 +409,8 @@
 
 	if (flags & HASHTBL_KEYDUP) {
 		he->he_key.vol = malloc(keylen);
+		if (he->he_key.vol == NULL)
+			return (-1);
 		memcpy(he->he_key.vol, key, keylen);
 	}
 	else {
@@ -512,3 +515,23 @@
 		}
 	}
 }
+
+/*
+ * Flush all entries in table without destroying it
+ *   ht - hash table
+ */
+void
+hashtbl_flush(struct hashtbl *ht)
+{
+	struct hashentry *he, *he2;
+	size_t i;
+
+	for (i = 0; i < ht->ht_tblsz; i++) {
+		TAILQ_FOREACH_SAFE(he, &ht->ht_bkts[i].hb_table, he_next, he2) {
+			TAILQ_REMOVE(&ht->ht_bkts[i].hb_table, he, he_next);
+			if (he->he_flags & HASHTBL_KEYDUP)
+				free(he->he_key.vol);
+			free_he(ht, he);
+		}
+	}
+}

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/hash.h#7 (text+ko) ====

@@ -86,5 +86,6 @@
 int hashtbl_del(struct hashtbl *, const void *, size_t);
 void * hashtbl_find(struct hashtbl *, const void *, size_t);
 void hashtbl_walk(struct hashtbl *, hashtbl_cb, void *);
+void hashtbl_flush(struct hashtbl *);
 
 #endif /* _HASH_H_ */

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:06:10 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 734FC16A559; Wed,  3 Oct 2007 21:06:10 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2738E16A553
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:06:10 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 52F1613C4B5
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:06:09 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93L69Fb095737
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:06:09 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93L69H7095734
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:06:09 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:06:09 GMT
Message-Id: <200710032106.l93L69H7095734@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127142 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:06:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=127142

Change 127142 by fli@fli_nexus on 2007/10/03 21:05:36

	- Follow changes to record subsystem.
	- Add cache related structures and prototypes into
	  its own header file.
	- Cope with failures in a more clean way.
	- Some minor whitespace fixes and new debug asserts

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/cache.c#7 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/cache.h#1 add

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/cache.c#7 (text+ko) ====

@@ -28,6 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 
+#include "cache.h"
 #include "mdnsd.h"
 #include "record.h"
 #include "log.h"
@@ -80,12 +81,17 @@
 	TAILQ_REMOVE(&c->c_list, cr, cr_next);
 }
 
-void
+int
 cache_init(struct cache *c, struct queries *q)
 {
-	records_init(&c->c_recs, mdns_c_in);
+	int error;
+	error = records_init(&c->c_recs);
+	if (error != 0)
+		return (-1);
 	TAILQ_INIT(&c->c_list);
 	c->c_queries = q;
+	MDNS_INIT_SET(c, c_magic);
+	return (0);
 }
 
 void
@@ -94,7 +100,7 @@
 	struct cache_res *cr, *cr2;
 
 	TAILQ_FOREACH_SAFE(cr, &c->c_list, cr_next, cr2) {
-		cache_del(c, &cr->cr_res);
+		cache_del(c, cr);
 	}
 	records_destroy(&c->c_recs);
 }
@@ -106,7 +112,6 @@
 cache_clean(struct cache *c)
 {
 	struct cache_res *cr;
-	struct record_res *rr;
 
 	cr = TAILQ_FIRST(&c->c_list);
 	if (cr == NULL)
@@ -117,8 +122,8 @@
 
 	/* Remove entries with the same ttl */
 	do {
-		rr = &cr->cr_res;
-		cache_del(c, rr);
+		MDNS_INIT_ASSERT(cr, cr_magic);
+		cache_del(c, cr);
 		cr = TAILQ_FIRST(&c->c_list);
 		if (cr == NULL)
 			break;
@@ -134,55 +139,64 @@
  * ttl value specified in the given `rrset'.
  */
 int
-cache_add(struct cache *c, struct mdns_rrset *rrset, struct record_res **new)
+cache_add(struct cache *c, struct mdns_rrset *rrset, struct cache_res **new)
 {
-	struct record *r;
 	struct record_res *rr;
-	struct record_type *rt;
 	struct cache_res *cr;
-	int rval;
+	int error, rval;
+	struct recpar rp;
+
+	MDNS_INIT_ASSERT(c, c_magic);
 
-	rr = NULL;
-	rt = record_type_find(&c->c_recs, rrset->r_name, rrset->r_type);
-	if (rt != NULL) {
-		record_type_foreach(rr, rt) {
-			if (rr->rr_len == rrset->r_datalen &&
-			    memcmp(rr->rr_data, rrset->r_data, rr->rr_len) == 0)
-				break;
-		}
-	}
+	rr = record_res_find(&c->c_recs, 0, rrset->r_name, rrset->r_class,
+	    rrset->r_type, rrset->r_data, rrset->r_datalen);
 
 	if (rr != NULL) {
-		cache_set_ttl(c, rr, rrset->r_ttl);
+		cr = record_res_getparent(rr);
+		cache_set_ttl(c, cr, rrset->r_ttl);
 		dprintf(DEBUG_CACHE,
-		    "TTL set to %d on name=%s, type=%d, rdatalen=%d",
-		    rrset->r_ttl, rrset->r_name, rrset->r_type,
+		    "TTL set to %d on name=%s, class=%d, type=%d, rdatalen=%d",
+		    rrset->r_ttl, rrset->r_name, rrset->r_class, rrset->r_type,
 		    rrset->r_datalen);
 		rval = 1;
 		if (new != NULL)
-			*new = rr;
+			*new = cr;
 	}
 	else if (rrset->r_ttl > 0) {
-		record_get(&c->c_recs, &r, 0, rrset->r_name);
 		cr = malloc(sizeof(struct cache_res));
+		if (cr == NULL)
+			goto cache_add_fail;
 		rr = &cr->cr_res;
-		record_res_add(r, &rr, RECORD_NOALLOC, rrset->r_type,
-		    rrset->r_data, rrset->r_datalen);
-		record_res_setparent(&cr->cr_res, cr);
+		rp.rp_handle = cr;
+		rp.rp_del_cb = NULL;
+		error = record_res_add(&c->c_recs, &rr,
+		    REC_NOALLOC | REC_RESOWN, &rp, rrset->r_name,
+		    rrset->r_class, rrset->r_type, rrset->r_data,
+		    rrset->r_datalen);
+		if (error != 0) {
+			free(cr);
+			goto cache_add_fail;
+		}
+
 		cr->cr_ttl_abs = rrset->r_ttl;
 		cr->cr_ttl_rel = rrset->r_ttl;
 		cr->cr_ctime = time(NULL);
 		MDNS_INIT_SET(cr, cr_magic);
 		enqueue_ttl(c, cr);
-		dprintf(DEBUG_CACHE,
-		    "Record added to cache name=%s, type=%d, ttl=%d, dlen=%d",
-		    rrset->r_name, rrset->r_type, rrset->r_ttl,
+		dprintf(DEBUG_CACHE, "Record added to cache name=%s, "
+		    "class=%d, type=%d, ttl=%d, dlen=%d", rrset->r_name,
+		    rrset->r_class, rrset->r_type, rrset->r_ttl,
 		    rrset->r_datalen);
 		rval = 0;
 		if (new != NULL)
-			*new = &cr->cr_res;
+			*new = cr;
 	}
 	return (rval);
+cache_add_fail:
+	dprintf(DEBUG_CACHE, "Failed to add record to cache rrset=%p, name=%s, "
+	    "class=%d, type=%d, ttl=%d, dlen=%d", rrset, rrset->r_name,
+	    rrset->r_class, rrset->r_type, rrset->r_ttl, rrset->r_datalen);
+	return (-1);
 }
 
 /*
@@ -191,37 +205,41 @@
  *  rr - Resource record
  */
 int
-cache_del(struct cache *c, struct record_res *rr)
+cache_del(struct cache *c, struct cache_res *cr)
 {
-	struct cache_res *cr;
-	struct record *r = rr->rr_type->rt_record;
-	struct record_type *rt = rr->rr_type;
+	struct record *r;
+	struct record_class *rc;
+	struct record_type *rt;
+	struct record_res *rr;
 #ifdef DEBUG
 	time_t rtime = time(NULL);
 #endif
 	struct mdns_rrset rs;
 
-	MDNS_INIT_ASSERT(rr, rr_magic);
-	cr = record_res_getparent(rr);
+	MDNS_INIT_ASSERT(c, c_magic);
+	MDNS_INIT_ASSERT(cr, cr_magic);
+
+	rr = &cr->cr_res;
+	rt = record_get_type(rr);
+	rc = record_get_class(rt);
+	r = record_get_record(rc);
 
-	dprintf(DEBUG_CACHE, "Removed %s from cache, type=%d, dlen=%d,"
-	    "attl=%d, rttl=%d, cached=%d", r->r_name, rt->rt_type, rr->rr_len,
+	dprintf(DEBUG_CACHE, "Removed %s from cache, class=%d, type=%d, dlen=%d"
+	    ", attl=%d, rttl=%d, cached=%d", r->r_name, rt->rt_type, rr->rr_len,
 	    cr->cr_ttl_abs, cr->cr_ttl_rel, rtime - cr->cr_ctime);
 
 	if (c->c_queries != NULL) {
 		mdns_rrset_name(&rs, r->r_name);
 		rs.r_ttl = 0;
-		rs.r_class = mdns_c_in;
+		rs.r_class = rc->rc_class;
 		rs.r_type = rt->rt_type;
 		rs.r_data = rr->rr_data;
 		rs.r_datalen = rr->rr_len;
 		query_notify(c->c_queries, &rs, 0, 0, 0);
 	}
 
-	MDNS_INIT_ASSERT(cr, cr_magic);
 	dequeue_ttl(c, cr);
 	record_res_del(rr);
-	record_release(r);
 	MDNS_INIT_UNSET(cr, cr_magic);
 	free(cr);
 	return (0);
@@ -229,21 +247,24 @@
 
 /*
  * Check if a record is in cache
- *  c    - Cache handle
- *  name - Resource name
- *  type - Resource type
+ *  c     - Cache handle
+ *  name  - Resource name
+ *  class - Resource class
+ *  type  - Resource type
  */
 struct cache_res *
-cache_find(struct cache *c, char *name, uint16_t type)
+cache_find(struct cache *c, char *name, uint16_t class, uint16_t type)
 {
 	struct record_res *rr;
 	struct record_type *rt;
 
-	rt = record_type_find(&c->c_recs, name, type);
+	rt = record_type_find(&c->c_recs, REC_CTANY, name, class, type);
 	if (rt == NULL)
 		return (NULL);
 
-	rr = record_type_first(rt);
+	rr = record_res_first(rt);
+	if (rr == NULL)
+		return (NULL);
 	return (record_res_getparent(rr));
 }
 
@@ -252,16 +273,39 @@
  * are available per (name,type) pair.
  */
 struct cache_res *
-cache_find_next(struct cache_res *cr)
+cache_find_next(struct cache *c, struct cache_res *cr,
+    uint16_t class, uint16_t type)
 {
 	struct record_res *rr;
+	struct record_type *rt;
+	struct record_class *rc;
 
 	rr = &cr->cr_res;
-	rr = record_type_next(rr);
+	rt = record_get_type(rr);
+	rc = record_get_class(rt);
+	rr = record_res_next(rr);
 	if (rr != NULL)
 		return (record_res_getparent(rr));
-	else
+
+	rt = record_type_find_next(rt, type);
+	if (rt != NULL) {
+		rr = record_res_first(rt);
+		if (rr == NULL)
+			return (NULL);
+		return (record_res_getparent(rr));
+	}
+
+	rc = record_class_find_next(rc, class);
+	if (rc == NULL)
+		return (NULL);
+	rt = record_type_find(&c->c_recs, REC_CTANY | REC_OBJCLASS, NULL,
+	    (uintptr_t)rc, type);
+	if (rt == NULL)
+		return (NULL);
+	rr = record_res_first(rt);
+	if (rr == NULL)
 		return (NULL);
+	return (record_res_getparent(rr));
 }
 
 /*
@@ -272,14 +316,15 @@
  *  type   - Resource type
  */
 void
-cache_purge(struct cache *c, time_t offset, char *name, uint16_t type)
+cache_purge(struct cache *c, time_t offset, char *name, uint16_t class,
+    uint16_t type)
 {
 	struct cache_res *cr;
 	struct record_res *rr, *rr2;
 	struct record_type *rt;
 	time_t cur;
 
-	rt = record_type_find(&c->c_recs, name, type);
+	rt = record_type_find(&c->c_recs, 0, name, class, type);
 	if (rt == NULL)
 		return;
 
@@ -288,7 +333,7 @@
 	TAILQ_FOREACH_SAFE(rr, &rt->rt_list, rr_next, rr2) {
 		cr = record_res_getparent(rr);
 		if ((cur - cr->cr_ctime) > offset)
-			cache_set_ttl(c, rr, 1);
+			cache_set_ttl(c, cr, 1);
 	}
 }
 
@@ -299,13 +344,14 @@
  *  ttl - New TTL
  */
 void
-cache_set_ttl(struct cache *c, struct record_res *rr, uint32_t ttl)
+cache_set_ttl(struct cache *c, struct cache_res *cr, uint32_t ttl)
 {
-	struct cache_res *cr;
+
+	MDNS_INIT_ASSERT(c, c_magic);
+	MDNS_INIT_ASSERT(cr, cr_magic);
 
 	if (ttl == 0)
 		ttl++;
-	cr = record_res_getparent(rr);
 	dequeue_ttl(c, cr);
 	cr->cr_ttl_rel = ttl;
 	cr->cr_ctime = time(NULL);
@@ -322,7 +368,7 @@
 	struct cache_res *cr, *cr2;
 
 	TAILQ_FOREACH_SAFE(cr, &c->c_list, cr_next, cr2) {
-		cache_del(c, &cr->cr_res);
+		cache_del(c, cr);
 	}
 	dprintf(DEBUG_CACHE, "Flushed all cache entries c=%x", c);
 }

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:11:15 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AD10216A419; Wed,  3 Oct 2007 21:11:15 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 41E9F16A41B
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:11:15 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1B56D13C465
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:11:15 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LBFQY096117
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:11:15 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93LBE5K096114
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:11:14 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:11:14 GMT
Message-Id: <200710032111.l93LBE5K096114@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127144 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:11:16 -0000

http://perforce.freebsd.org/chv.cgi?CH=127144

Change 127144 by fli@fli_nexus on 2007/10/03 21:11:03

	- Follow changes to the record subsystem.
	- Make dbr_init() return an int to indicate success/failure.
	- Better failure handling (NULL checks etc)
	- Clean up the header file.
	- Minor fixes and comments. 

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.c#8 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.h#5 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.c#8 (text+ko) ====

@@ -33,6 +33,7 @@
 #include "output.h"
 #include "record.h"
 #include "log.h"
+#include "util.h"
 #include "var.h"
 
 static void rec_update(struct dbr_ident *, struct vt_data *, size_t);
@@ -60,20 +61,30 @@
 /*
  * Initialize a database record system
  */
-void
+int
 dbr_init(struct dbr *dbr, void *context)
 {
 	struct md_if *mif = context;
+	int error;
 
 	dbr->dbr_ctx = context;
-	MDNS_INIT_SET(dbr, dbr_magic);
-	hashtbl_init(&dbr->dbr_ident, 8, 512, 3);
+	error = hashtbl_init(&dbr->dbr_ident, 8, 512, 3);
+	if (error != 0)
+		goto dbr_init_fail;
 	TAILQ_INIT(&dbr->dbr_ilist);
 
+	MDNS_INIT_SET(dbr, dbr_magic);
 	var_init(&dbr->dbr_vars, mif->mif_glob->g_evl, dbr);
-	/* We only do the IN class */
-	records_init(&dbr->dbr_recs, mdns_c_in);
-	dprintf(DEBUG_DBR, "Database records initialized");
+	error = records_init(&dbr->dbr_recs);
+	if (error != 0)
+		goto dbr_init_fail2;
+	dprintf(DEBUG_DBR, "Record database initialized");
+	return (0);
+dbr_init_fail2:
+	hashtbl_destroy(&dbr->dbr_ident);
+dbr_init_fail:
+	dprintf(DEBUG_DBR, "Failed to initialize record database");
+	return (-1);
 }
 
 /*
@@ -303,6 +314,7 @@
 {
 	struct dbr_ident *dbi;
 	size_t ilen;
+	int error;
 
 	ilen = strlen(ident);
 
@@ -314,12 +326,12 @@
 
 		dbi->dbi_flags &= flags;
 		dbi->dbi_flags |= flags;
-		goto out;
+		goto dbr_ident_fail;
 	}
 
 	dbi = malloc(sizeof(struct dbr_ident));
 	if (dbi == NULL)
-		goto out;
+		goto dbr_ident_fail;
 	bzero(dbi, sizeof(struct dbr_ident));
 	MTX_INIT(dbi, dbi_mtx, NULL);	
 	dbi->dbi_dbr = dbr;
@@ -330,14 +342,20 @@
 	TAILQ_INIT(&dbi->dbi_res_ptr);
 	MDNS_INIT_SET(dbi, dbi_magic);
 
+	error = hashtbl_add(&dbr->dbr_ident, dbi->dbi_ident, ilen, dbi, 0);
+	if (error != 0) {
+		free(dbi->dbi_ident);
+		free(dbi);
+		goto dbr_ident_fail;
+	}
 	TAILQ_INSERT_TAIL(&dbr->dbr_ilist, dbi, dbi_next);
-	hashtbl_add(&dbr->dbr_ident, dbi->dbi_ident, ilen, dbi, 0);
 
 	dprintf(DEBUG_DBR, "Added record set identifier %s, dbi=%x",
 	    ident, dbi);
 	RW_UNLOCK(dbr, dbr_lock);
 	return (0);
-out:
+dbr_ident_fail:
+	dprintf(DEBUG_DBR, "Failed to add record set identifier %s", ident);
 	RW_UNLOCK(dbr, dbr_lock);
 	return (-1);
 }
@@ -420,7 +438,8 @@
 {
 	struct dbr_ident *dbi;
 	char **ident;
-	int i;
+	void *tmp;
+	int i, j;
 
 	MDNS_INIT_ASSERT(dbr, dbr_magic);
 
@@ -429,15 +448,30 @@
 	RW_RLOCK(dbr, dbr_lock);
 	TAILQ_FOREACH(dbi, &dbr->dbr_ilist, dbi_next) {
 		MDNS_INIT_ASSERT(dbi, dbi_magic);
-		ident = realloc(ident, sizeof(char *) * ++i);
+		tmp = realloc(ident, sizeof(char *) * ++i);
+		if (tmp == NULL) {
+			i--;
+			goto dbr_ident_list_fail;
+		}
+		ident = tmp;
 		ident[i - 1] = strdup(dbi->dbi_ident);
+		if (ident[i - 1] == NULL)
+			goto dbr_ident_list_fail;
 	}
 	RW_UNLOCK(dbr, dbr_lock);
 
-	ident = realloc(ident, sizeof(char *) * ++i);
+	tmp = realloc(ident, sizeof(char *) * ++i);
+	if (tmp == NULL)
+		goto dbr_ident_list_fail;
 	ident[i - 1] = NULL;
 
 	return (ident);
+dbr_ident_list_fail:
+	for (j = 0; j < i; j++)
+		free(ident[j]);
+	if (ident != NULL)
+		free(ident);
+	return (NULL);
 }
 
 /*
@@ -953,7 +987,9 @@
 	struct record *r;
 	size_t i, vtd_len;
 	struct vt_data *vtd;
+	struct recpar rp;
 	char *p;
+	int error;
 
 	dbr = dbi->dbi_dbr;
 	MDNS_INIT_ASSERT(dbr, dbr_magic);
@@ -968,10 +1004,15 @@
 	MDNS_INIT_SET(dr, dr_magic);
 
 	p = mdns_name_encode(nam, wcslen(nam), MDNS_ENC_AUTO);
+	if (p == NULL)
+		goto rec_add_fail;
 	r = &dr->dr_rec;
-	record_get(&dbr->dbr_recs, &r, RECORD_NOALLOC, p);
-	record_setparent(r, dr);
+	rp.rp_handle = dr;
+	rp.rp_del_cb = NULL;
+	error = record_get(&dbr->dbr_recs, &r, &rp, REC_NOALLOC, p);
 	free(p);
+	if (error != 0)
+		goto rec_add_fail;
 
 	TAILQ_INSERT_TAIL(&dbi->dbi_rech, dr, dr_next);
 	dbi->dbi_records++;
@@ -987,10 +1028,8 @@
 			dr2 = TAILQ_FIRST(&dbi2->dbi_rech);
 			dsh = res_add(dr, dir, NULL, dr2->dr_name);
 
-			while ((dr2 = TAILQ_NEXT(dr2, dr_next))
-			    != NULL) {
+			while ((dr2 = TAILQ_NEXT(dr2, dr_next)) != NULL)
 				res_add(dr, dir, dsh, dr2->dr_name);
-			}
 		}
 		else {
 			vtd = var_expand(&dbr->dbr_vars, dir->dir_data.wp,
@@ -1002,8 +1041,12 @@
 			var_vtdfree(vtd, vtd_len);
 		}
 	}
-
+	dprintf(DEBUG_DBR, "Added real record, nam=%ls", nam);
 	return (dr);
+rec_add_fail:
+	free(dr->dr_name);
+	dprintf(DEBUG_DBR, "Failed to add record to database, nam=%ls", nam);
+	return (NULL);
 }
 
 /*
@@ -1050,8 +1093,8 @@
 	struct dbr_res *ds, *ds2;
 	struct dbr_rec *dr;
 	size_t rlen;
-	ssize_t diff;
 	char *p;
+	int error;
 	uint32_t i;
 
 	assert(dsh->ds_chead == dsh);
@@ -1070,16 +1113,65 @@
 
 	if (dsh->ds_data != NULL)
 		free(dsh->ds_data);
-	dsh->ds_data = _wcsdup(res[0]);
-	p = mdns_res_encode(dir->dir_class, dir->dir_type, res[0],
-	    MDNS_ENC_WCHAR, wcslen(res[0]), &rlen);
-	record_res_setdata(&dsh->ds_res, p, rlen);
+
+	/*
+	 * Try each resource, continue for as long as there are resources
+	 * and they keep failing.
+	 */
+	for (i = 0; i < reslen; i++) {
+		p = mdns_res_encode(dir->dir_class, dir->dir_type, res[i],
+		    MDNS_ENC_WCHAR, wcslen(res[i]), &rlen);
+		if (p == NULL)
+			continue;
+		error = record_res_setdata(&dsh->ds_res, REC_RESOWN, p, rlen);
+		if (error != 0) {
+			free(p);
+			continue;
+		}
+		dsh->ds_data = _wcsdup(res[i]);
+		i++;
+		break;
+	}
 
-	i = 1;
 	/*
 	 * Replace resource data as long as there is enough clones
 	 * and results available.
 	 */
+	ds = TAILQ_FIRST(&dsh->ds_clone.head);
+	for (; i < reslen; i++) {
+		if (ds == NULL)
+			break;
+		if (ds->ds_data != NULL)
+			free(ds->ds_data);
+		ds->ds_data = _wcsdup(res[i]);
+
+		p = mdns_res_encode(dir->dir_class, dir->dir_type, res[i],
+		    MDNS_ENC_WCHAR, wcslen(res[i]), &rlen);
+		if (p == NULL)
+			continue;
+		error = record_res_setdata(&ds->ds_res, REC_RESOWN, p, rlen);
+		if (error != 0)
+			continue;
+
+		ds = TAILQ_NEXT(ds, ds_next);
+	}
+
+	if (ds == NULL) {
+		/* More results than clones, expand */
+		for (; i < reslen; i++) {
+			res_add(dr, dir, dsh, res[i]);
+		}
+	}
+	else {
+		/* More clones than results, shrink */
+		while (ds != NULL) {
+			ds2 = TAILQ_NEXT(ds, ds_next);
+			res_del(ds);
+			ds = ds2;
+		}
+	}
+
+#if 0
 	TAILQ_FOREACH(ds, &dsh->ds_clone.head, ds_clone.next) {
 		if (i == dsh->ds_clones || i == reslen)
 			break;
@@ -1089,7 +1181,14 @@
 
 		p = mdns_res_encode(dir->dir_class, dir->dir_type, res[i],
 		    MDNS_ENC_WCHAR, wcslen(res[i]), &rlen);
-		record_res_setdata(&ds->ds_res, p, rlen);
+		if (p == NULL) {
+			dprintf(DEBUG_DBR, "Failed to encode resource");
+			continue;
+		}
+		error = record_res_setdata(&ds->ds_res, REC_RESOWN, p, rlen);
+		if (error != 0) {
+
+		}
 		i++;
 	}
 
@@ -1109,7 +1208,7 @@
 			res_del(ds);
 		}
 	}
-
+#endif
 }
 
 /*
@@ -1200,16 +1299,21 @@
 res_add(struct dbr_rec *dr, struct dbr_ident_res *dir, struct dbr_res *dsh,
     wchar_t *res)
 {
+	struct dbr *dbr;
 	struct dbr_res *ds;
 	struct dbr_ident *dbi;
-	char *p;
-	size_t rlen;
 	struct record *r;
 	struct record_res *rr;
+	struct recpar rp;
+	size_t rlen;
+	int error;
+	char *p;
 
 	MDNS_INIT_ASSERT(dir, dir_magic);
 	dbi = dir->dir_dbi;
 	MDNS_INIT_ASSERT(dbi, dbi_magic);
+	dbr = dbi->dbi_dbr;
+	MDNS_INIT_ASSERT(dbr, dbr_magic);
 
 	ds = malloc(sizeof(struct dbr_res));
 	if (ds == NULL)
@@ -1233,21 +1337,38 @@
 	r = &dr->dr_rec;
 	rr = &ds->ds_res;
 
+	ds->ds_data = _wcsdup(res);
+	if (ds->ds_data == NULL)
+		goto res_add_fail;
+
 	p = mdns_res_encode(dir->dir_class, dir->dir_type, res,
 	    MDNS_ENC_WCHAR, wcslen(res), &rlen);
+	if (p == NULL)
+		goto res_add_fail2;
 
-	record_res_add(r, &rr, RECORD_NOALLOC, dir->dir_type, p, rlen);
-	record_res_setparent(&ds->ds_res, ds);
-
+	rp.rp_handle = ds;
+	rp.rp_del_cb = NULL;
+	error = record_res_add(&dbr->dbr_recs, &rr,
+	    REC_NOALLOC | REC_OBJNAME | REC_RESOWN,
+	    &rp, r, dir->dir_class, dir->dir_type, p, rlen);
+	if (error != 0) {
+		free(p);
+		goto res_add_fail2;
+	}
+	
 	ds->ds_rec = dr;
-	ds->ds_data = _wcsdup(res);
 	ds->ds_dir = dir;
 	MDNS_INIT_SET(ds, ds_magic);
 
 	dprintf(DEBUG_DBR, "Added real resource ds=%x to record %ls, dr=%x, "
 	    "dir=%x", ds, dr->dr_name, dr, dir);
-
 	return (ds);
+res_add_fail2:
+	free(ds->ds_data);
+res_add_fail:
+	dprintf(DEBUG_DBR, "Failed to add real resource %ls, dir=%p",
+	    res, dir);
+	return (NULL);
 }
 
 /*
@@ -1285,87 +1406,93 @@
 	free(ds);
 }
 
-#if 0
 /*
- * Remove a resource from a database record
- *   ds - Database resource pointer
- *
- * All clones will be removed aswell, to remove/free only one resource
- * use res_del().
+ * Look up exact matching resource
  */
-void
-dbr_res_del(struct dbr_res *ds)
+struct dbr_res *
+dbr_find_res(struct dbr *dbr, char *name, uint16_t class, uint16_t type,
+    char *res, size_t rlen)
 {
-	struct dbr_rec *dr;
-	struct dbr *dbr;
-	struct dbr_type *dt;
-	struct dbr_res *ds2, *ds_tmp;
+	struct record_res *rr;
 
-	MDNS_INIT_ASSERT(ds, ds_magic);
-	dt = ds->ds_type;
-	MDNS_INIT_ASSERT(dt, dt_magic);
-	dr = dt->dt_rec;
-	MDNS_INIT_ASSERT(dr, dr_magic);
-	dbr = dr->dr_dbr;
-	MDNS_INIT_ASSERT(dbr, dbr_magic);
+	/* Unlocked by either dbr_find_next() or dbr_find_end() */
+	RW_RLOCK(dbr, dbr_lock);
 
-	ds2 = ds->ds_chead;
-	if (ds2->ds_flags & DS_POINTER)
-		TAILQ_REMOVE(&ds2->ds_vdata.rec->dr_res_ptr, ds2, ds_ptr_next);
-	else
-		var_dereg(&dbr->dbr_vars, ds2->ds_vdata.wp, ds2);
-
-	TAILQ_FOREACH_SAFE(ds, &ds2->ds_clone.head, ds_clone.next, ds_tmp) {
-		dprintf(DEBUG_DBR, "Removing clone %x (orig %x)", ds, ds2);
-		res_del(ds);
-	}
-
-	res_del(ds2);
-	record_type_release(&dt->dt_type);
-	dprintf(DEBUG_DBR, "Database resource %x removed", ds2);
+	rr = record_res_find(&dbr->dbr_recs, 0, name, class, type, res, rlen);
+	if (rr == NULL)
+		goto dbr_find_res_fail;
+	return (record_res_getparent(rr));
+dbr_find_res_fail:
+	RW_UNLOCK(dbr, dbr_lock);
+	return (NULL);
 }
-#endif
 
 struct dbr_res *
-dbr_find_res(struct dbr *dbr, char *name, uint16_t type, char *res,
-    size_t rlen)
+dbr_find(struct dbr *dbr, const char *name, uint16_t class, uint16_t type)
 {
+	struct record_res *rr;
 	struct record_type *rt;
-	struct record_res *rr;
+
+	/* Unlocked by either dbr_find_next() or dbr_find_end() */
+	RW_RLOCK(dbr, dbr_lock);
+
+	rt = record_type_find(&dbr->dbr_recs, REC_CTANY, name, class, type);
+	if (rt == NULL)
+		goto dbr_find_fail;
 
-	rt = record_type_find(&dbr->dbr_recs, name, type);
-	record_type_foreach(rr, rt) {
-		if (rlen == rr->rr_len)
-			if (memcmp(res, rr->rr_data, rlen) == 0)
-				return (record_res_getparent(rr));
-	}
+	rr = record_res_first(rt);
+	if (rr == NULL)
+		goto dbr_find_fail;
+	return (record_res_getparent(rr));
+dbr_find_fail:
+	RW_UNLOCK(dbr, dbr_lock);
 	return (NULL);
 }
 
-struct dbr_type *
-dbr_find_type(struct dbr *dbr, char *name, uint16_t type)
+struct dbr_res *
+dbr_find_next(struct dbr *dbr, struct dbr_res *ds, uint16_t class,
+    uint16_t type)
 {
+	struct record_res *rr;
 	struct record_type *rt;
-	struct dbr_type *dt = NULL;
+	struct record_class *rc;
+
+	rr = &ds->ds_res;
+	rt = record_get_type(rr);
+	rc = record_get_class(rt);
+	rr = record_res_next(rr);
+	if (rr != NULL)
+		return (record_res_getparent(rr));
 
-	rt = record_type_find(&dbr->dbr_recs, name, type);
-	if (rt != NULL)
-		dt = record_type_getparent(rt);
+	rt = record_type_find_next(rt, type);
+	if (rt != NULL) {
+		rr = record_res_first(rt);
+		if (rr == NULL)
+			goto dbr_find_next_end;
+		return (record_res_getparent(rr));
+	}
 
-	return (dt);
+	rc = record_class_find_next(rc, class);
+	if (rc == NULL)
+		goto dbr_find_next_end;
+	rt = record_type_find(&dbr->dbr_recs, REC_CTANY | REC_OBJCLASS, NULL,
+	    (uintptr_t)rc, type);
+	if (rt == NULL)
+		goto dbr_find_next_end;
+	rr = record_res_first(rt);
+	if (rr == NULL)
+		goto dbr_find_next_end;
+	return (record_res_getparent(rr));
+dbr_find_next_end:
+	RW_UNLOCK(dbr, dbr_lock);
+	return (NULL);
 }
 
-struct dbr_rec *
-dbr_find(struct dbr *dbr, char *name)
+void
+dbr_find_end(struct dbr *dbr)
 {
-	struct record *r;
-	struct dbr_rec *dr = NULL;
 
-	r = record_find(&dbr->dbr_recs, name);
-	if (r != NULL)
-		dr = record_getparent(r);
-
-	return (dr);
+	RW_UNLOCK(dbr, dbr_lock);
 }
 
 /*
@@ -1508,6 +1635,7 @@
 dbr_tiebreak(struct dbr *dbr __unused, struct dbr_rec *dr, struct record *pr)
 {
 	struct record *r;
+	struct record_class *rc, *prc;
 	struct record_type *rt, *prt;
 	struct record_res *rr, *prr;
 	int diff, len;
@@ -1519,68 +1647,92 @@
 	if (!(dr->dr_flags & DR_PROBING))
 		return;
 
-	prt = record_first(pr);
+	prc = record_class_first(pr);
+	if (prc == NULL)
+		return;
+
 	if (prt == NULL)
 		return;
 
 	r = &dr->dr_rec;
-	rt = record_first(r);
+	rc = record_class_first(r);
 
 	/*
-	 * Compare record types one by one, the numerical greater one
-	 * wins. If types are equal, its resource data is byte compared.
+	 * Compare resources pairwaise, numerical greater one wins.
+	 * The record sub-system keeps classes and types sorted.
 	 */
-	while (rt != NULL && prt != NULL) {
-		if (prt->rt_type > rt->rt_type) {
+	while (rc != NULL && prc != NULL) {
+		if (prc->rc_class > rc->rc_class) {
 			outcome = 1;
 			break;
 		}
-		else if (prt->rt_type < rt->rt_type) {
+		else if (prc->rc_class < rc->rc_class) {
 			outcome = 2;
 			break;
 		}
+	
+		prt = record_type_first(prc);
+		rt = record_type_first(rc);
+
+		while (rt != NULL && prt != NULL) {
+			if (prt->rt_type > rt->rt_type) {
+				outcome = 1;
+				break;
+			}
+			else if (prt->rt_type < rt->rt_type) {
+				outcome = 2;
+				break;
+			}
 
-		rr = record_type_first(rt);
-		prr = record_type_first(prt);
+			rr = record_res_first(rt);
+			prr = record_res_first(prt);
 
-		while (rr != NULL && prr != NULL) {
-			len = rr->rr_len > prr->rr_len ?
-			    prr->rr_len : rr->rr_len;
+			while (rr != NULL && prr != NULL) {
+				len = rr->rr_len > prr->rr_len ?
+				    prr->rr_len : rr->rr_len;
 
-			diff = memcmp(rr->rr_data, prr->rr_data, len);
-			if (diff < 0)
-				outcome = 1;	
-			else if (diff > 0)
-				outcome = 2;
-			/*
-			 * If the data differs in length and the data upto
-			 * the common minimum length is identical we
-			 * assume that the longest resource is the
-			 * "lexiographically later" one.
-			 */
-			else if (diff == 0) {
-				if (prr->rr_len > rr->rr_len)
-					outcome = 1;
-				else if (rr->rr_len > prr->rr_len)
+				diff = memcmp(rr->rr_data, prr->rr_data, len);
+				if (diff < 0)
+					outcome = 1;	
+				else if (diff > 0)
 					outcome = 2;
+				/*
+			 	 * If the data differs in length and the data
+				 * upto the common minimum length is identical
+				 * we assume that the longest resource is the
+			 	 * "lexiographically later" one.
+			 	 */
+				else if (diff == 0) {
+					if (prr->rr_len > rr->rr_len)
+						outcome = 1;
+					else if (rr->rr_len > prr->rr_len)
+						outcome = 2;
+				}
 			}
+			if (prr != NULL && rr == NULL)
+				outcome = 1;
+			else if (prr == NULL && rr != NULL)
+				outcome = 2;
+
+			if (outcome != 0)
+				break;
+
+			rt = record_type_next(rt);
+			prt = record_type_next(prt);
 		}
-		if (prr != NULL && rr == NULL)
-			outcome = 1;
-		else if (prr == NULL && rr != NULL)
-			outcome = 2;
-
 		if (outcome != 0)
 			break;
-
-		rt = record_next(rt);
-		prt = record_next(prt);
 	}
 
 	/*
 	 * If the peer still has record types, but we don't we are
 	 * deemed the loser and the other way around.
 	 */
+	if (prc != NULL && rc == NULL)
+		outcome = 1;
+	else if (prc == NULL && rc != NULL)
+		outcome = 2;
+
 	if (prt != NULL && rt == NULL)
 		outcome = 1;
 	else if (prt == NULL && rt != NULL)
@@ -1594,7 +1746,7 @@
 		dprintf(DEBUG_DBR, "Lost tie-breaking on %ls", dr->dr_name);
 		col_probe(dr);
 	}
-	else if (outcome == 1) {
+	else if (outcome == 2) {
 		dprintf(DEBUG_DBR, "Won tie-breaking on %ls", dr->dr_name);
 	}
 }
@@ -1610,6 +1762,7 @@
 	struct mdns_rrset *rs;
 	struct dbr_res *ds;
 	struct record *r;
+	struct record_class *rc;
 	struct record_type *rt;
 	struct record_res *rr;
 	struct mdns_pkgchain pc;
@@ -1633,8 +1786,8 @@
 	}
 
 	/* Check if resource data is identical with what we have */
-	ds = dbr_find_res(dbr, prs->r_name, prs->r_type, prs->r_data,
-	    prs->r_datalen);
+	ds = dbr_find_res(dbr, prs->r_name, prs->r_class, prs->r_type,
+	    prs->r_data, prs->r_datalen);
 	if (ds != NULL) {
 		dprintf(DEBUG_DBR, "Identical resource data on record %s, "
 		    "no need to defend", prs->r_name);
@@ -1645,16 +1798,18 @@
 	mdns_pkgchain_init(&mif->mif_stack, &pc, MDNS_PC_NONE);
 
 	r = &dr->dr_rec;
-	record_foreach(rt, r) {
-		record_type_foreach(rr, rt) {
-			rs = mdns_pkg_getrrset();
-			mdns_rrset_name(rs, r->r_name);
-			rs->r_type = rt->rt_type;
-			rs->r_class = mdns_c_in;
-			rs->r_cflush = 1;
-			rs->r_datalen = rr->rr_len;
-			rs->r_data = rr->rr_data;
-			mdns_pkg_addanswer(&pc, rs, 0);
+	record_foreach(rc, r) {
+		record_class_foreach(rt, rc) {
+			record_type_foreach(rr, rt) {
+				rs = mdns_pkg_getrrset();
+				mdns_rrset_name(rs, r->r_name);
+				rs->r_type = rt->rt_type;
+				rs->r_class = rc->rc_class;
+				rs->r_cflush = 1;
+				rs->r_datalen = rr->rr_len;
+				rs->r_data = rr->rr_data;
+				mdns_pkg_addanswer(&pc, rs, 0);
+			}
 		}
 	}
 	oq_enqueue(&mif->mif_oq, &pc, family, NULL, 0);
@@ -1662,23 +1817,6 @@
 	RW_UNLOCK(dbr, dbr_lock);
 }
 
-static void
-record_probe_cb(struct record *r, void *arg)
-{
-	struct dbr_pac *pac;
-	struct dbr_rec *dr;
-
-	pac = arg;
-	MDNS_INIT_ASSERT(pac, pac_magic);
-	dr = record_getparent(r);
-	if (dr->dr_flags & DR_PROBING)
-		dbr_probe_del(dr);
-	if (dr->dr_flags & DR_ANNOUNCE)
-		dbr_an_del(dr);
-	if (!(dr->dr_flags & DR_SHARED))
-		dbr_probe_add(pac, dr);
-}
-
 /*
  * Initiate probe for all non-shared records in the given database
  *   dbr - Record database
@@ -1687,9 +1825,21 @@
 dbr_probe_all(struct dbr *dbr)
 {
 	struct dbr_pac *pac;
+	struct dbr_rec *dr;
+	struct record *r;
 
+	RW_RLOCK(dbr, dbr_lock);
 	pac = dbr_pac_new(dbr, PAC_PROBE);
-	records_foreach(&dbr->dbr_recs, record_probe_cb, pac);
+	records_foreach(r, &dbr->dbr_recs) {
+		dr = record_getparent(r);
+		if (dr->dr_flags & DR_PROBING)
+			dbr_probe_del(dr);
+		if (dr->dr_flags & DR_ANNOUNCE)
+			dbr_an_del(dr);
+		if (!(dr->dr_flags & DR_SHARED))
+			dbr_probe_add(pac, dr);
+	}
+	RW_UNLOCK(dbr, dbr_lock);
 	dbr_probe_start(pac);
 }
 
@@ -1880,40 +2030,40 @@
 	dbr_pac_start(pac, PAC_PROBE, delay_time, probe_step);
 }
 
-/*
- * Helper function to probe_step(), adds the given record to the
- * specified packet chain.
- */
-static inline void
-probe_add_rec(struct mdns_pkgchain *pc, struct dbr_rec *dr, int step)
+/* Create probe packet to a specific class */
+static inline int
+probe_add_rec_class(struct mdns_pkgchain *pc, struct record_class *rc, int step)
 {
-	struct mdns_qset *qs;
-	struct mdns_rrset *rs;
 	struct record *r;
 	struct record_type *rt;
 	struct record_res *rr;
+	struct mdns_qset *qs;
+	struct mdns_rrset *rs;
 	struct dbr_res *ds;
 	struct dbr_ident_res *dir;
 	struct mdns_rrset rstmp;
-	int error;
+	int error, retval;
 
-	MDNS_INIT_ASSERT(dr, dr_magic);
-	r = &dr->dr_rec;
-
+	r = record_get_record(rc);
 	qs = mdns_pkg_getqset();
+	if (qs == NULL)
+		return (-1);
 	mdns_qset_name(qs, r->r_name);
-	qs->q_class = mdns_c_in;
-	qs->q_type = mdns_in_any;
+	qs->q_class = rc->rc_class;
+	qs->q_type = mdns_t_any;
 	/* unicast on the first 2 steps only */
 	qs->q_unicast = (step < 2) ? 1 : 0;
 
-redo:
 	mdns_pkg_addquestion(pc, qs, 0);
-	record_foreach(rt, r) {
+	record_class_foreach(rt, rc) {
 		record_type_foreach(rr, rt) {
 			ds = record_res_getparent(rr);
 			dir = ds->ds_dir;
 			rs = mdns_pkg_getrrset();
+			if (rs == NULL) {
+				retval = -1;
+				goto probe_add_rec_class_fail;
+			}
 			mdns_rrset_name(rs, r->r_name);
 			rs->r_class = dir->dir_class;
 			rs->r_type = dir->dir_type;
@@ -1922,33 +2072,55 @@
 			rs->r_datalen = rr->rr_len;
 			rs->r_data = rr->rr_data;
 			error = mdns_pkg_addauth(pc, rs, MDNS_PKG_NOAE);
-			if (error == 0)
-				continue;
-			/*
-			 * Out of space in packet.
-			 * Undo everything and re-start with a fresh packet.
-			 */
-			mdns_pkg_delquestion(pc, qs);
-			record_foreach(rt, r) {
-				record_type_foreach(rr, rt) {
-					ds = record_res_getparent(rr);
-					dir = ds->ds_dir;
-					mdns_rrset_name(&rstmp, r->r_name);
-					rstmp.r_class = dir->dir_class;
-					rstmp.r_type = dir->dir_type;
-					rstmp.r_ttl = dir->dir_ttl;
-					rstmp.r_cflush = 0;
-					rstmp.r_datalen = rr->rr_len;
-					rstmp.r_data = rr->rr_data;
-					rs = mdns_pkg_delauth(pc, &rstmp);
-					if (rs != NULL)
-						mdns_pkg_freeset(rs);
-				}
+			if (error != 0) {
+				retval = 1;
+				goto probe_add_rec_class_fail;
 			}
+		}
+	}
+	return (0);
+probe_add_rec_class_fail:
+	mdns_pkg_delquestion(pc, qs);
+	record_class_foreach(rt, rc) {
+		record_type_foreach(rr, rt) {
+			ds = record_res_getparent(rr);
+			dir = ds->ds_dir;
+			mdns_rrset_name(&rstmp, r->r_name);
+			rstmp.r_class = dir->dir_class;
+			rstmp.r_type = dir->dir_type;
+			rstmp.r_ttl = dir->dir_ttl;
+			rstmp.r_cflush = 0;
+			rstmp.r_datalen = rr->rr_len;
+			rstmp.r_data = rr->rr_data;
+			rs = mdns_pkg_delauth(pc, &rstmp);
+			if (rs != NULL)
+				mdns_pkg_freeset(rs);
+		}
+	}
+	return (1);
+}
 
+/*
+ * Helper function to probe_step(), adds the given record to the
+ * specified packet chain.
+ */
+static inline void
+probe_add_rec(struct mdns_pkgchain *pc, struct dbr_rec *dr, int step)
+{
+	struct record *r;
+	struct record_class *rc;
+	int error;
+
+	MDNS_INIT_ASSERT(dr, dr_magic);
+	r = &dr->dr_rec;
+
+	record_foreach(rc, r) {
+		error = probe_add_rec_class(pc, rc, step);
+		/* Out of space, re-try */
+		if (error > 0) {
 			mdns_pkgchain_expand(pc);
 			mdns_pkg_sethdr(pc, 0, MDNS_HEAD_RESP | MDNS_HEAD_AA);
-			goto redo;
+			probe_add_rec_class(pc, rc, step);
 		}
 	}
 }
@@ -2019,6 +2191,7 @@
 		count++;
 	}
 
+	/* FIXME Must read-lock dbr or keep each ds locked while on queue */
 	if (count) {
 		oq_enqueue(&mif->mif_oq, &pc, AF_INET, NULL, 0);
 #ifdef INET6
@@ -2124,10 +2297,14 @@
 	 */
 	TAILQ_FOREACH_SAFE(dr, &pac->pac_head, dr_pac_next, dr2) {
 		MDNS_INIT_ASSERT(dr, dr_magic);
+		r = &dr->dr_rec;
 		TAILQ_FOREACH(ds, &dr->dr_resh, ds_next) {
+			MDNS_INIT_ASSERT(ds, ds_magic);
 			dir = ds->ds_dir;
-			MDNS_INIT_ASSERT(ds, ds_magic);
 			rs = mdns_pkg_getrrset();
+			if (rs == NULL)
+				break;
+			rr = &ds->ds_res;
 			mdns_rrset_name(rs, r->r_name);
 			rs->r_class = dir->dir_class;
 			rs->r_type = dir->dir_type;

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.h#5 (text+ko) ====

@@ -42,11 +42,11 @@
 	MAGIC(dbr_magic);
 	DEF_MTX(dbr_mtx);
 	DEF_RW(dbr_lock);
-	void *dbr_ctx; /* context specific back-pointer */
-	struct records dbr_recs; /* record subsystem */
-	struct vars dbr_vars; /* variable subsystem */
-	struct hashtbl dbr_ident;
-	TAILQ_HEAD(, dbr_ident) dbr_ilist;
+	void		*dbr_ctx;	/* Context specific back-pointer */
+	struct records	dbr_recs;	/* Record subsystem */
+	struct vars	dbr_vars;	/* Variable subsystem */
+	struct hashtbl	dbr_ident;	/* Identifier lookup */
+	TAILQ_HEAD(, dbr_ident) dbr_ilist; /* Identifier list */
 };
 
 /*
@@ -59,7 +59,7 @@
 	MAGIC(dbi_magic);
 	DEF_MTX(dbi_mtx);
 	TAILQ_ENTRY(dbr_ident) dbi_next;
-	struct dbr	*dbi_dbr;	/* back-pointer */
+	struct dbr	*dbi_dbr;	/* Back pointer */
 	char		*dbi_ident;	/* Unique identifier string */
 	wchar_t		**dbi_names;	/* Array of alternative record names */
 	int		dbi_curnam;	/* Current name in use */
@@ -177,50 +177,67 @@
 struct dbr_pac {
 	MAGIC(pac_magic);
 	DEF_MTX(pac_mtx);
-	struct dbr *pac_dbr;
-	int pac_step; /* step counter */
-	int pac_tmr; /* timer id of next step */
-	int pac_flags;
+	struct dbr 	*pac_dbr;
+	int		pac_step; /* step counter */
+	int 		pac_tmr; /* timer id of next step */
+	int 		pac_flags;
 #define PAC_RUNNING	0x01
-#define PAC_PROBE	0x02
-#define PAC_ANNOUNCE		0x04
+#define PAC_PROBE	0x02	/* This is a probe context */
+#define PAC_ANNOUNCE	0x04	/* This is an announce context */
 	TAILQ_HEAD(, dbr_rec) pac_head;
 };
 
-void dbr_init(struct dbr *, void *);
-void dbr_destroy(struct dbr *);
-struct dbr_rec * dbr_add(struct dbr *, char *, wchar_t **, int);
-void dbr_del(struct dbr_rec *);
-struct dbr_rec * dbr_find(struct dbr *, char *);
-struct dbr_type * dbr_find_type(struct dbr *, char *, uint16_t);
-struct dbr_res * dbr_find_res(struct dbr *, char *, uint16_t, char *, size_t);
+/* Initialize record database */
+int	dbr_init(struct dbr *, void *);
+void	dbr_destroy(struct dbr *);
+
+/* Create/remove a record resource identifier */
+int	dbr_ident_add(struct dbr *, char *, int);
+int	dbr_ident_del(struct dbr *, char *);
+
+/* Create/remove a name on an identifier */
+int	dbr_name_add(struct dbr *, char *, wchar_t *);
+int	dbr_name_del(struct dbr *, char *, wchar_t *);
+

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:15:20 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1294D16A421; Wed,  3 Oct 2007 21:15:20 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD59A16A418
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:15:19 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 97B4213C44B
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:15:19 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LFJJR096330
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:15:19 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93LFJc8096327
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:15:19 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:15:19 GMT
Message-Id: <200710032115.l93LFJc8096327@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127145 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:15:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=127145

Change 127145 by fli@fli_nexus on 2007/10/03 21:14:58

	- Follow changes to record subsystem.
	- Remove csc_suser field from struct cs_client and replace with
	  a generic flags field.
	- Fix a shutdown race that sometimes caused a dead lock.
	- Ignore SIGPIPE.
	- Add some new comments and whitespace cleaning.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/clisrv.c#10 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/clisrv.h#3 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/clisrv.c#10 (text+ko) ====

@@ -110,6 +110,7 @@
 		    path, strerror(errno));
 		return (-1);
 	}
+	signal(SIGPIPE, SIG_IGN);
 	eva.ptr = cs;
 	evai.fd = sock;
 	cs->cs_evid = event_add(g->g_evl, EVENT_TYPE_IO, evh_newcli, &eva,
@@ -146,6 +147,7 @@
 	MTX_UNLOCK(cs, cs_mtx);
 	MTX_DESTROY(cs, cs_mtx);
 	MDNS_INIT_UNSET(cs, cs_magic);
+	signal(SIGPIPE, SIG_DFL);
 	dprintf(DEBUG_CS, "Closed UNIX client pipe cs=%x", cs);
 }
 
@@ -244,7 +246,7 @@
 	TAILQ_INSERT_TAIL(&cs->cs_head, csc, csc_next);
 	csc->csc_sock = sock;
 	csc->csc_serv = cs;
-	csc->csc_suser = 0;
+	csc->csc_flags = 0;
 	eva.ptr = csc;
 	csc->csc_evid = event_add(g->g_evl, EVENT_TYPE_IO, evh_cli, &eva,
 	    evh_clisetup_init, &eva);
@@ -278,14 +280,18 @@
 		if (csc == NULL)
 			break;
 		MDNS_INIT_ASSERT(csc, csc_magic);
+
+		MTX_LOCK(csc, csc_mtx);
+		csc->csc_flags |= CSC_DYING;
 		cs = csc->csc_serv;
 		MDNS_INIT_ASSERT(cs, cs_magic);
-		MTX_LOCK(csc, csc_mtx);
 		MTX_LOCK(cs, cs_mtx);
 		TAILQ_REMOVE(&cs->cs_head, csc, csc_next);
 		MTX_UNLOCK(cs, cs_mtx);
 		/* Remove outstanding queries this client has */
+
 		TAILQ_FOREACH_SAFE(cscq, &csc->csc_queries, cscq_next, cscq2) {
+			TAILQ_REMOVE(&csc->csc_queries, cscq, cscq_next);
 			query_dereg(cscq->cscq_q, &cscq->cscq_qs, cscq);
 			TAILQ_REMOVE(&csc->csc_queries, cscq, cscq_next);
 			free(cscq->cscq_qs.q_name);
@@ -353,7 +359,10 @@
 			if (cmptr->cmsg_type == SCM_CREDS &&
 			    cmptr->cmsg_level == SOL_SOCKET) {
 				cred = (struct sockcred *)CMSG_DATA(cmptr);
-				csc->csc_suser = (cred->sc_euid == 0) ? 1 : 0;
+				if (cred->sc_euid == 0)
+					csc->csc_flags |= CSC_SUSER;
+				else
+					csc->csc_flags &= ~CSC_SUSER;
 			}
 		}
 
@@ -390,9 +399,10 @@
 			break;
 
 		dprintf(DEBUG_CS, "Received packet on UNIX pipe csc=%x, "
-		    "len=%d, suser=%d, sock=%d", csc, n, csc->csc_suser, sock);
+		    "len=%d, suser=%d, sock=%d", csc, n,
+		    csc->csc_flags & CSC_SUSER, sock);
 
-		error = cp_parse(csc, buf, len, csc->csc_suser);
+		error = cp_parse(csc, buf, len, csc->csc_flags & CSC_SUSER);
 		if (error != 0) {
 			dprintf(DEBUG_CS, "Failed to parse packet csc=%x", csc);
 		}
@@ -1423,6 +1433,7 @@
 	struct cache *c;
 	struct record_res *rr;
 	struct record_type *rt;
+	struct record_class *rc;
 	struct record *r;
 	struct mipc_head rmih;
 	struct mipc_cache mc;
@@ -1463,10 +1474,11 @@
 	c = &mif->mif_cache;
 	TAILQ_FOREACH(cr, &c->c_list, cr_next) {
 		rr = &cr->cr_res;
-		rt = rr->rr_type;
-		r = rt->rt_record;
+		rt = record_get_type(rr);
+		rc = record_get_class(rt);
+		r = record_get_record(rc);
 
-		mc.mc_class = mdns_c_in; /* XXX */
+		mc.mc_class = rc->rc_class;
 		mc.mc_type = rt->rt_type;
 		mc.mc_ttl = cr->cr_ttl_abs;
 		mc.mc_ttl_left = cr->cr_ttl_abs - (curtime - cr->cr_ctime);
@@ -1552,7 +1564,6 @@
 	dprintf(DEBUG_CS, "Ack sent to client csc=%x, id=%d", csc, id);
 }
 
-
 /*
  * Response callback from query system, called when a response to
  * a query comes in.
@@ -1576,6 +1587,9 @@
 	cscq = data;
 	MDNS_INIT_ASSERT(cscq, cscq_magic);
 	csc = cscq->cscq_csc;
+	if (csc->csc_flags & CSC_DYING)
+		return;
+
 	MDNS_INIT_ASSERT(csc, csc_magic);
 	MTX_LOCK(csc, csc_mtx);
 
@@ -1583,7 +1597,7 @@
 	 * Timeout occurred
 	 */
 	if (rs == NULL) {
-		query_dereg(cscq->cscq_q, &cscq->cscq_qs, cscq);
+		//query_dereg(cscq->cscq_q, &cscq->cscq_qs, cscq);
 		TAILQ_REMOVE(&csc->csc_queries, cscq, cscq_next);
 
 		send_error(csc, cscq->cscq_id, MIE_TOUT);
@@ -1633,6 +1647,15 @@
 	    rs->r_class, rs->r_type, rs->r_ttl);
 }
 
+/*
+ * Dispatch a query to the query system, if the given interface index
+ * is 0 a query is dispatched for each active interface.
+ *   csc   - Client handle
+ *   cscq  - Query data
+ *   ifidx - Interface index
+ *   fam   - Address familty (AF_{UNSPEC,INET,INET6})
+ *   tout  - Timeout
+ */
 static int
 queryadd(struct cs_client *csc, struct csc_query *cscq, unsigned int ifidx,
     int fam, int tout)
@@ -1678,6 +1701,12 @@
 	return (0);
 }
 
+/*
+ * Remove an outstanding query, removes any active queries matching the
+ * data given in `cscq'.
+ *   csc  - Client handle
+ *   cscq - Query data
+ */
 static int
 querydel(struct cs_client *csc, struct csc_query *cscq , unsigned int ifidx)
 {

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/clisrv.h#3 (text+ko) ====

@@ -55,10 +55,12 @@
 	struct clisrv *csc_serv;
 	DEF_MTX(csc_mtx);
 	TAILQ_ENTRY(cs_client) csc_next;
-	int csc_sock; /* client sock */
-	int csc_evid; /* client event id */
-	int csc_suser; /* client have super user privileges */
 	TAILQ_HEAD(, csc_query) csc_queries;
+	int csc_sock;	/* client sock */
+	int csc_evid;	/* client event id */
+	int csc_flags;
+#define CSC_SUSER	0x01 /* client have super user privileges */
+#define CSC_DYING	0x02 /* client is dead, shutdown in progress */
 };
 
 /*
@@ -67,12 +69,12 @@
 struct csc_query {
 	MAGIC(cscq_magic);
 	TAILQ_ENTRY(csc_query) cscq_next;
-	struct cs_client *cscq_csc; /* back-pointer */
-	struct queries *cscq_q; /* queries back-pointer */
-	int cscq_id;	/* message id */
-	int cscq_resp;	/* responses sent */
-	unsigned int cscq_ifidx;	/* interface index */
-	struct mdns_qset cscq_qs; /* original query */
+	struct cs_client *cscq_csc;	/* back-pointer */
+	struct queries	*cscq_q;	/* queries back-pointer */
+	int 		cscq_id;	/* message id */
+	int 		cscq_resp;	/* responses sent */
+	unsigned int 	cscq_ifidx;	/* interface index */
+	struct mdns_qset cscq_qs;	/* original query */
 };
 
 int csrv_open(struct clisrv *, struct md_glob *, const char *);

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:23:29 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4242516A474; Wed,  3 Oct 2007 21:23:29 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BD49216A468
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:23:28 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 95FC913C43E
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:23:28 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LNSgA096901
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:23:28 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93LNS2B096898
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:23:28 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:23:28 GMT
Message-Id: <200710032123.l93LNS2B096898@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127147 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:23:29 -0000

http://perforce.freebsd.org/chv.cgi?CH=127147

Change 127147 by fli@fli_nexus on 2007/10/03 21:22:36

	- Follow changes to record subsystem.
	- Move query rescheduling into a function to remove
	  duplicated code.
	- Better failure handling.
	- New debugging asserts.
	- Other minor fixes.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/queries.c#2 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/queries.h#2 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/queries.c#2 (text+ko) ====

@@ -35,6 +35,7 @@
 #include "output_aggr.h"
 #include "threads.h"
 #include "queries.h"
+#include "util.h"
 
 static void timeout_enqueue(struct queries *, struct query_cons *);
 static void timeout_dequeue(struct queries *, struct query_cons *);
@@ -57,8 +58,11 @@
 queries_init(struct queries *q, struct md_if *mif)
 {
 	struct aq_func aqf;
+	int error;
 	
-	records_init(&q->q_recs, mdns_c_in);
+	error = records_init(&q->q_recs);
+	if (error != 0)
+		goto queries_init_fail;
 	MTX_INIT(q, q_mtx, NULL);
 	TAILQ_INIT(&q->q_to_head);
 	TAILQ_INIT(&q->q_ret_head);
@@ -77,40 +81,22 @@
 	MDNS_INIT_SET(q, q_magic);
 	dprintf(DEBUG_QUERY, "Initialized queries system q=%x mif=%x", q, mif);
 	return (0);
+queries_init_fail:
+	dprintf(DEBUG_QUERY, "Failed to initialize queries system mif=%x", mif);
+	return (-1);
 }
 
 /*
- * Destroy callback, destroys a record and all its types
- */
-static void
-record_del_cb(struct record *r, void *arg)
-{
-	struct query_type *qt;
-	struct record_type *rt;
-	struct query_cons *qc, *qc2;
-	struct queries *q;
-	
-	q = arg;
-	record_foreach(rt, r) {
-		qt = record_type_getparent(rt);	
-		ret_dequeue(q, qt);
-		TAILQ_FOREACH_SAFE(qc, &qt->qt_cons_list, qc_next, qc2) {
-			query_timeout_notify(q, qc);
-		}
-	}
-}
-
-/*
  * Destroy a query system
  */
 void
 queries_destroy(struct queries *q)
 {
-
 	MDNS_INIT_ASSERT(q, q_magic);
 	MTX_LOCK(q, q_mtx);
-	records_foreach(&q->q_recs, record_del_cb, q);
+
 	records_destroy(&q->q_recs);
+
 	MTX_UNLOCK(q, q_mtx);
 	MTX_DESTROY(q, q_mtx);
 	MDNS_INIT_UNSET(q, q_magic);
@@ -158,7 +144,6 @@
 	struct query_cons *qc;
 	struct query_type *qt;
 	struct record_type *rt;
-	struct record *r;
 
 	q = arg.ptr;
 	MDNS_INIT_ASSERT(q, q_magic);
@@ -174,17 +159,12 @@
 		qt = qc->qc_qt;
 		TAILQ_REMOVE(&qt->qt_cons_list, qc, qc_next);
 		TAILQ_REMOVE(&q->q_to_head, qc, qc_to_next);
+
 		query_timeout_notify(q, qc);
 		obj_free(OBJ_QCONS, qc);
 
 		rt = &qt->qt_type;
-		r = rt->rt_record;
-		record_release(r);
-		if (record_type_refcnt(rt) == 1) {
-			destroy_query_type(q, qt);
-		}
-		else
-			record_type_release(rt);
+		record_type_release(rt);
 
 		qc = TAILQ_FIRST(&q->q_to_head);
 		if (qc == NULL)
@@ -206,6 +186,7 @@
 {
 	struct query_cons *qc2, *qc3;
 
+	MDNS_INIT_ASSERT(q, q_magic);
 	qc->qc_torel = qc->qc_timeout;
 	qc2 = TAILQ_FIRST(&q->q_to_head);
 
@@ -214,7 +195,7 @@
 	}
 	else if (qc->qc_torel < qc2->qc_torel) {
 		qc2->qc_torel -= qc->qc_torel;
-		TAILQ_INSERT_HEAD(&q->q_to_head, qc, qc_next);
+		TAILQ_INSERT_HEAD(&q->q_to_head, qc, qc_to_next);
 	}
 	else {
 		while (qc->qc_torel >= qc2->qc_torel) {
@@ -237,6 +218,7 @@
 {
 	struct query_cons *qc2;
 
+	MDNS_INIT_ASSERT(q, q_magic);
 	qc2 = TAILQ_NEXT(qc, qc_to_next);
 	if (qc2 != NULL)
 		qc2->qc_torel += qc->qc_torel;
@@ -253,6 +235,8 @@
 	struct query_type *qt2, *qt3;
 	struct md_glob *g;
 
+	MDNS_INIT_ASSERT(q, q_magic);
+
 	qt->qt_retrel = qt->qt_retabs;
 	qt2 = TAILQ_FIRST(&q->q_ret_head);
 
@@ -294,6 +278,8 @@
 	struct query_type *qt2;
 	struct md_glob *g;
 
+	MDNS_INIT_ASSERT(q, q_magic);
+
 	if (!(qt->qt_flags & QT_INRETQ))
 		return;
 
@@ -361,36 +347,44 @@
 {
 	struct mdns_qset *qs;
 	struct record *r;
+	struct record_class *rc;
 	struct record_type *rt, *rt2;
 	int range;
 
+	MDNS_INIT_ASSERT(q, q_magic);
+
 	if (qt->qt_flags & QT_SENT)
 		return;
 
 	rt = &qt->qt_type;
-	r = rt->rt_record;
+	rc = record_get_class(rt);
+	r = record_get_record(rc);
 
 	/*
 	 * Check if a query exists on this record for T_ANY
 	 */
-	record_type_get(r, &rt2, RECORD_NOINIT, mdns_in_any);
+	rt2 = record_type_find(&q->q_recs, REC_OBJCLASS, NULL, (uintptr_t)rc,
+	    mdns_t_any);
 	if (rt2 != NULL) {
-		record_type_release(rt2);
 		if (rt2 != rt)
 			return;
 	}
 
 	qs = mdns_pkg_getqset();
+	if (qs == NULL)
+		return;
 	mdns_qset_name_dup(qs, r->r_name);
 	qs->q_type = rt->rt_type;
-	qs->q_class = mdns_c_in; /* XXX */
+	qs->q_class = rc->rc_class;
 	aq_enqueue(&q->q_aq4, qs, 20, 500);
 
 #ifdef INET6
 	qs = mdns_pkg_getqset();
+	if (qs == NULL)
+		return;
 	mdns_qset_name_dup(qs, r->r_name);
 	qs->q_type = rt->rt_type;
-	qs->q_class = mdns_c_in; /* XXX */
+	qs->q_class = rc->rc_class;
 	aq_enqueue(&q->q_aq6, qs, 20, 500);
 #endif
 
@@ -435,12 +429,9 @@
 static void
 destroy_query_type(struct queries *q, struct query_type *qt)
 {
-	struct record_type *rt;
 	struct query_cons *qc, *qc2;
 
 	MDNS_INIT_ASSERT(qt, qt_magic);
-	rt = &qt->qt_type;
-	assert(record_type_refcnt(rt) == 1);
 
 	if (qt->qt_flags & QT_INRETQ)
 		ret_dequeue(q, qt);
@@ -454,12 +445,27 @@
 		obj_free(OBJ_QCONS, qc);
 	}
 
-	record_type_release(rt);
 	MDNS_INIT_UNSET(qt, qt_magic);
 	obj_free(OBJ_QTYPE, qt);
 }
 
 /*
+ * Callback from record sub-system when the last reference to a
+ * query_type {} is about to be released.
+ */
+static int
+qt_del_cb(void *arg)
+{
+	struct query_type *qt = arg;
+	struct queries *q;
+
+	MDNS_INIT_ASSERT(qt, qt_magic);
+	q = qt->qt_queries;
+	destroy_query_type(q, qt);
+	return (0);
+}
+
+/*
  * Aggregation queue callback on packet chain intialization
  */
 static void
@@ -486,39 +492,47 @@
 
 /*
  * Register a consumer with a query
- *   g     - Global software state
- *   ifidx - Interface index to register query on (-1 equals all interfaces)
+ *   q     - Queries handle
  *   qs    - qset structure with query information
  *   func  - Callback function, called when a response comes in to the query
  *   arg   - Uniquely identifies the consumer, passed to func()
  *   timeout - Specifies that timeout in seconds for oneshot queries, if
  *             zero the query is treated as a continuous query.
+ *   family - Address family
  */
 int
 query_reg(struct queries *q, struct mdns_qset *qs, qc_cb func,
     void *arg, int timeout, int family)
 {
 	struct record_type *rt;
-	struct record *r;
 	struct query_type *qt;
 	struct query_cons *qc, *qc2;
+	int error;
+	struct recpar rp;
 
 	MDNS_INIT_ASSERT(q, q_magic);
 
 	MTX_LOCK(q, q_mtx);
-	record_get(&q->q_recs, &r, 0, qs->q_name);
-	if (r == NULL)
-		goto out;
 
-	record_type_get(r, &rt, RECORD_NOINIT, qs->q_type);
+	error = record_type_get(&q->q_recs, &rt, REC_NOINIT, NULL, qs->q_name,
+	    qs->q_class, qs->q_type);
 	if (rt == NULL) {
 		qt = obj_alloc(OBJ_QTYPE);
+		if (qt == NULL)
+			goto query_reg_fail;
 		bzero(qt, sizeof(struct query_type));
+		qt->qt_queries = q;
 		MDNS_INIT_SET(qt, qt_magic);
 		TAILQ_INIT(&qt->qt_cons_list);
 		rt = &qt->qt_type;
-		record_type_get(r, &rt, RECORD_NOALLOC, qs->q_type);
-		record_type_setparent(rt, qt);
+		rp.rp_handle = qt;
+		rp.rp_del_cb = qt_del_cb;
+		error = record_type_get(&q->q_recs, &rt, REC_NOALLOC, &rp,
+		    qs->q_name, qs->q_class, qs->q_type);
+		if (error != 0) {
+			obj_free(OBJ_QTYPE, qt);
+			goto query_reg_fail;
+		}
 	}
 
 	assert(rt != NULL);
@@ -531,15 +545,15 @@
 	TAILQ_FOREACH(qc2, &qt->qt_cons_list, qc_next) {
 		if (qc2->qc_arg != arg)
 			continue;
-		record_type_release(rt);
-		record_release(r);
-		goto out;
+		goto query_reg_fail2;
 	}
 
 	/* TODO: send data from database record to client */
 	/* TODO: send data from cache to client */
 
 	qc = obj_alloc(OBJ_QCONS);
+	if (qc == NULL)
+		goto query_reg_fail2;
 	qc->qc_func = func;
 	qc->qc_arg = arg;
 	qc->qc_timeout = timeout;
@@ -553,9 +567,15 @@
 		timeout_enqueue(q, qc);
 
 	MTX_UNLOCK(q, q_mtx);
+	dprintf(DEBUG_QUERY, "Registered query q=%p, qt=%p, consumer=%p",
+	    q, qt, arg);
 	return (0);
-out:
+query_reg_fail2:
+	record_type_release(rt);
+query_reg_fail:
 	MTX_UNLOCK(q, q_mtx);
+	dprintf(DEBUG_QUERY, "Failed to register query q=%p, consumer=%p",
+	    q, arg);
 	return (-1);
 }
 
@@ -565,7 +585,6 @@
 int
 query_dereg(struct queries *q, struct mdns_qset *qs, void *cons)
 {
-	struct record *r;
 	struct record_type *rt;
 	struct query_cons *qc;
 	struct query_type *qt;
@@ -573,42 +592,73 @@
 	MDNS_INIT_ASSERT(q, q_magic);
 	MTX_LOCK(q, q_mtx);
 
-	record_get(&q->q_recs, &r, RECORD_NOINIT, qs->q_name);
-	if (r == NULL)
-		goto out1;
+	rt = record_type_find(&q->q_recs, 0, qs->q_name, qs->q_class,
+	    qs->q_type);
+	if (rt == NULL)
+		goto query_dereg_fail;
 
-	record_type_get(r, &rt, RECORD_NOINIT, qs->q_type);
-	if (rt == NULL)
-		goto out2;
-	
 	qt = record_type_getparent(rt);
-	TAILQ_FOREACH(qc, &qt->qt_cons_list, qc_next)
+	TAILQ_FOREACH(qc, &qt->qt_cons_list, qc_next) {
 		if (qc->qc_arg == cons)
 			break;
+	}
 
 	if (qc != NULL) {
 		if (qc->qc_timeout != 0)
 			timeout_dequeue(q, qc);
 		TAILQ_REMOVE(&qt->qt_cons_list, qc, qc_next);
-		record_release(r);
 		record_type_release(rt);
 		obj_free(OBJ_QCONS, qc);
 	}
 
-	if (record_type_refcnt(rt) == 1) {
-		destroy_query_type(q, qt);
-	}
-	else
-		record_type_release(rt);
-out2:
-	record_release(r);
 	MTX_UNLOCK(q, q_mtx);
+	dprintf(DEBUG_QUERY, "De-registered consumer=%p from queries q=%p",
+	    cons, q);
 	return (0);
-out1:
+query_dereg_fail:
 	MTX_UNLOCK(q, q_mtx);
+	dprintf(DEBUG_QUERY, "Failed to de-registered consumer=%p "
+	    "from queries q=%p", cons, q);
 	return (-1);
 }
 
+/* Notify consumers */
+static inline void
+notify_cons(struct query_type *qt, struct mdns_rrset *rs, int ifidx, int fam,
+    int trunc)
+{
+	struct query_cons *qc;
+
+	TAILQ_FOREACH(qc, &qt->qt_cons_list, qc_next) {
+		if (qc->qc_fam != AF_UNSPEC && qc->qc_fam != fam)
+			continue;
+		qc->qc_func(qc->qc_arg, rs, ifidx, fam, trunc);
+	}
+}
+
+static inline void
+reschedule_query(struct queries *q, struct query_type *qt, uint32_t ttl)
+{
+	int range;
+
+	range = (random() % 3);
+
+	/* Expired record, re-schedule transmission */
+	if (ttl == 0) {
+		qt->qt_flags &= ~QT_RESP;
+		qt->qt_tries = 0;
+		qt->qt_retabs = 1;
+	}
+	else {
+		qt->qt_flags |= QT_RESP;
+		qt->qt_ttl = ttl;
+		qt->qt_tries = 80; /* next at 80% of ttl */
+		qt->qt_retabs = (qt->qt_ttl * (qt->qt_tries + range)) / 100;
+	}
+	ret_enqueue(q, qt);
+}
+
+
 /*
  * Notify callback, called to notify potential consumers about
  * new resource data.
@@ -621,84 +671,62 @@
 query_notify(struct queries *q, struct mdns_rrset *rs, int ifidx, int fam,
     int trunc)
 {
-	struct record *r;
 	struct record_type *rt;
-	struct query_cons *qc;
 	struct query_type *qt;
-	int range, sched = 0;
+	int sched = 0;
 
 	MDNS_INIT_ASSERT(q, q_magic);
+
 	MTX_LOCK(q, q_mtx);
 
-	record_get(&q->q_recs, &r, RECORD_NOINIT, rs->r_name);
-	if (r == NULL)
-		goto out;
+	/* Clients waiting for C_ANY/T_ANY */
+	rt = record_type_find(&q->q_recs, 0, rs->r_name, mdns_c_any,
+	    mdns_t_any);
+	if (rt != NULL) {
+		qt = record_type_getparent(rt);
+		ret_dequeue(q, qt);
+		notify_cons(qt, rs, ifidx, fam, trunc);
+		reschedule_query(q, qt, rs->r_ttl);
+		sched = 1;
+	}
 
-	range = (random() % 3);
-
-	/*
-	 * Check for clients waiting on T_ANY
-	 */
-	record_type_get(r, &rt, RECORD_NOINIT, mdns_in_any);
+	/* Clients waiting for C_ANY */
+	rt = record_type_find(&q->q_recs, 0, rs->r_name, mdns_c_any,
+	    rs->r_type);
 	if (rt != NULL) {
 		qt = record_type_getparent(rt);
-		TAILQ_FOREACH(qc, &qt->qt_cons_list, qc_next) {
-			if (qc->qc_fam != AF_UNSPEC && qc->qc_fam != fam)
-				continue;
-			qc->qc_func(qc->qc_arg, rs, ifidx, fam, trunc);
+		ret_dequeue(q, qt);
+		notify_cons(qt, rs, ifidx, fam, trunc);
+		if (!sched) {
+			reschedule_query(q, qt, rs->r_ttl);
+			sched++;
 		}
+	}
 
+	/* Clients waiting for T_ANY */
+	rt = record_type_find(&q->q_recs, 0, rs->r_name, rs->r_class,
+	    mdns_t_any);
+	if (rt != NULL) {
+		qt = record_type_getparent(rt);
 		ret_dequeue(q, qt);
-
-		/* Expired record, re-schedule transmission */
-		if (rs->r_ttl == 0) {
-			qt->qt_flags &= ~QT_RESP;
-			qt->qt_tries = 0;
-			qt->qt_retabs = 1;
+		notify_cons(qt, rs, ifidx, fam, trunc);
+		if (!sched) {
+			reschedule_query(q, qt, rs->r_ttl);
+			sched++;
 		}
-		else {
-			qt->qt_flags |= QT_RESP;
-			qt->qt_ttl = rs->r_ttl;
-			qt->qt_tries = 80; /* next at 80% of ttl */
-			qt->qt_retabs =
-			    (qt->qt_ttl * (qt->qt_tries + range)) / 100;
-		}
-		sched = 1;
-		ret_enqueue(q, qt);
-		record_type_release(rt);
 	}
 
-	record_type_get(r, &rt, RECORD_NOINIT, rs->r_type);
+	/* Exact match on class, type pair */
+	rt = record_type_find(&q->q_recs, 0, rs->r_name, rs->r_class,
+	    rs->r_type);
 	if (rt != NULL) {
 		qt = record_type_getparent(rt);
-		TAILQ_FOREACH(qc, &qt->qt_cons_list, qc_next) {
-			if (qc->qc_fam != AF_UNSPEC && qc->qc_fam != fam)
-				continue;
-			qc->qc_func(qc->qc_arg, rs, ifidx, fam, trunc);
-		}
-
 		ret_dequeue(q, qt);
-		/* Expired record, re-schedule transmission */
-		if (rs->r_ttl == 0) {
-			qt->qt_flags &= ~QT_RESP;
-			qt->qt_tries = 0;
-			qt->qt_retabs = 1;
-		}
-		else {
-			qt->qt_flags |= QT_RESP;
-			qt->qt_ttl = rs->r_ttl;
-			qt->qt_tries = 80; /* next at 80% of ttl */
-			qt->qt_retabs =
-			    (qt->qt_ttl * (qt->qt_tries + range)) / 100;
-		}
+		notify_cons(qt, rs, ifidx, fam, trunc);
 		if (!sched)
-			ret_enqueue(q, qt);
-
-		record_type_release(rt);
+			reschedule_query(q, qt, rs->r_ttl);
 	}
 
-	record_release(r);
-out:
 	MTX_UNLOCK(q, q_mtx);
 }
 
@@ -707,10 +735,8 @@
  * any longer.
  */
 static void
-query_timeout_notify(struct queries *q, struct query_cons *qc)
+query_timeout_notify(struct queries *q __unused, struct query_cons *qc)
 {
 
-	MTX_UNLOCK(q, q_mtx);
 	qc->qc_func(qc->qc_arg, NULL, 0, 0, 0);
-	MTX_LOCK(q, q_mtx);
 }

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/queries.h#2 (text+ko) ====

@@ -75,6 +75,7 @@
 	MAGIC(qt_magic);
 	struct record_type qt_type;
 	TAILQ_HEAD(, query_cons) qt_cons_list; /* consumer list head */
+	struct queries	*qt_queries;
 	int qt_flags;
 #define QT_INRETQ	0x01 /* scheduled for re-transmission */
 #define QT_SENT		0x02 /* query sent */
@@ -83,7 +84,7 @@
 	int qt_retrel;	/* relative re-transmit value (book keeping only) */
 	int qt_retabs;	/* absolute re-transmission value */
 	int qt_tries;	/* number of re-transmission retries */
-	int qt_ttl;		/* ttl from response */
+	int qt_ttl;	/* ttl from response */
 };
 
 int queries_init(struct queries *, struct md_if *);

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:27:33 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 87CA416A421; Wed,  3 Oct 2007 21:27:33 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 434A316A41A
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:27:33 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1AF3013C474
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:27:33 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LRWeT097135
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:27:32 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93LRWqs097132
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:27:32 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:27:32 GMT
Message-Id: <200710032127.l93LRWqs097132@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127149 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:27:33 -0000

http://perforce.freebsd.org/chv.cgi?CH=127149

Change 127149 by fli@fli_nexus on 2007/10/03 21:26:56

	- Add functions to get records from the additional section.
	- Fix a problem with name compression/decompression.
	- Add a psuedo header to work with during packet construction.
	- Make encoding/decoding functions handle other classes than IN. 
	- Missing return value checks and other minor fixes.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#12 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_packet.c#12 (text+ko) ====

@@ -48,8 +48,8 @@
 	size_t *, int);
 static int name_decompress(char *, char *, size_t, char *, size_t);
 static inline char * res_decode(char *, uint16_t *, uint16_t, char *, size_t);
-static inline void res_encode(struct hashtbl *, char *, uint16_t, char *,
-    size_t *, int);
+static inline int res_encode(struct hashtbl *, char *, char *, uint16_t,
+    uint16_t, char *, size_t *, int);
 
 static void pkg_free(struct mdns_pkgchain *, struct mdns_packet *);
 static int pkg_write(struct mdns_packet *, struct mdns_bufpool *);
@@ -63,7 +63,8 @@
 enum {
 	SEC_QUESTIONS = p_questions,
 	SEC_ANSWERS = p_answers,
-	SEC_AUTHORITY = p_auths
+	SEC_AUTHORITY = p_auths,
+	SEC_ADDITIONAL = p_addit
 };
 
 /*
@@ -415,20 +416,36 @@
 /*
  * Labelize (and name compress) resource data that needs it
  */
-static inline void
-res_encode(struct hashtbl *ht, char *buf, uint16_t type, char *res,
-    size_t *rlen, int plen)
+static inline int
+res_encode(struct hashtbl *ht, char *buf, char *end, uint16_t class,
+    uint16_t type, char *res, size_t *rlen, int plen)
 {
+	size_t len, sz;
+	int error = 0;
 
+	sz = end - buf;
+	if (class != mdns_c_in) {
+		if (*rlen > sz)
+			return (-1);
+		memcpy(buf, res, *rlen);
+		return (0);
+	}
+
 	switch (type) {
 	case mdns_in_ptr:
 	case mdns_in_cname:
-		name_compress(ht, res, *rlen, buf, rlen, plen);
+		len = end - buf;
+		error = name_compress(ht, res, *rlen, buf, &len, plen);
+		if (error == 0)
+			*rlen = len;
 		break;
 	default:
+		if (*rlen > sz)
+			return (-1);
 		memcpy(buf, res, *rlen);
 		break;
 	}
+	return (error);
 }
 
 /*
@@ -441,6 +458,22 @@
 mdns_pkg_sethdr(struct mdns_pkgchain *pc, uint16_t id, int flags)
 {
 	struct mdns_packet *pkg;
+
+	MDNS_INIT_ASSERT(pc, pc_magic);
+	pkg = pc->pc_pkg;
+
+	if (pkg == NULL)
+		pkg = pkg_alloc(pc);
+	if (pkg == NULL)
+		return (-1);
+	MDNS_INIT_ASSERT(pkg, p_magic);
+
+	pkg->p_head.h_id = id;
+	pkg->p_head.h_flags = flags;
+	pkg->p_len += MDNS_HEADER_LEN;
+
+	return (0);
+#if 0
 	struct mdns_buf *buf;
 	struct mdns_header *h;
 
@@ -468,6 +501,7 @@
 	pkg->p_len += MDNS_HEADER_LEN;
 	MDNS_BUFLEN(buf) += MDNS_HEADER_LEN;
 	return (0);
+#endif
 }
 
 /*
@@ -602,9 +636,8 @@
 	struct mdns_pkg_res *pr;
 	struct mdns_packet *pkg;
 	struct mdns *md;
-	struct mdns_header *h;
 	size_t slen;
-	struct mdns_head head;
+	struct mdns_head *head;
 
 	MDNS_INIT_ASSERT(pc, pc_magic);
 	md = pc->pc_md;
@@ -654,11 +687,11 @@
 				errno = EMSGSIZE;
 				return (-1);
 			}
-			h = (struct mdns_header *)pkg->p_buf(p_hdr);
-			h->h_tc = 1;
-			mdns_pkg_gethdr(pkg, &head);
+
+			head = &pkg->p_head;
 			pkg = pkg_alloc(pc);
-			mdns_pkg_sethdr(pc, head.h_id, head.h_flags);
+			mdns_pkg_sethdr(pc, head->h_id, head->h_flags);
+			head->h_flags |= MDNS_HEAD_TC;
 
 			/*
 			 * Only one resource record is allowed in
@@ -668,7 +701,7 @@
 			if (pr->pr_what && pr->pr_res.rs.r_datalen >
 			    md->md_maxpkgsz) {
 				pkg_alloc(pc);
-				mdns_pkg_sethdr(pc, head.h_id, head.h_flags);
+				mdns_pkg_sethdr(pc, head->h_id, head->h_flags);
 			}
 		}
 	}
@@ -763,16 +796,12 @@
 mdns_pkg_addquestion(struct mdns_pkgchain *pc, struct mdns_qset *qs,
     int flags)
 {
-	struct mdns_header *h;
 	struct mdns_packet *hpkg;
 	int error;
 
 	error = addres(pc, SEC_QUESTIONS, qs, flags, &hpkg);
 	if (error != 0)
 		return (error);
-	assert(hpkg != NULL);
-	h = (struct mdns_header *)hpkg->p_buf(p_hdr);
-	h->h_qcount = htons(ntohs(h->h_qcount) + 1);
 	return (0);
 }
 
@@ -784,16 +813,12 @@
 struct mdns_qset *
 mdns_pkg_delquestion(struct mdns_pkgchain *pc, struct mdns_qset *qs)
 {
-	struct mdns_header *h;
 	struct mdns_packet *hpkg;
 	struct mdns_pkg_res *pr;
 
 	pr = delres(pc, SEC_QUESTIONS, qs, &hpkg);
 	if (pr == NULL)
 		return (NULL);
-	assert(hpkg != NULL);
-	h = (struct mdns_header *)hpkg->p_buf(p_hdr);
-	h->h_qcount = htons(ntohs(h->h_qcount) - 1);
 	return (&pr->pr_res.qs);
 }
 
@@ -810,16 +835,12 @@
 mdns_pkg_addauth(struct mdns_pkgchain *pc, struct mdns_rrset *rs,
     int flags)
 {
-	struct mdns_header *h;
 	struct mdns_packet *hpkg;
 	int error;
 
 	error = addres(pc, SEC_AUTHORITY, rs, flags, &hpkg);
 	if (error != 0)
 		return (error);
-	assert(hpkg != NULL);
-	h = (struct mdns_header *)hpkg->p_buf(p_hdr);
-	h->h_nscount = htons(ntohs(h->h_nscount) + 1);
 	return (0);
 }
 
@@ -831,16 +852,12 @@
 struct mdns_rrset *
 mdns_pkg_delauth(struct mdns_pkgchain *pc, struct mdns_rrset *rs)
 {
-	struct mdns_header *h;
 	struct mdns_packet *hpkg;
 	struct mdns_pkg_res *pr;
 
 	pr = delres(pc, SEC_AUTHORITY, rs, &hpkg);
 	if (pr == NULL)
 		return (NULL);
-	assert(hpkg != NULL);
-	h = (struct mdns_header *)hpkg->p_buf(p_hdr);
-	h->h_nscount = htons(ntohs(h->h_nscount) - 1);
 	return (&pr->pr_res.rs);
 }
 
@@ -857,16 +874,12 @@
 mdns_pkg_addanswer(struct mdns_pkgchain *pc, struct mdns_rrset *rs,
     int flags)
 {
-	struct mdns_header *h;
 	struct mdns_packet *hpkg;
 	int error;
 
 	error = addres(pc, SEC_ANSWERS, rs, flags, &hpkg);
 	if (error != 0)
 		return (error);
-	assert(hpkg != NULL);
-	h = (struct mdns_header *)hpkg->p_buf(p_hdr);
-	h->h_acount = htons(ntohs(h->h_acount) + 1);
 	return (0);
 }
 
@@ -878,16 +891,12 @@
 struct mdns_rrset *
 mdns_pkg_delanswer(struct mdns_pkgchain *pc, struct mdns_rrset *rs)
 {
-	struct mdns_header *h;
 	struct mdns_packet *hpkg;
 	struct mdns_pkg_res *pr;
 
 	pr = delres(pc, SEC_ANSWERS, rs, &hpkg);
 	if (pr == NULL)
 		return (NULL);
-	assert(hpkg != NULL);
-	h = (struct mdns_header *)hpkg->p_buf(p_hdr);
-	h->h_acount = htons(ntohs(h->h_acount) - 1);
 	return (&pr->pr_res.rs);
 }
 
@@ -903,18 +912,20 @@
 	struct mdns_rrset *rs;
 	struct mdns_qset *qs;
 	struct mdns_pkg_res *pr;
-	size_t namlen, namclen;
+	size_t namlen, namclen, reslen;
 	int error, i;
 	struct mdns_qsec qsec;
 	struct mdns_rsec rsec;
 	size_t pkglen;
+	uint16_t *count;
+	char *end;
 	struct hashtbl nc;
 
 	hashtbl_init(&nc, 8, 128, 3);
 	pkglen = MDNS_HEADER_LEN;
 
 	MDNS_INIT_ASSERT(pkg, p_magic);
-	for (i = 1; i < 4; i++) {
+	for (i = 1; i < 5; i++) {
 		if (pkg->p_data[i].buf == NULL) {
 			pkg->p_data[i].buf =
 			    mdns_buf_alloc(bp, &pkg->p_buflist, 0, 0);
@@ -923,18 +934,48 @@
 		}
 		buf = pkg->p_data[i].buf;
 		MDNS_BUFLEN(buf) = 0;
+		end = MDNS_BUF(buf) + MDNS_BUFSZ(buf);
 
+		switch (i) {
+		case p_questions: 	
+			count = &pkg->p_head.h_cquestion;
+			break;
+		case p_answers:
+			count = &pkg->p_head.h_canswer;
+			break;
+		case p_auths:
+			count = &pkg->p_head.h_cauth;
+			break;
+		case p_addit:
+			count = &pkg->p_head.h_caddit;
+			break;
+		default:
+			abort();
+		}
+		*count = 0;
+
 		TAILQ_FOREACH(pr, &pkg->p_data[i].res_head, pr_next) {
 			qs = &pr->pr_res.qs;
 			rs = &pr->pr_res.rs;
 			namlen = strlen(qs->q_name);
 			namclen = MDNS_RECORD_LEN;
+
+			if ((pkglen + namlen + MDNS_RRSET_HLEN) >
+			    MDNS_BUFSZ(buf)) {
+				dprintf(DEBUG_STACK, "Ran out of space in "
+				    "buffer, pkglen=%d, bufsz=%d",
+				    pkglen, MDNS_BUFSZ(buf));
+				goto out;
+			}
+
 			error = name_compress(&nc, qs->q_name, namlen,
 			    MDNS_BUFPOS(buf), &namclen, pkglen);
 			if (error != 0)
-				goto out;
+				continue;
+
 			MDNS_BUFLEN(buf) += namclen;
 			pkglen += namclen;
+
 			if (pr->pr_what) {
 				rsec.rs_class = rs->r_class;
 				if (rs->r_cflush)
@@ -943,18 +984,29 @@
 				rsec.rs_type = htons(rs->r_type);
 				rsec.rs_ttl = htonl(rs->r_ttl);
 
-				namclen = rs->r_datalen;
-				res_encode(&nc,
-				    MDNS_BUFPOS(buf) + MDNS_RRSET_HLEN,
-				    rs->r_type, rs->r_data, &namclen,
-				    pkglen + MDNS_RRSET_HLEN);
+				reslen = rs->r_datalen;
+				error = res_encode(&nc,
+				    MDNS_BUFPOS(buf) + MDNS_RRSET_HLEN, end,
+				    rs->r_class, rs->r_type, rs->r_data,
+				    &reslen, pkglen + MDNS_RRSET_HLEN);
+
+				/*
+				 * Failed to encode resource data, roll back
+				 * name and try next resource.
+				 */
+				if (error != 0) {
+					MDNS_BUFLEN(buf) -= namclen;
+					pkglen -= namclen;
+					hashtbl_flush(&nc);
+					continue;
+				}
 
-				rsec.rs_rdlen = htons(namclen);
+				rsec.rs_rdlen = htons(reslen);
 				memcpy(MDNS_BUFPOS(buf), &rsec,
 				    MDNS_RRSET_HLEN);
 
-				MDNS_BUFLEN(buf) += MDNS_RRSET_HLEN + namclen;
-				pkglen += MDNS_RRSET_HLEN + namclen;
+				MDNS_BUFLEN(buf) += MDNS_RRSET_HLEN + reslen;
+				pkglen += MDNS_RRSET_HLEN + reslen;
 			}
 			else {
 				qsec.qs_class = qs->q_class;
@@ -967,13 +1019,19 @@
 				MDNS_BUFLEN(buf) += MDNS_QSET_HLEN;
 				pkglen += MDNS_QSET_HLEN;
 			}
+			(*count)++;
 		}
 	}
 
+	hashtbl_destroy(&nc);
 	return (0);
-	hashtbl_destroy(&nc);
 out:
+	for (i = 1; i < 5; i++) {
+		buf = pkg->p_data[i].buf;
+		MDNS_BUFLEN(buf) = 0;
+	}
 	hashtbl_destroy(&nc);
+	dprintf(DEBUG_STACK, "Failed to write packet data into buffers");
 	return (-1);
 }
 
@@ -988,20 +1046,53 @@
 {
 	struct mdns_packet *pkg;
 	struct mdns_bufpool *bp;
+	struct mdns_buf *buf;
+	struct mdns_head *head;
+	struct mdns_header *h;
 	int error, retval = -1;
 
 	MDNS_INIT_ASSERT(pc, pc_magic);
 	MDNS_INIT_ASSERT(pc->pc_md, md_magic);
 	bp = pc->pc_md->md_bp;
 
-	dprintf(DEBUG_STACK, "Finalizing packet chain pc=%x", pc);
+	dprintf(DEBUG_STACK, "Finalizing packet chain pc=%x, empty=%d",
+	    pc, TAILQ_EMPTY(&pc->pc_head));
+
 	TAILQ_FOREACH(pkg, &pc->pc_head, p_list) {
+		buf = MDNS_BUFH(&pkg->p_buflist);
+		if (buf == NULL) {
+			buf = mdns_buf_alloc(bp, &pkg->p_buflist, 0, 0);
+			if (buf == NULL)
+				break;
+			bzero(MDNS_BUF(buf), MDNS_HEADER_LEN);
+			pkg->p_bufseg(p_hdr) = buf;
+			pkg->p_buf(p_hdr) = MDNS_BUF(buf);
+		}
+
 		error = pkg_write(pkg, bp);
 		if (error != 0)
-			goto out;
+			continue;
+		head = &pkg->p_head;
+		if (head->h_cquestion == 0 && head->h_canswer == 0 &&
+		    head->h_cauth == 0 && head->h_caddit == 0) {
+			dprintf(DEBUG_STACK, "Ignoring empty packet");
+			continue;
+		}
+
+		h = (struct mdns_header *)MDNS_BUF(buf);
+		h->h_qr = head->h_flags & MDNS_HEAD_QUERY ?
+		    MDNS_HDR_QUERY : MDNS_HDR_RESP;
+		h->h_tc = head->h_flags & MDNS_HEAD_TC ? 1 : 0;
+		h->h_aa = head->h_flags & MDNS_HEAD_AA ? 1 : 0;
+		h->h_id = htons(head->h_id);
+		h->h_qcount = htons(head->h_cquestion);
+		h->h_acount = htons(head->h_canswer);
+		h->h_nscount = htons(head->h_cauth);
+		h->h_rcount = htons(head->h_caddit);
+		MDNS_BUFLEN(buf) += MDNS_HEADER_LEN;
+		retval = 0;
 	}
-	retval = 0;
-out:
+
 	if (retval != 0) {
 		dprintf(DEBUG_STACK, "Packet chain finalization failed");
 	}
@@ -1030,6 +1121,13 @@
 	return (getres(pkg, SEC_AUTHORITY, offset, (void *)rs));
 }
 
+int
+mdns_pkg_getaddit(struct mdns_packet *pkg, int offset, struct mdns_rrset *rs)
+{
+
+	return (getres(pkg, SEC_ADDITIONAL, offset, (void *)rs));
+}
+
 /*
  * Return an entry from a section in a packet
  *   pkg     - Pointer to packet
@@ -1056,10 +1154,9 @@
 	struct mdns_buf *buf, *hbuf;
 	struct mdns_rrset *rs = (struct mdns_rrset *)set;
 	struct mdns_qset *qs = (struct mdns_qset *)set;
-	char *p, ***offsets, **offset, *end;
+	char *p, ***offsets, **offset, *end, *wp;
 	int error, i, j, *last_offset, entries;
 	uint16_t tmp[3], rlen;
-	char *wp;
 
 	MDNS_INIT_ASSERT(pkg, p_magic);
 
@@ -1077,6 +1174,8 @@
 		pkg->p_buf(p_questions) = MDNS_BUF(hbuf) + MDNS_HEADER_LEN;
 		pkg->p_secoff(p_questions) =
 			malloc(sizeof(char *) * ntohs(h->h_qcount));
+		if (pkg->p_secoff(p_questions) == NULL)
+			return (-1);
 		bzero(pkg->p_secoff(p_questions),
 		    sizeof(char *) * ntohs(h->h_qcount));
 	}

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:29:35 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CB3A016A41B; Wed,  3 Oct 2007 21:29:35 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9079A16A417
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:29:35 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6A42A13C49D
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:29:35 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LTZKM097181
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:29:35 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93LTZUK097178
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:29:35 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:29:35 GMT
Message-Id: <200710032129.l93LTZUK097178@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127150 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:29:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=127150

Change 127150 by fli@fli_nexus on 2007/10/03 21:29:26

	- Add the additional section to psuedo packet.
	- Add the class mdns_c_any and type mdns_t_any
	- Re-arrange some structures. 
	- Minor whitespace and indentation fixes.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdns.h#8 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdns.h#8 (text+ko) ====

@@ -76,7 +76,23 @@
  */
 enum { MDNS_UDP, MDNS_TCP };
 
+/*
+ * Pseudo MDNS Header
+ */
+struct mdns_head {
+	uint16_t h_id; /* Query id (UC only, always 0 for MC) */
+	int h_flags;
+#define MDNS_HEAD_QUERY 0x01
+#define MDNS_HEAD_RESP  0x02
+#define MDNS_HEAD_TC	0x04
+#define MDNS_HEAD_AA	0x08
+	uint16_t h_cquestion; /* Question count */
+	uint16_t h_canswer; /* Answer count */
+	uint16_t h_cauth; /* Auth count */
+	uint16_t h_caddit; /* Additional count */
+};
 
+
 /*
  * Packet buffer
  */
@@ -100,7 +116,7 @@
 		char **offsets; /* Section offset pointers */
 		int last_offset;
 		TAILQ_HEAD(, mdns_pkg_res) res_head;
-	} p_data[4];
+	} p_data[5];
 #define p_buf(x) p_data[x].bufptr
 #define p_bufseg(x) p_data[x].buf
 #define p_secoff(x) p_data[x].offsets
@@ -110,7 +126,10 @@
 #define p_questions	1
 #define p_answers	2
 #define p_auths		3
+#define p_addit		4
 #define p_isrrset(x) ((x) > 1) /* 0 = qset, 1 = rrset */
+
+	struct mdns_head p_head; /* Header data */
 };
 
 /*
@@ -163,59 +182,51 @@
 	mdns_c_in = 1
 };
 
-/* Length of a mdns record */
-#define MDNS_RECORD_LEN	 255
+/* Special classes/types */
+#define mdns_c_any	255	/* ANY class */
+#define mdns_t_any	255	/* ANY type */
 
 /*
- * MDNS Header
+ * Length of a mdns record, including terminating 0-length label.
+ * The effective length on wire is 253 bytes (leading/ending label).
  */
-struct mdns_head {
-	uint16_t h_id; /* Query id (UC only, always 0 for MC) */
-	int h_flags;
-#define MDNS_HEAD_QUERY 0x01
-#define MDNS_HEAD_RESP  0x02
-#define MDNS_HEAD_TC	0x04
-#define MDNS_HEAD_AA	0x08
-	uint16_t h_cquestion; /* Question count */
-	uint16_t h_canswer; /* Answer count */
-	uint16_t h_cauth; /* Auth count */
-	uint16_t h_caddit; /* Additional count */
-};
+#define MDNS_RECORD_LEN	 255
 
 /*
  * MDNS resource set
  */
 struct mdns_rrset {
-	char name[MDNS_RECORD_LEN + 1]; /* rrset name */
-	char *r_name;
-	uint16_t r_class; /* rrset class */
-	uint16_t r_type; /* Record type */
-	int r_cflush; /* cache flush */
-	uint32_t r_ttl;  /* Time to live */
-	uint16_t r_datalen; /* Length of resource data */
-	char *r_data; /* Resource data */
+	char		name[MDNS_RECORD_LEN + 1]; /* Private storage */
+	char		*r_name;	/* Record name */
+	uint16_t	r_class;	/* Record class */
+	uint16_t	r_type;		/* Record type */
+	int		r_cflush;	/* Cache flush? */
+	uint32_t	r_ttl;  	/* Time to live */
+	uint16_t	r_datalen; 	/* Length of resource data */
+	char		*r_data; 	/* Resource data */
 };
 
+/* Record name set macros */
 #define mdns_rrset_name(rr, str) (rr)->r_name = str
 #define mdns_rrset_name_dup(rr, str) \
     strncpy((rr)->name, str, MDNS_RECORD_LEN); \
-	(rr)->r_name = (rr)->name;
+    (rr)->r_name = (rr)->name;
 
 /*
  * MDNS question/query set
  */
 struct mdns_qset {
-	char name[MDNS_RECORD_LEN + 1]; /* qname */
-	char *q_name;
-	uint16_t q_class; /* qset class */
-	uint16_t q_type;  /* query type */
-	int	q_unicast; /* unicast desired */
+	char		name[MDNS_RECORD_LEN + 1]; /* qname */
+	char		*q_name;
+	uint16_t	q_class; /* qset class */
+	uint16_t	q_type;  /* query type */
+	int		q_unicast; /* unicast desired */
 };
 
 #define mdns_qset_name(qs, str) (qs)->q_name = str
 #define mdns_qset_name_dup(qs, str) \
     strncpy((qs)->name, str, MDNS_RECORD_LEN); \
-	(qs)->q_name = (qs)->name;
+    (qs)->q_name = (qs)->name;
 
 /*
  * Packet resource
@@ -237,7 +248,7 @@
  */
 #define MDNS_ENC_CHAR		0x01
 #define MDNS_ENC_WCHAR		0x02
-#define MDNS_ENC_BINARY	0x04
+#define MDNS_ENC_BINARY		0x04
 #define MDNS_ENC_AUTO		0x08
 #define MDNS_ENC_ADDR		0x10
 #define MDNS_ENC_NAME		0x20
@@ -288,6 +299,7 @@
 int mdns_pkg_getquestion(struct mdns_packet *, int, struct mdns_qset *);
 int mdns_pkg_getanswer(struct mdns_packet *, int, struct mdns_rrset *);
 int mdns_pkg_getauth(struct mdns_packet *, int, struct mdns_rrset *);
+int mdns_pkg_getaddit(struct mdns_packet *, int, struct mdns_rrset *);
 
 int mdns_type_atoi(const char *);
 void * mdns_res_encode(uint16_t, uint16_t, void *, int, size_t, size_t *);

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:32:40 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2DE4016A418; Wed,  3 Oct 2007 21:32:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D9E9E16A46D
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:32:39 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B2F8C13C45A
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:32:39 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LWdOE097479
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:32:39 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93LWdeT097476
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:32:39 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:32:39 GMT
Message-Id: <200710032132.l93LWdeT097476@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127151 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:32:40 -0000

http://perforce.freebsd.org/chv.cgi?CH=127151

Change 127151 by fli@fli_nexus on 2007/10/03 21:32:25

	- Ignore empty packets.
	- Abort transmission if memory allocation fails.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#7 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#7 (text+ko) ====

@@ -622,6 +622,7 @@
 	struct mdns_packet *pkg;
 	struct mdns_buf *buf;
 	int i, error;
+	size_t len;
 	struct iovec *iov;
 	struct msghdr msg;
 
@@ -629,6 +630,7 @@
 	msg.msg_namelen = salen;
 	msg.msg_control = NULL;
 	msg.msg_controllen = 0;
+	len = 0;
 
 	TAILQ_FOREACH(pkg, &pc->pc_head, p_list) {
 		iov = malloc(sizeof(struct iovec) *
@@ -638,7 +640,12 @@
 			iov[i].iov_base = MDNS_BUF(buf);
 			iov[i].iov_len = MDNS_BUFLEN(buf);
 			i++;
+			len += MDNS_BUFLEN(buf);
 		}
+		if (len == 0) {
+			free(iov);
+			continue;
+		}
 
 		msg.msg_iov = iov;
 		msg.msg_iovlen = i;
@@ -646,7 +653,7 @@
 		error = sendmsg(sock, &msg, 0);
 		free(iov);
 		if (error < 0)
-			return (-1);
+			continue;
 	}
 	return (0);
 }

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:33:41 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4BDF216A421; Wed,  3 Oct 2007 21:33:41 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 11B2416A419
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:33:41 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id DEAD413C45B
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:33:40 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LXeW4097556
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:33:40 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93LXeti097553
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:33:40 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:33:40 GMT
Message-Id: <200710032133.l93LXeti097553@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127152 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:33:41 -0000

http://perforce.freebsd.org/chv.cgi?CH=127152

Change 127152 by fli@fli_nexus on 2007/10/03 21:32:59

	Whitespaces.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.h#6 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.h#6 (text+ko) ====

@@ -90,7 +90,7 @@
 	unsigned int h_acount:16;	/* number of answer entries */
 	unsigned int h_nscount:16;	/* number of authority entries */
 	unsigned int h_rcount:16;	/* number of resource entries */
-} __packed; 
+} __packed;
 
 /*
  * Question section "header", starts at the end
@@ -100,7 +100,7 @@
 	/* Qname ..//.. */
 	uint16_t qs_type;
 	uint16_t qs_class;
-} __packed; 
+} __packed;
 
 /*
  * Resource record "header", starts at the end of the
@@ -113,7 +113,7 @@
 	uint32_t rs_ttl;
 	uint16_t rs_rdlen;
 	/* Rdata ..//.. */
-} __packed; 
+} __packed;
 
 struct mdns_pkgchain;
 struct mdns_packet * pkg_alloc(struct mdns_pkgchain *);

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:36:45 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B0D1D16A46B; Wed,  3 Oct 2007 21:36:45 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 46C6116A418
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:36:45 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 078CD13C48E
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:36:45 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LaiMk097677
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:36:44 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93Laipn097674
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:36:44 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:36:44 GMT
Message-Id: <200710032136.l93Laipn097674@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127153 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:36:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=127153

Change 127153 by fli@fli_nexus on 2007/10/03 21:36:43

	Add a file that carries generic functions such as timers
	and _wcsdup()

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/util.c#1 add
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/util.h#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:37:47 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DB7EC16A419; Wed,  3 Oct 2007 21:37:46 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A19CC16A417
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:37:46 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5105F13C461
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:37:46 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LbkN9097714
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:37:46 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93LbkcK097711
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:37:46 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:37:46 GMT
Message-Id: <200710032137.l93LbkcK097711@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127154 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:37:47 -0000

http://perforce.freebsd.org/chv.cgi?CH=127154

Change 127154 by fli@fli_nexus on 2007/10/03 21:37:26

	Include util.h

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/var.c#4 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/var.c#4 (text+ko) ====

@@ -49,6 +49,7 @@
 #include "log.h"
 #include "var.h"
 #include "mdnsd.h"
+#include "util.h"
 
 static int ev_ifaddr_init(int, struct event_io *, __unused ev_arg);
 static int ev_ifaddr(struct event_io *, ev_arg);

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:38:48 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5EA5016A419; Wed,  3 Oct 2007 21:38:48 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id F05CF16A41B
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:38:47 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B192313C48D
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:38:47 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LclKo097738
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:38:47 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93LclFO097735
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:38:47 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:38:47 GMT
Message-Id: <200710032138.l93LclFO097735@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127155 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:38:48 -0000

http://perforce.freebsd.org/chv.cgi?CH=127155

Change 127155 by fli@fli_nexus on 2007/10/03 21:38:26

	Move input packet processing and response generation to its own file.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/input.c#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:40:52 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C822416A41B; Wed,  3 Oct 2007 21:40:52 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 658A316A418
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:40:52 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D37313C461
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:40:52 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LeqvB097993
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:40:52 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93Lep1J097975
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:40:51 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:40:51 GMT
Message-Id: <200710032140.l93Lep1J097975@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127156 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:40:53 -0000

http://perforce.freebsd.org/chv.cgi?CH=127156

Change 127156 by fli@fli_nexus on 2007/10/03 21:40:27

	- Timers and _wcsdup have been moved to util.c, remove.
	- Input processing have its own file now, remove. 
	- Cache structures and prototypes live in cache.h, remove.
	- Check for subsystem failures during interface initialization.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#7 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.h#7 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#7 (text+ko) ====

@@ -47,6 +47,7 @@
 #include <unistd.h>
 
 #include "mdnsd.h"
+#include "util.h"
 #include "log.h"
 #include "objalloc.h"
 
@@ -73,64 +74,61 @@
 
 static void usage(char *);
 
-/*
- * Generic timer intialization
- */
-static int
-tmr_init(int what, struct event_tmr *ev, ev_arg arg)
+static inline void
+record2rrset(struct record *r, uint16_t class, uint16_t  type,
+    struct record_res *rr, struct mdns_rrset *rs, int cflush)
 {
 
-	switch (what) {
-	case EVENT_INIT_OPEN:
-		ev->evtmr_timeout = arg.int32;
-		break;
-	case EVENT_INIT_CLOSE:
-		break;
-	}
-	return (0);
-}
+	MDNS_INIT_ASSERT(r, r_magic);
+	MDNS_INIT_ASSERT(rr, rr_magic);
 
-static int
-tmr_init_oneshot(int what, struct event_tmr *ev, ev_arg arg)
-{
-
-	switch (what) {
-	case EVENT_INIT_OPEN:
-		ev->evtmr_timeout = arg.int32;
-		ev->evtmr_oneshot = 1;
-		break;
-	case EVENT_INIT_CLOSE:
-		break;
-	}
-	return (0);
+	mdns_rrset_name(rs, r->r_name);
+	rs->r_type = type;
+	rs->r_class = class;
+	rs->r_cflush = cflush;
+	rs->r_datalen = rr->rr_len;
+	rs->r_data = rr->rr_data;
 }
 
 /*
- * Start a timer, returns a unique timer identifier
+ * Callback routine from aggregation queue, called when a data
+ * object is supposed to be added to the packet.
  */
-int
-tmr_start(struct md_glob *g, uint32_t timeout, ev_handler_tmr handler,
-    void *arg, int oneshot)
+static void
+aggr_resp_engine(struct mdns_pkgchain *pc, void *data)
 {
-	int id;
-	ev_arg eva, evai;
+	struct record *r;
+	struct record_class *rc;
+	struct record_type *rt;
+	struct record_res *rr;
+	struct dbr_res *ds;
+	struct mdns_rrset *mrs;
+
+	rr = data;
+	MDNS_INIT_ASSERT(rr, rr_magic);
+	ds = record_res_getparent(rr);
+	MDNS_INIT_ASSERT(ds, ds_magic);
+
+	rt = record_get_type(rr);
+	rc = record_get_class(rt);
+	r = record_get_record(rc);
 
-	evai.int32 = timeout;
-	eva.ptr = arg;
-	if (oneshot)
-		id = event_add(g->g_evl, EVENT_TYPE_TMR, handler, &eva,
-		    tmr_init_oneshot, &evai);
-	else
-		id = event_add(g->g_evl, EVENT_TYPE_TMR, handler, &eva,
-		    tmr_init, &evai);
-	return (id);
+	mrs = mdns_pkg_getrrset();
+	record2rrset(r, rc->rc_class, rt->rt_type, rr, mrs, 0);
+	mrs->r_ttl = ds->ds_dir->dir_ttl;
+	clock_gettime(CLOCK_REALTIME, &ds->ds_time);
+	mdns_pkg_addanswer(pc, mrs, 0);
 }
 
-void
-tmr_stop(struct md_glob *g, int timer)
+/*
+ * Initialize a response packet chain
+ */
+static void
+aggr_resp_pkgchain(struct md_if *mif, struct mdns_pkgchain *pc)
 {
 
-	event_del(g->g_evl, timer, NULL);
+	mdns_pkgchain_init(&mif->mif_stack, pc, MDNS_PC_NONE);
+	mdns_pkg_sethdr(pc, 0, MDNS_HEAD_RESP | MDNS_HEAD_AA);
 }
 
 /*
@@ -209,25 +207,6 @@
 }
 
 /*
- * Duplicate an wide character string
- * XXX: Move to a better place
- */
-wchar_t *
-_wcsdup(const wchar_t *s)
-{
-	size_t len;
-	wchar_t *d;
-
-	len = (wcslen(s) + 1) * sizeof(wchar_t);
-	d = malloc(len);
-	if (d == NULL)
-		return (NULL);
-	memcpy(d, s, len);
-	return (d);
-}
-
-
-/*
  * Generic I/O read-ready event initializtion
  */
 int
@@ -246,404 +225,6 @@
 	return (0);
 }
 
-static inline void
-record2rrset(struct record *r, struct record_type *rt, struct record_res *rr,
-    struct mdns_rrset *rs, int cflush)
-{
-
-	MDNS_INIT_ASSERT(r, r_magic);
-	MDNS_INIT_ASSERT(rt, rt_magic);
-	MDNS_INIT_ASSERT(rr, rr_magic);
-
-	mdns_rrset_name(rs, r->r_name);
-	rs->r_type = rt->rt_type;
-	rs->r_class = mdns_c_in;
-	rs->r_cflush = cflush;
-	rs->r_datalen = rr->rr_len;
-	rs->r_data = rr->rr_data;
-}
-
-/*
- * Callback routine from aggregation queue, called when a data
- * object is supposed to be added to the packet.
- */
-static void
-aggr_resp_engine(struct mdns_pkgchain *pc, void *data)
-{
-	struct record *r;
-	struct record_type *rt;
-	struct record_res *rr;
-	struct dbr_res *ds;
-	struct mdns_rrset *mrs;
-
-	rr = data;
-	MDNS_INIT_ASSERT(rr, rr_magic);
-	ds = record_res_getparent(rr);
-	MDNS_INIT_ASSERT(ds, ds_magic);
-	rt = rr->rr_type;
-	MDNS_INIT_ASSERT(rt, rt_magic);
-	r = rt->rt_record;
-	MDNS_INIT_ASSERT(r, r_magic);
-
-	mrs = mdns_pkg_getrrset();
-	record2rrset(r, rt, rr, mrs, 0);
-	mrs->r_ttl = ds->ds_dir->dir_ttl;
-	clock_gettime(CLOCK_REALTIME, &ds->ds_time);
-	mdns_pkg_addanswer(pc, mrs, 0);
-}
-
-/*
- * Initialize a response packet chain
- */
-static void
-aggr_resp_pkgchain(struct md_if *mif, struct mdns_pkgchain *pc)
-{
-
-	mdns_pkgchain_init(&mif->mif_stack, pc, MDNS_PC_NONE);
-	mdns_pkg_sethdr(pc, 0, MDNS_HEAD_RESP | MDNS_HEAD_AA);
-}
-
-/*
- * Process a query packet
- */
-static void
-process_query(struct md_if *mif, struct mdns_packet *pkg,
-    struct mdns_head *hdr, struct sockaddr *from, socklen_t fromlen, int legacy)
-{
-	struct mdns_qset qs;
-	struct mdns_rrset rs, *rsp;
-	struct dbr_rec *dr;
-	struct dbr_res *ds;
-	struct cache_res *cr;
-	struct record_res  *rr;
-	struct record_type *rt;
-	struct record *r;
-	int i, error, send_unicast;
-	time_t min, min2, max;
-	struct aqueue *aq;
-	struct timespec ts;
-	struct cache ac;
-	struct records auth;
-	struct mdns_pkgchain upc;
-
-	clock_gettime(CLOCK_REALTIME, &ts);
-
-	mdns_pkgchain_init(&mif->mif_stack, &upc, MDNS_PC_NONE);
-	mdns_pkg_sethdr(&upc, hdr->h_id, MDNS_HEAD_RESP | MDNS_HEAD_AA);
-	send_unicast = 0;
-	if (from->sa_family == AF_INET)
-		aq = &mif->mif_aq4;
-#ifdef INET6
-	else if (from->sa_family == AF_INET6)
-		aq = &mif->mif_aq6;
-#endif
-
-	/*
-	 * Process the answer section first
-	 */
-	if (hdr->h_canswer > 0)
-		cache_init(&ac, NULL);
-	for (i = 0; i < hdr->h_canswer; i++) {
-		error = mdns_pkg_getanswer(pkg, i, &rs);
-		if (error != 0)
-			break;
-		if (rs.r_class != mdns_c_in) {
-			free(rs.r_data);
-			continue;
-		}
-
-		/*
-		 * Check if this is a resource we might respond to.
-		 * If it is, check if it's on the output queue and
-		 * remove it if TTL rules match, otherwise add it
-		 * to answer suppression lookup cache.
-		 */
-		ds = dbr_find_res(&mif->mif_dbr, rs.r_name, rs.r_type,
-		    rs.r_data, rs.r_datalen);
-		if (ds != NULL && !(ds->ds_flags & DS_INVALID)) {
-			rr = &ds->ds_res;
-			if (aq_inqueue(aq, rr)) {
-				if (rs.r_ttl > ds->ds_dir->dir_ttl / 2)
-					aq_dequeue(aq, rr);
-			}
-			else if (rs.r_ttl > ds->ds_dir->dir_ttl / 2) {
-				error = cache_add(&ac, &rs, NULL);
-				if (error == 1)
-					free(rs.r_data);
-			}
-			else
-				free(rs.r_data);
-		}
-		else {
-			free(rs.r_data);
-		}
-	}
-
-	/*
-	 * Process the authority section, data in here is used
-	 * for probe tie breaking.
-	 */
-	if (hdr->h_cauth > 0)
-		records_init(&auth, mdns_c_in);
-	for (i = 0; i < hdr->h_cauth; i++) {
-		error = mdns_pkg_getauth(pkg, i, &rs);
-		if (error != 0)
-			break;
-		if (rs.r_class != mdns_c_in) {
-			free(rs.r_data);
-			continue;
-		}
-		record_get(&auth, &r, 0, rs.r_name);
-		record_res_add(r, &rr, 0, rs.r_type,
-		    rs.r_data, rs.r_datalen);
-	}
-
-	/*
-	 * TC bit set, min 400-500 ms delay
-	 * Questions > 1, min 20-120 ms delay
-	 * Other, 0 ms
-	 */
-	if (hdr->h_flags & MDNS_HEAD_TC)
-		min2 = (random() % 101) + 400;
-	else if (hdr->h_cquestion > 1)
-		min2 = (random() % 101) + 20;
-	else
-		min = 0;
-
-	/*
-	 * Process the question section
-	 */
-	for (i = 0; i < hdr->h_cquestion; i++) {
-		error = mdns_pkg_getquestion(pkg, i, &qs);
-		if (error != 0)
-			break;
-		if (qs.q_class != mdns_c_in)
-			continue;
-
-		dprintf(DEBUG_RECV,
-		    "question for %s, type=%d, unicast=%d, legacy=%d",
-		    qs.q_name, qs.q_type, qs.q_unicast, legacy);
-
-		dr = dbr_find(&mif->mif_dbr, qs.q_name);
-		if (dr == NULL)
-			continue;
-		MDNS_INIT_ASSERT(dr, dr_magic);
-		/*
-		 * Simultanesous probe tie-breaking
-		 */
-		if (dr->dr_flags & DR_PROBING && hdr->h_cauth > 0) {
-			record_get(&auth, &r, RECORD_NOINIT, qs.q_name);
-			dbr_tiebreak(&mif->mif_dbr, dr, r);
-			continue;	
-		}
-		else if (!(dr->dr_flags & DR_OK)) {
-			dprintf(DEBUG_SEND, "Record %s found in "
-			    "database, but is not marked ok (%x)",
-			    qs.q_name, dr->dr_flags);
-			continue;
-		}
-		/*
-		 * Fix delay time for if this record is
-		 * marked as shared
-		 */
-		else if (dr->dr_flags & DR_SHARED && min2 == 0)
-			min = (random() % 101) + 20;
-		else
-			min = min2;
-
-		/* Allow additional 500ms if aggreation is possible */
-		max = min + 500;
-
-		dprintf(DEBUG_SEND, "Found %s in database, responding",
-		    qs.q_name);
-		if (legacy)
-			mdns_pkg_addquestion(&upc, &qs, MDNS_PKG_DUP);
-
-		r = &dr->dr_rec;
-		record_foreach(rt, r) {
-			if (qs.q_type != rt->rt_type
-			    && qs.q_type != mdns_in_any)
-				continue;
-			record_type_foreach(rr, rt) {
-				ds = record_res_getparent(rr);
-				if (ds->ds_flags & DS_INVALID)
-					continue;
-				if (hdr->h_canswer > 0) {
-					cr = cache_find(&ac, qs.q_name,
-					    qs.q_type);
-					if (cr != NULL)
-						continue;
-				}
-				/*
-				 * This clients needs/wants a unicast response,
-				 * we also schedule a multicast response in we
-				 * this resource hasn't been multicasted
-				 * "recently".
-				 */
-				if (legacy || qs.q_unicast) {
-					rsp = mdns_pkg_getrrset();
-					record2rrset(r, rt, rr, rsp, 0);
-					rsp->r_ttl = legacy ? 10 :
-					    ds->ds_dir->dir_ttl;
-					mdns_pkg_addanswer(&upc, rsp, 0);
-					send_unicast = 1;
-					/*
-					 * Schedule a multicast response if
-					 * the time this resource last was
-					 * sent is greater than a quarter of
-					 * its ttl.
-					 */	
-					if ((ts.tv_sec - ds->ds_time.tv_sec) >
-					    (int32_t)(ds->ds_dir->dir_ttl / 4))
-						aq_enqueue(aq, rr, min, max);
-				}
-				/*
-				 * Multicase response, only if not already in
-				 * aggregation queue and it's at least one
-				 * second since we last sent this resource.
-				 */
-				else if (!aq_inqueue(aq, rr) &&
-				    ts.tv_sec > ds->ds_time.tv_sec)
-					aq_enqueue(aq, rr, min, max);
-			}
-		}
-	}
-
-	if (send_unicast)
-		oq_enqueue(&mif->mif_oq, &upc, from->sa_family,
-		    from, fromlen);
-	if (hdr->h_canswer > 0)
-		cache_destroy(&ac);
-	if (hdr->h_cauth > 0)
-		records_destroy(&auth);
-
-	mdns_pkgchain_free(&upc);
-}
-
-/*
- * Process a response
- */
-static void
-process_resp(struct md_if *mif, struct mdns_packet *pkg, struct mdns_head *hdr,
-    struct sockaddr *from, socklen_t fromlen __unused)
-{
-	struct dbr_rec *dr;
-	int i, error;
-	struct mdns_rrset rs;
-
-	for (i = 0; i < hdr->h_canswer; i++) {
-		error = mdns_pkg_getanswer(pkg, i, &rs);
-		if (error != 0)
-			break;
-		if (rs.r_class != mdns_c_in) {
-			free(rs.r_data);
-			continue;
-		}
-
-		dprintf(DEBUG_RECV, "response to %s, class=%d, type=%d",
-		    rs.r_name, rs.r_class, rs.r_type);
-
-		dr = dbr_find(&mif->mif_dbr, rs.r_name);
-		if (dr != NULL && !(dr->dr_flags & DR_SHARED)) {
-			dprintf(DEBUG_SEND, "Conflicting name %s (dr=%x)",
-			    rs.r_name, dr);
-			dbr_defend(&mif->mif_dbr, dr, &rs, from->sa_family);
-			continue;
-		}
-
-		/* Notify pending consumers */
-		query_notify(&mif->mif_q, &rs, mif->mif_index,
-		    from->sa_family, ((i + 1) < hdr->h_canswer));
-
-		/* TODO: check for pending questions matching this */
-		/* TODO: check for pending answers matching this */
-
-		/*
-		 * Purge records older than 1 second if this is
-		 * supposed to be a unique rrset (cache flush bit set)
-		 */
-		if (rs.r_cflush)
-			cache_purge(&mif->mif_cache, 1, rs.r_name, rs.r_type);
-		error = cache_add(&mif->mif_cache, &rs, NULL);
-		if (error == 1)
-			free(rs.r_data);
-	}
-}
-
-/*
- * Process a mdns packet and generate appropriate responses
- *   mif  - Interface handle
- *   pc   - Packet chain
- *   type - MDNS_{UDP,TCP} transport type used to receive pkg
- *   from - Peer address information
- *   fromlen - Socket address length
- */
-static int
-pkgprocess(struct md_if *mif, struct mdns_pkgchain *pc, int type __unused,
-	struct sockaddr *from, socklen_t fromlen)
-{
-	struct mdns_packet *pkg;
-	struct mdns_head hdr;
-	int sinaddr_len, legacy;
-	in_port_t port;
-	void *sinaddr = NULL;
-	struct sockaddr_in *sin;
-#ifdef INET6
-	struct sockaddr_in6 *sin6;
-#endif
-#ifdef DEBUG
-	char addr[SOCK_MAXADDRLEN+1];
-#endif
-	struct aqueue *aq;
-
-	switch (from->sa_family) {
-	case AF_INET:
-		sin = (struct sockaddr_in *)from;
-		port = sin->sin_port;
-		sinaddr = &((struct sockaddr_in *)from)->sin_addr;
-		sinaddr_len = sizeof(struct in_addr);
-		aq = &mif->mif_aq4;
-		break;
-#ifdef INET6
-	case AF_INET6:
-		sin6 = (struct sockaddr_in6 *)from;
-		port = sin6->sin6_port;
-		sinaddr = &((struct sockaddr_in6 *)from)->sin6_addr;
-		sinaddr_len = sizeof(struct in6_addr);
-		aq = &mif->mif_aq6;
-		break;
-#endif /* INET6 */
-	}
-
-#ifdef DEBUG
-	inet_ntop(from->sa_family, sinaddr, addr, SOCK_MAXADDRLEN);
-	dprintf(DEBUG_RECV, "Packet received peer=%s, port=%d, if=%s",
-	    addr, port, mif->mif_ifnam);
-#endif /* DEBUG */
-
-	pkg = mdns_pkgchain_curpkg(pc);
-	mdns_pkg_gethdr(pkg, &hdr);
-	dprintf(DEBUG_RECV, "type=%s, questions=%d, answers=%d, authority=%d",
-	    hdr.h_flags & MDNS_HEAD_QUERY ? "query" : "resp",
-	    hdr.h_cquestion, hdr.h_canswer, hdr.h_cauth);
-
-	/*
-	 * We are processing a query
-	 */
-	if (hdr.h_flags & MDNS_HEAD_QUERY) {
-		legacy = (port != 5353) ? 1 : 0;
-		process_query(mif, pkg, &hdr, from, fromlen, legacy);
-	}
-
-	/*
-	 * We are processing a response
-	 */
-	else if (hdr.h_flags & MDNS_HEAD_RESP) {
-		process_resp(mif, pkg, &hdr, from, fromlen);
-	}
-	return (0);
-}
-
 /*
  * UDP socket read-ready event handler
  * Allocates a packet chain and reads data from mdns stack and passes
@@ -1013,27 +594,30 @@
 	MDNS_INIT_SET(mif, mif_magic);
 	mif->mif_index = if_nametoindex(ifnam);
 	if (mif->mif_index == 0)
-		goto out;
+		goto if_new_fail;
 	strncpy(mif->mif_ifnam, ifnam, IFNAMSIZ);
 
 	/* Initialize low-level mdns stack on this interface */
 	error = mdns_init(&mif->mif_stack, g->g_bp, ifnam);
 	if (error != 0)
-		goto out;
+		goto if_new_fail;
 	MTX_INIT(mif, mif_stack_mtx, NULL);
 
 	RW_INIT(mif, mif_lock, NULL);	
-	RW_WLOCK(mif, mif_lock);
 	mif->mif_glob = g;
 	TAILQ_INIT(&mif->mif_evlist);
 	if (get_linkstatus(ifnam) != LINK_STATE_DOWN)
 		mif->mif_flags |= MIF_LINKUP;
 
 	/* Client queries system */
-	queries_init(&mif->mif_q, mif);
+	error = queries_init(&mif->mif_q, mif);
+	if (error != 0)
+		goto if_new_fail;
 
 	/* Initialize cache */	
-	cache_init(&mif->mif_cache, &mif->mif_q);
+	error = cache_init(&mif->mif_cache, &mif->mif_q);
+	if (error != 0)
+		goto if_new_fail;
 
 	/* Initialize output queue */
 	oq_init(&mif->mif_oq, mif);
@@ -1055,10 +639,10 @@
 
 	/*
 	 * Read configuration file and create self-claimed records.
-	 * This is done after socket setup so probing is safe to start.
 	 */
 	cfg_read(&mif->mif_dbr, ifnam, g->g_cfgfile);
 
+	RW_WLOCK(mif, mif_lock);
 	RW_WLOCK(g, g_lock);
 	TAILQ_INSERT_TAIL(&g->g_ifs_head, mif, mif_next);
 	if (mif->mif_index >= g->g_ifs_max) {
@@ -1070,15 +654,15 @@
 	}
 	g->g_ifs[mif->mif_index] = mif;
 	RW_UNLOCK(g, g_lock);
-
 	RW_UNLOCK(mif, mif_lock);
 	logger(LOG_NOTICE, "Added interface %s", mif->mif_ifnam);
 
 	dbr_probe_all(&mif->mif_dbr);
 
 	return (mif);
-out:
+if_new_fail:
 	free(mif);
+	logger(LOG_ERR, "Failed to add interface %s", ifnam);
 	return (NULL);
 }
 

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.h#7 (text+ko) ====

@@ -33,13 +33,13 @@
 #include "debug.h"
 #include "dbrec.h"
 #include "clisrv.h"
+#include "cache.h"
 #include "event.h"
 #include "hash.h"
 #include "mdns.h"
 #include "output.h"
 #include "output_aggr.h"
 #include "queries.h"
-#include "record.h"
 #include "threads.h"
 #include "var.h"
 #include "wqueue.h"
@@ -64,27 +64,6 @@
 	struct clisrv g_cs;  /* unix client pipe server */
 };
 
-/*
- * Cache resouce record
- */
-struct cache_res {
-	MAGIC(cr_magic);
-	struct record_res cr_res;
-	TAILQ_ENTRY(cache_res) cr_next;
-	uint32_t cr_ttl_rel;
-	uint32_t cr_ttl_abs;
-	time_t cr_ctime;
-};
-
-/*
- * Cache record set
- */
-struct cache {
-	struct records c_recs;
-	struct queries *c_queries;
-	TAILQ_HEAD(, cache_res) c_list; /* time delta list */
-};
-
 /* Event identifier */
 struct md_if_ev {
 	TAILQ_ENTRY(md_if_ev) ifev_next;
@@ -122,22 +101,9 @@
 	char mif_ifnam[IFNAMSIZ];
 };
 
-/* mdsnd.c */
-int tmr_start(struct md_glob *, uint32_t, ev_handler_tmr, void *, int);
-void tmr_stop(struct md_glob *, int);
-wchar_t * _wcsdup(const wchar_t *);
-
-/* cache.c */
-void cache_init(struct cache *, struct queries *);
-void cache_destroy(struct cache *);
-int cache_add(struct cache *, struct mdns_rrset *, struct record_res **);
-int cache_del(struct cache *, struct record_res *);
-struct cache_res * cache_find(struct cache *, char *, uint16_t);
-struct cache_res * cache_find_next(struct cache_res *);
-void cache_purge(struct cache *, time_t, char *, uint16_t);
-void cache_clean(struct cache *);
-void cache_set_ttl(struct cache *, struct record_res *, uint32_t);
-void cache_flush(struct cache *);
+/* input.c */
+int pkgprocess(struct md_if *, struct mdns_pkgchain *, int,
+    struct sockaddr *, socklen_t);
 
 /* parse.y */
 int cfg_read(struct dbr *r, const char *, const char *);

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:42:55 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4895716A46E; Wed,  3 Oct 2007 21:42:55 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C35CD16A420
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:42:54 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 9C4C913C45D
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:42:54 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LgsEc098361
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:42:54 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93LgsUO098358
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:42:54 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:42:54 GMT
Message-Id: <200710032142.l93LgsUO098358@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127157 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:42:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=127157

Change 127157 by fli@fli_nexus on 2007/10/03 21:42:45

	- Add "header protection" defines.
	- Whitespace fix.
	- New printout control macros.
	- Add TRACE_* macros (function enter/leave).
	- Cast magic value to uint32_t (silence compiler).

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/debug.h#5 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/debug.h#5 (text+ko) ====

@@ -27,11 +27,14 @@
 #include <assert.h>
 #include <stdint.h>
 
+#ifndef _DEBUG_H_
+#define _DEBUG_H_
+
 /*
  * Bit-field values that controls debugging output
  */
 #define DEBUG_NONE		0x0000
-#define DEBUG_WQUEUE	0x0001
+#define DEBUG_WQUEUE		0x0001
 #define DEBUG_EVENT		0x0002
 #define DEBUG_STACK		0x0004
 #define DEBUG_BUF		0x0008
@@ -41,17 +44,18 @@
 #define DEBUG_CACHE		0x0080
 #define DEBUG_DBR		0x0100
 #define DEBUG_CFG		0x0200
-#define DEBUG_CFGPARSE	0x0400
+#define DEBUG_CFGPARSE		0x0400
 #define DEBUG_VAR		0x0800
 #define DEBUG_MISC		0x1000
 #define DEBUG_OA		0x2000
 #define DEBUG_CS		0x4000
 #define DEBUG_QUERY		0x8000
+#define DEBUG_TRACE		0x10000
 
 /*
  * Structure initialization protection
  */
-#define MDNS_MAGIC_COOKIE 0xcafebabe
+#define MDNS_MAGIC_COOKIE (uint32_t)0xcafebabe
 #ifdef DEBUG
 #define MAGIC(f) uint32_t f
 #define MDNS_INIT_SET(_md, f) (_md)->f = MDNS_MAGIC_COOKIE;
@@ -79,3 +83,9 @@
 # define HEXDUMP(buf, len)
 #endif
 
+#define TRACE_ENTER dprintf(DEBUG_TRACE, "ENTER")
+#define TRACE_LEAVE dprintf(DEBUG_TRACE, "LEAVE")
+#define TRACE_LEAVE_SUCCESS dprintf(DEBUG_TRACE, "LEAVE SUCCESS")
+#define TRACE_LEAVE_FAIL dprintf(DEBUG_TRACE, "LEAVE FAILURE")
+
+#endif /* _DEBUG_H_ */

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:43:56 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5A67116A41B; Wed,  3 Oct 2007 21:43:56 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2058116A417
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:43:56 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id ED24913C44B
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:43:55 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93Lht7q098383
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:43:55 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93Lht7X098380
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:43:55 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:43:55 GMT
Message-Id: <200710032143.l93Lht7X098380@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127158 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:43:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=127158

Change 127158 by fli@fli_nexus on 2007/10/03 21:43:52

	Hook up new files (...and the debug_mask has changed).

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/Makefile#7 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/Makefile#7 (text+ko) ====

@@ -1,11 +1,11 @@
-SRCS=	cache.c clisrv.c dbrec.c event.c hash.c log.c mdnsd.c objalloc.c \
-	output.c output_aggr.c parse.y queries.c record.c stack_buf.c \
-	stack_mdns.c stack_packet.c stack_util.c token.l utf8.c utf8_cfold.c \
-	var.c wqueue.c y.tab.h
+SRCS=	cache.c clisrv.c dbrec.c event.c hash.c input.c log.c mdnsd.c \
+	objalloc.c output.c output_aggr.c parse.y queries.c record.c \
+	stack_buf.c stack_mdns.c stack_packet.c stack_util.c token.l utf8.c \
+	utf8_cfold.c util.c var.c wqueue.c y.tab.h
 PROG=	mdnsd
 WARNS?=	4	
 
-CFLAGS+=	-I../shared -Wall -g -DDEBUG -DDEBUG_MASK=0xdbf0
+CFLAGS+=	-I../shared -Wall -g -DDEBUG -DDEBUG_MASK=0x1dff4
 .if !defined(WITHOUT_INET6)
 CFLAGS+=	-DINET6
 .endif

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:47:00 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6975016A421; Wed,  3 Oct 2007 21:47:00 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C912416A419
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:46:59 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8882413C4B7
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:46:59 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93LkxPC098533
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:46:59 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93LkxlO098530
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:46:59 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:46:59 GMT
Message-Id: <200710032146.l93LkxlO098530@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127159 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:47:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=127159

Change 127159 by fli@fli_nexus on 2007/10/03 21:46:23

	Add a test case to the record subsystem.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/regression/Makefile.record#1 add
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/regression/regression.h#1 add
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/regression/test-record.c#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Wed Oct  3 21:48:02 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id ED98116A420; Wed,  3 Oct 2007 21:48:01 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9DF2A16A419
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:48:01 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5CDFE13C4B2
	for <perforce@FreeBSD.org>; Wed,  3 Oct 2007 21:48:01 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l93Lm1bo098570
	for <perforce@FreeBSD.org>; Wed, 3 Oct 2007 21:48:01 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l93Lm1ms098565
	for perforce@freebsd.org; Wed, 3 Oct 2007 21:48:01 GMT
	(envelope-from fli@FreeBSD.org)
Date: Wed, 3 Oct 2007 21:48:01 GMT
Message-Id: <200710032148.l93Lm1ms098565@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127161 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Oct 2007 21:48:02 -0000

http://perforce.freebsd.org/chv.cgi?CH=127161

Change 127161 by fli@fli_nexus on 2007/10/03 21:47:15

	Add a (tiny) UTF8 test case.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/regression/Makefile.utf8#1 add
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/regression/test-utf8.c#1 add

Differences ...

From owner-p4-projects@FreeBSD.ORG  Thu Oct  4 19:48:40 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 134CF16A41A; Thu,  4 Oct 2007 19:48:40 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AD54016A475
	for <perforce@freebsd.org>; Thu,  4 Oct 2007 19:48:39 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A4C8013C4B2
	for <perforce@freebsd.org>; Thu,  4 Oct 2007 19:48:39 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l94JmdJX059017
	for <perforce@freebsd.org>; Thu, 4 Oct 2007 19:48:39 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l94JmcSR059014
	for perforce@freebsd.org; Thu, 4 Oct 2007 19:48:38 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 4 Oct 2007 19:48:38 GMT
Message-Id: <200710041948.l94JmcSR059014@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127188 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Oct 2007 19:48:40 -0000

http://perforce.freebsd.org/chv.cgi?CH=127188

Change 127188 by kmacy@kmacy:storage:toestack on 2007/10/04 19:48:21

	IFC 127119

Affected files ...

.. //depot/projects/toestack/Makefile.inc1#2 integrate
.. //depot/projects/toestack/UPDATING#3 integrate
.. //depot/projects/toestack/cddl/lib/Makefile#2 integrate
.. //depot/projects/toestack/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/toestack/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/toestack/cddl/usr.bin/Makefile#2 integrate
.. //depot/projects/toestack/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/toestack/cddl/usr.sbin/Makefile#2 integrate
.. //depot/projects/toestack/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/toestack/contrib/gcc/opts.c#2 integrate
.. //depot/projects/toestack/contrib/wpa_supplicant/main.c#2 integrate
.. //depot/projects/toestack/etc/rc.d/cached#2 delete
.. //depot/projects/toestack/include/Makefile#3 integrate
.. //depot/projects/toestack/lib/libc/Makefile#2 integrate
.. //depot/projects/toestack/lib/libpthread/Makefile#2 integrate
.. //depot/projects/toestack/lib/libthr/Makefile#2 integrate
.. //depot/projects/toestack/libexec/atrun/Makefile#2 integrate
.. //depot/projects/toestack/sbin/ggate/Makefile#2 integrate
.. //depot/projects/toestack/share/man/man4/pci.4#2 integrate
.. //depot/projects/toestack/share/man/man9/pci.9#2 integrate
.. //depot/projects/toestack/share/mk/bsd.libnames.mk#2 integrate
.. //depot/projects/toestack/share/mk/bsd.prog.mk#2 integrate
.. //depot/projects/toestack/sys/amd64/amd64/legacy.c#2 integrate
.. //depot/projects/toestack/sys/amd64/include/legacyvar.h#2 integrate
.. //depot/projects/toestack/sys/amd64/pci/pci_bus.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate
.. //depot/projects/toestack/sys/arm/xscale/ixp425/ixp425_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate
.. //depot/projects/toestack/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/toestack/sys/dev/cardbus/cardbus.c#2 integrate
.. //depot/projects/toestack/sys/dev/pccbb/pccbb.c#2 integrate
.. //depot/projects/toestack/sys/dev/pccbb/pccbb_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/pccbb/pccbbvar.h#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pci_pci.c#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pci_private.h#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pcib_private.h#2 integrate
.. //depot/projects/toestack/sys/dev/pci/pcivar.h#2 integrate
.. //depot/projects/toestack/sys/i386/i386/legacy.c#2 integrate
.. //depot/projects/toestack/sys/i386/include/legacyvar.h#2 integrate
.. //depot/projects/toestack/sys/i386/pci/pci_bus.c#2 integrate
.. //depot/projects/toestack/sys/kern/kern_sx.c#2 integrate
.. //depot/projects/toestack/sys/kern/sched_ule.c#3 integrate
.. //depot/projects/toestack/sys/modules/cxgb/Makefile#5 integrate
.. //depot/projects/toestack/sys/net/if_var.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctp_asconf.c#5 integrate
.. //depot/projects/toestack/sys/netinet/sctp_constants.h#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_indata.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_input.c#5 integrate
.. //depot/projects/toestack/sys/netinet/sctp_output.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_output.h#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_timer.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_usrreq.c#4 integrate
.. //depot/projects/toestack/sys/netinet/sctp_var.h#3 integrate
.. //depot/projects/toestack/sys/netinet/sctputil.c#4 integrate
.. //depot/projects/toestack/sys/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/toestack/sys/powerpc/powermac/uninorth.c#2 integrate
.. //depot/projects/toestack/sys/sparc64/pci/apb.c#2 integrate
.. //depot/projects/toestack/sys/sparc64/pci/ofw_pcibus.c#3 integrate
.. //depot/projects/toestack/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/toestack/sys/sun4v/sun4v/hv_pci.c#2 integrate
.. //depot/projects/toestack/sys/sys/param.h#3 integrate
.. //depot/projects/toestack/sys/sys/pciio.h#2 integrate
.. //depot/projects/toestack/tools/build/make_check/Makefile#2 integrate
.. //depot/projects/toestack/tools/build/mk/OptionalObsoleteFiles.inc#2 integrate
.. //depot/projects/toestack/tools/make_libdeps.sh#2 integrate
.. //depot/projects/toestack/tools/tools/pciroms/pciroms.c#2 integrate
.. //depot/projects/toestack/usr.bin/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/Makefile#3 integrate
.. //depot/projects/toestack/usr.sbin/bluetooth/bthidd/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/cached/Makefile#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agent.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agent.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/Makefile.inc#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/group.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/group.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/passwd.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/passwd.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/services.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/agents/services.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cached.8#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cached.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cached.conf.5#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cachedcli.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cachedcli.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cachelib.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cachelib.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cacheplcs.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/cacheplcs.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/config.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/config.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/debug.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/debug.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/hashtable.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/log.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/log.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/mp_rs_query.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/mp_rs_query.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/mp_ws_query.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/mp_ws_query.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/parser.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/parser.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/protocol.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/protocol.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/query.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/query.h#2 delete
.. //depot/projects/toestack/usr.sbin/cached/singletons.c#2 delete
.. //depot/projects/toestack/usr.sbin/cached/singletons.h#2 delete
.. //depot/projects/toestack/usr.sbin/config/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/cron/cron/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/ngctl/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/pciconf/pciconf.8#2 integrate
.. //depot/projects/toestack/usr.sbin/pciconf/pciconf.c#2 integrate
.. //depot/projects/toestack/usr.sbin/pmcstat/Makefile#2 integrate
.. //depot/projects/toestack/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#2 integrate

Differences ...

==== //depot/projects/toestack/Makefile.inc1#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.584 2007/07/10 10:19:45 delphij Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.586 2007/10/01 18:24:46 ru Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -330,8 +330,7 @@
 .endfor
 .for _dir in \
     lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc \
-    usr/share/snmp/defs usr/share/snmp/mibs
+    usr/libexec usr/sbin usr/share/misc
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -415,9 +414,7 @@
 	@echo ">>> stage 5.1: building 32 bit shim libraries"
 	@echo "--------------------------------------------------------------"
 .for _dir in \
-    lib lib32 usr/bin usr/include usr/lib32 usr/libdata/ldscripts \
-    usr/libexec usr/sbin usr/share/misc \
-    usr/share/snmp/defs usr/share/snmp/mibs
+    usr/include usr/lib32 usr/share/misc
 	mkdir -p ${LIB32TMP}/${_dir}
 .endfor
 	mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \
@@ -1027,12 +1024,20 @@
 		${_lib_libgssapi} ${_lib_libipx} \
 		lib/libkiconv lib/libkvm lib/libmd \
 		lib/ncurses/ncurses lib/ncurses/ncursesw \
-		lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \
+		lib/libopie lib/libpam ${_default_thread_lib} \
 		lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
 		${_lib_libypclnt} lib/libz lib/msun \
 		${_secure_lib_libcrypto} ${_secure_lib_libssh} \
 		${_secure_lib_libssl}
 
+.if ${MK_LIBTHR} != "no" && ${MK_LIBPTHREAD} != "no"
+_default_thread_lib=	lib/${DEFAULT_THREAD_LIB}
+.elif ${MK_LIBTHR} != "no"
+_default_thread_lib=	lib/libthr
+.elif ${MK_LIBPTHREAD} != "no"
+_default_thread_lib=	lib/libpthread
+.endif
+
 _generic_libs=	${_cddl_lib} gnu/lib ${_kerberos5_lib} lib ${_secure_lib} usr.bin/lex/lib
 
 lib/libopie__L lib/libtacplus__L: lib/libmd__L

==== //depot/projects/toestack/UPDATING#3 (text+ko) ====

@@ -21,6 +21,13 @@
 	developers choose to disable these features on build machines
 	to maximize performance.
 
+20070930:
+	The PCI code has been made aware of PCI domains. This means that
+	the location strings as used by pciconf(8) etc are now in the
+	following format: pci<domain>:<bus>:<device>[:<function>]. It
+	also means that consumers of <sys/pciio.h> potentially need to
+	be recompiled; this includes the hal and xorg-server ports.
+
 20070928:
         The caching daemon (cached) was renamed to nscd. nscd.conf
         configuration file should be used instead of cached.conf and
@@ -894,4 +901,4 @@
 Contact Warner Losh if you have any questions about your use of
 this document.
 
-$FreeBSD: src/UPDATING,v 1.504 2007/09/28 10:38:07 bushman Exp $
+$FreeBSD: src/UPDATING,v 1.505 2007/09/30 11:05:12 marius Exp $

==== //depot/projects/toestack/cddl/lib/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/lib/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/lib/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -11,7 +11,9 @@
 
 .if ${MK_ZFS} != "no"
 _libzfs=	libzfs
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _libzpool=	libzpool
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/toestack/cddl/sbin/zfs/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zfs/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zfs
 
@@ -19,7 +19,9 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>

==== //depot/projects/toestack/cddl/sbin/zpool/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.2 2007/04/16 21:20:26 ru Exp $
+# $FreeBSD: src/cddl/sbin/zpool/Makefile,v 1.3 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zpool
 
@@ -19,7 +19,9 @@
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/fs/zfs
 CFLAGS+= -I${.CURDIR}/../../../sys/contrib/opensolaris/uts/common/sys
 
-DPADD=	${LIBAVL} ${LIBGEOM} ${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBZFS}
-LDADD=	-lavl -lgeom -lm -lnvpair -luutil -lzfs
+DPADD=	${LIBAVL} ${LIBZFS} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} \
+	${LIBM} ${LIBNVPAIR} ${LIBUUTIL} ${LIBUTIL}
+LDADD=	-lavl -lzfs -lgeom -lbsdxml -lsbuf \
+	-lm -lnvpair -luutil -lutil
 
 .include <bsd.prog.mk>

==== //depot/projects/toestack/cddl/usr.bin/Makefile#2 (text+ko) ====

@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	${_ztest}
 
 .if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _ztest=	ztest
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/toestack/cddl/usr.bin/ztest/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.bin/ztest/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/ztest
 
@@ -15,7 +15,8 @@
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>

==== //depot/projects/toestack/cddl/usr.sbin/Makefile#2 (text+ko) ====

@@ -1,11 +1,13 @@
-# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.4 2007/06/08 12:35:45 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/Makefile,v 1.5 2007/10/01 18:23:24 ru Exp $
 
 .include <bsd.own.mk>
 
 SUBDIR=	${_zdb}
 
 .if ${MK_ZFS} != "no"
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _zdb=	zdb
 .endif
+.endif
 
 .include <bsd.subdir.mk>

==== //depot/projects/toestack/cddl/usr.sbin/zdb/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.3 2007/04/17 15:52:37 pjd Exp $
+# $FreeBSD: src/cddl/usr.sbin/zdb/Makefile,v 1.4 2007/10/01 18:17:23 ru Exp $
 
 .PATH: ${.CURDIR}/../../../contrib/opensolaris/cmd/zdb
 
@@ -16,7 +16,8 @@
 CFLAGS+= -I${.CURDIR}/../../../contrib/opensolaris/head
 CFLAGS+= -I${.CURDIR}/../../lib/libumem
 
-DPADD=	${LIBAVL} ${LIBM} ${LIBNVPAIR} ${LIBPTHREAD} ${LIBUMEM} ${LIBZPOOL}
-LDADD=	-lavl -lm -lnvpair -lpthread -lumem -lzpool
+DPADD=	${LIBM} ${LIBNVPAIR} ${LIBUMEM} ${LIBZPOOL} \
+	${LIBPTHREAD} ${LIBZ} ${LIBAVL}
+LDADD=	-lm -lnvpair -lumem -lzpool -lpthread -lz -lavl
 
 .include <bsd.prog.mk>

==== //depot/projects/toestack/contrib/gcc/opts.c#2 (text+ko) ====

@@ -20,7 +20,7 @@
 Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
 02110-1301, USA.  */
 
-/* $FreeBSD: src/contrib/gcc/opts.c,v 1.3 2007/05/19 02:22:16 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/opts.c,v 1.4 2007/10/02 20:06:14 obrien Exp $ */
 
 #include "config.h"
 #include "system.h"
@@ -501,7 +501,10 @@
       flag_reorder_functions = 1;
       flag_tree_store_ccp = 1;
       flag_tree_store_copy_prop = 1;
-      flag_tree_vrp = 1;
+      /* XXX: some issues with ports have been traced to -ftree-vrp.
+         So remove it from -O2 and above.  Note that jdk1{5,6} are affected
+         and they build with w/-O3 - so we cannot just move it to -O3. */
+      // flag_tree_vrp = 1;
 
       if (!optimize_size)
 	{

==== //depot/projects/toestack/contrib/wpa_supplicant/main.c#2 (text) ====

@@ -82,7 +82,7 @@
 	       "  -N = start describing new interface\n");
 
 	printf("example:\n"
-	       "  wpa_supplicant -Dwext -iwlan0 -c/etc/wpa_supplicant.conf\n");
+	       "  wpa_supplicant -Dbsd -iwlan0 -c/etc/wpa_supplicant.conf\n");
 #endif /* CONFIG_NO_STDOUT_DEBUG */
 }
 

==== //depot/projects/toestack/include/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 1/4/94
-# $FreeBSD: src/include/Makefile,v 1.275 2007/09/23 07:34:21 pjd Exp $
+# $FreeBSD: src/include/Makefile,v 1.276 2007/10/01 18:07:29 ru Exp $
 #
 # Doing a "make install" builds /usr/include.
 
@@ -45,11 +45,13 @@
 LSUBDIRS=	cam/scsi \
 	dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \
 	dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \
-	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
+	dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus \
+	dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \
 	fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \
 	${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \
 	geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \
-	geom/mirror geom/nop geom/raid3 geom/shsec geom/stripe geom/virstor \
+	geom/mirror geom/multipath geom/nop \
+	geom/raid3 geom/shsec geom/stripe geom/virstor \
 	netgraph/atm netgraph/netflow \
 	security/audit \
 	security/mac_biba security/mac_bsdextended security/mac_lomac \

==== //depot/projects/toestack/lib/libc/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.2 (Berkeley) 2/3/94
-# $FreeBSD: src/lib/libc/Makefile,v 1.72 2007/05/19 16:38:39 kan Exp $
+# $FreeBSD: src/lib/libc/Makefile,v 1.73 2007/10/01 18:15:10 ru Exp $
 
 SHLIBDIR?= /lib
 
@@ -23,6 +23,7 @@
 #
 # Only link with static libgcc.a (no libgcc_eh.a).
 #
+DPADD+=	${LIBGCC}
 LDFLAGS+= -nodefaultlibs
 LDADD+= -lgcc
 

==== //depot/projects/toestack/lib/libpthread/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libpthread/Makefile,v 1.63 2007/05/21 02:49:06 deischen Exp $
+# $FreeBSD: src/lib/libpthread/Makefile,v 1.64 2007/10/01 18:22:31 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -10,7 +10,8 @@
 
 .include <bsd.own.mk>
 
-.if ${DEFAULT_THREAD_LIB} == "libpthread" && ${SHLIBDIR} == "/usr/lib"
+.if (${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no") && \
+    ${SHLIBDIR} == "/usr/lib"
 SHLIBDIR= /lib
 .endif
 
@@ -46,7 +47,7 @@
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${DEFAULT_THREAD_LIB} == "libpthread"
+.if ${DEFAULT_THREAD_LIB} == "libpthread" || ${MK_LIBTHR} == "no"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so

==== //depot/projects/toestack/lib/libthr/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthr/Makefile,v 1.26 2007/06/08 02:21:13 davidxu Exp $
+# $FreeBSD: src/lib/libthr/Makefile,v 1.27 2007/10/01 18:29:55 ru Exp $
 #
 # All library objects contain FreeBSD revision strings by default; they may be
 # excluded as a space-saving measure.  To produce a library that does
@@ -10,7 +10,8 @@
 
 .include <bsd.own.mk>
 
-.if ${DEFAULT_THREAD_LIB} == "libthr" && ${SHLIBDIR} == "/usr/lib"
+.if (${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no") && \
+    ${SHLIBDIR} == "/usr/lib"
 SHLIBDIR= /lib
 .endif
 
@@ -43,7 +44,7 @@
 .include "${.CURDIR}/sys/Makefile.inc"
 .include "${.CURDIR}/thread/Makefile.inc"
 
-.if ${DEFAULT_THREAD_LIB} == "libthr"
+.if ${DEFAULT_THREAD_LIB} == "libthr" || ${MK_LIBPTHREAD} == "no"
 SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a
 .if !defined(NO_PIC)
 SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so

==== //depot/projects/toestack/libexec/atrun/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/libexec/atrun/Makefile,v 1.14 2007/06/15 12:02:16 yar Exp $
+# $FreeBSD: src/libexec/atrun/Makefile,v 1.15 2007/10/01 18:17:23 ru Exp $
 
 MAINSRC=${.CURDIR}/../../usr.bin/at
 
@@ -16,7 +16,7 @@
 WFORMAT=0
 
 DPADD=	${LIBPAM} ${LIBUTIL}
-LDADD=	-lpam -lutil
+LDADD=	${MINUSLPAM} -lutil
 
 atrun.8: atrun.man
 	@${ECHO} Making ${.TARGET:T} from ${.ALLSRC:T}; \

==== //depot/projects/toestack/sbin/ggate/Makefile#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sbin/ggate/Makefile,v 1.7 2006/11/26 14:36:33 ru Exp $
+# $FreeBSD: src/sbin/ggate/Makefile,v 1.8 2007/10/01 18:22:31 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -6,8 +6,7 @@
 	${_ggated} \
 	ggatel
 
-.if ${MK_LIBTHR} != "no" || \
-    (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")   
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
 _ggatec=	ggatec
 _ggated=	ggated
 .endif

==== //depot/projects/toestack/share/man/man4/pci.4#2 (text+ko) ====

@@ -22,9 +22,9 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/share/man/man4/pci.4,v 1.18 2007/04/07 14:36:18 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/pci.4,v 1.19 2007/09/30 11:05:12 marius Exp $
 .\"
-.Dd October 24, 1999
+.Dd September 30, 2007
 .Dt PCI 4
 .Os
 .Sh NAME
@@ -109,7 +109,7 @@
 .Bl -tag -width pd_vendor
 .It pc_sel
 .Tn PCI
-bus, slot and function.
+domain, bus, slot and function.
 .It pd_name
 .Tn PCI
 device driver name.
@@ -150,7 +150,7 @@
 .Bl -tag -width pc_subvendor
 .It pc_sel
 .Tn PCI
-bus, slot and function.
+domain, bus, slot and function.
 .It pc_hdr
 .Tn PCI
 header type.
@@ -257,9 +257,10 @@
 .It pi_sel
 A
 .Va pcisel
-structure which specifies the bus, slot and function the user would like to
-query.
-If the specific bus is not found, errno will be set to ENODEV and -1 returned from the ioctl.
+structure which specifies the domain, bus, slot and function the user would
+like to query.
+If the specific bus is not found, errno will be set to ENODEV and -1 returned
+from the ioctl.
 .It pi_reg
 The
 .Tn PCI

==== //depot/projects/toestack/share/man/man9/pci.9#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/man9/pci.9,v 1.9 2005/06/28 20:15:18 hmp Exp $
+.\" $FreeBSD: src/share/man/man9/pci.9,v 1.10 2007/09/30 11:05:13 marius Exp $
 .\"
-.Dd January 22, 2005
+.Dd September 30, 2007
 .Dt PCI 9
 .Os
 .Sh NAME
@@ -39,6 +39,7 @@
 .Nm pci_set_powerstate ,
 .Nm pci_get_powerstate ,
 .Nm pci_find_bsf ,
+.Nm pci_find_dbsf ,
 .Nm pci_find_device
 .Nd PCI bus interface
 .Sh SYNOPSIS
@@ -65,6 +66,8 @@
 .Ft device_t
 .Fn pci_find_bsf "uint8_t bus" "uint8_t slot" "uint8_t func"
 .Ft device_t
+.Fn pci_find_dbsf "uint32_t domain" "uint8_t bus" "uint8_t slot" "uint8_t func"
+.Ft device_t
 .Fn pci_find_device "uint16_t vendor" "uint16_t device"
 .Sh DESCRIPTION
 The
@@ -198,6 +201,30 @@
 number actually refers to the number of the device on the bus,
 which does not necessarily indicate its geographic location
 in terms of a physical slot.
+Note that in case the system has multiple PCI domains,
+the
+.Fn pci_find_bsf
+function only searches the first one.
+Actually, it is equivalent to:
+.Bd -literal -offset indent
+pci_find_dbsf(0, bus, slot, func);
+.Ed
+.Pp
+The
+.Fn pci_find_dbsf
+function looks up the
+.Vt device_t
+of a PCI device, given its
+.Fa domain ,
+.Fa bus ,
+.Fa slot ,
+and
+.Fa func .
+The
+.Fa slot
+number actually refers to the number of the device on the bus,
+which does not necessarily indicate its geographic location
+in terms of a physical slot.
 .Pp
 The
 .Fn pci_find_device

==== //depot/projects/toestack/share/mk/bsd.libnames.mk#2 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.104 2007/05/13 14:12:40 deischen Exp $
+# $FreeBSD: src/share/mk/bsd.libnames.mk,v 1.105 2007/10/01 18:15:11 ru Exp $
 
 # The include file <bsd.libnames.mk> define library names.
 # Other include files (e.g. bsd.prog.mk, bsd.lib.mk) include this
@@ -120,11 +120,7 @@
 LIBPANEL?=	${DESTDIR}${LIBDIR}/libpanel.a
 LIBPCAP?=	${DESTDIR}${LIBDIR}/libpcap.a
 LIBPMC?=	${DESTDIR}${LIBDIR}/libpmc.a
-.if defined(DEFAULT_THREAD_LIB)
-LIBPTHREAD?=	${DESTDIR}${LIBDIR}/${DEFAULT_THREAD_LIB}.a
-.else
-LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libthr.a
-.endif
+LIBPTHREAD?=	${DESTDIR}${LIBDIR}/libpthread.a
 LIBRADIUS?=	${DESTDIR}${LIBDIR}/libradius.a
 LIBREADLINE?=	${DESTDIR}${LIBDIR}/libreadline.a
 LIBROKEN?=	${DESTDIR}${LIBDIR}/libroken.a

==== //depot/projects/toestack/share/mk/bsd.prog.mk#2 (text+ko) ====

@@ -1,5 +1,5 @@
 #	from: @(#)bsd.prog.mk	5.26 (Berkeley) 6/25/91
-# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.149 2006/09/13 23:27:21 obrien Exp $
+# $FreeBSD: src/share/mk/bsd.prog.mk,v 1.150 2007/10/01 18:15:11 ru Exp $
 
 .include <bsd.init.mk>
 
@@ -40,8 +40,12 @@
 
 # If there are Objective C sources, link with Objective C libraries.
 .if !empty(SRCS:M*.m)
-OBJCLIBS?= -lobjc -lpthread
+.if defined(OBJCLIBS)
 LDADD+=	${OBJCLIBS}
+.else
+DPADD+=	${LIBOBJC} ${LIBPTHREAD}
+LDADD+=	-lobjc -lpthread
+.endif
 .endif
 
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}

==== //depot/projects/toestack/sys/amd64/amd64/legacy.c#2 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.60 2007/03/20 20:21:44 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.61 2007/09/30 11:05:13 marius Exp $");
 
 /*
  * This code implements a system driver for legacy systems that do not
@@ -207,6 +207,9 @@
 	struct legacy_device *atdev = DEVTOAT(child);
 
 	switch (which) {
+	case LEGACY_IVAR_PCIDOMAIN:
+		*result = 0;
+		break;
 	case LEGACY_IVAR_PCIBUS:
 		*result = atdev->lg_pcibus;
 		break;
@@ -223,6 +226,8 @@
 	struct legacy_device *atdev = DEVTOAT(child);
 
 	switch (which) {
+	case LEGACY_IVAR_PCIDOMAIN:
+		return EINVAL;
 	case LEGACY_IVAR_PCIBUS:
 		atdev->lg_pcibus = value;
 		break;

==== //depot/projects/toestack/sys/amd64/include/legacyvar.h#2 (text+ko) ====

@@ -23,19 +23,21 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.7 2005/09/18 01:42:43 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.8 2007/09/30 11:05:13 marius Exp $
  */
 
 #ifndef _MACHINE_LEGACYVAR_H_
 #define	_MACHINE_LEGACYVAR_H_
 
 enum legacy_device_ivars {
+	LEGACY_IVAR_PCIDOMAIN,
 	LEGACY_IVAR_PCIBUS
 };
 
 #define LEGACY_ACCESSOR(var, ivar, type)				\
     __BUS_ACCESSOR(legacy, var, LEGACY, ivar, type)
 
+LEGACY_ACCESSOR(pcidomain,		PCIDOMAIN,	uint32_t)
 LEGACY_ACCESSOR(pcibus,			PCIBUS,		uint32_t)
 
 #undef LEGACY_ACCESSOR

==== //depot/projects/toestack/sys/amd64/pci/pci_bus.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.121 2007/05/02 17:50:34 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.122 2007/09/30 11:05:13 marius Exp $");
 
 #include "opt_cpu.h"
 
@@ -276,6 +276,9 @@
 {
 
 	switch (which) {
+	case  PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return 0;
 	case  PCIB_IVAR_BUS:
 		*result = legacy_get_pcibus(dev);
 		return 0;
@@ -289,6 +292,8 @@
 {
 
 	switch (which) {
+	case  PCIB_IVAR_DOMAIN:
+		return EINVAL;
 	case  PCIB_IVAR_BUS:
 		legacy_set_pcibus(dev, value);
 		return 0;

==== //depot/projects/toestack/sys/arm/xscale/i80321/i80321_pci.c#2 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.11 2007/07/27 14:53:42 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.12 2007/09/30 11:05:13 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -250,8 +250,10 @@
 {
 	struct i80321_pci_softc *sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
-
 		*result = sc->sc_busno;
 		return (0);
 		
@@ -265,6 +267,8 @@
 	struct i80321_pci_softc * sc = device_get_softc(dev);
 
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_busno = result;
 		return (0);

==== //depot/projects/toestack/sys/arm/xscale/i8134x/i81342_pci.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -481,8 +481,10 @@
 {
 	struct i81342_pci_softc *sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
-
 		*result = sc->sc_busno;
 		return (0);
 		
@@ -496,6 +498,8 @@
 	struct i81342_pci_softc * sc = device_get_softc(dev);
 
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_busno = result;
 		return (0);

==== //depot/projects/toestack/sys/arm/xscale/ixp425/ixp425_pci.c#2 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.4 2007/03/06 10:58:22 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.5 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -229,6 +229,9 @@
 
 	sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
 		*result = sc->sc_bus;
 		return (0);
@@ -244,6 +247,8 @@
 
 	sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_bus = value;
 		return (0);

==== //depot/projects/toestack/sys/dev/acpica/acpi_pci.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.30 2006/05/11 22:13:20 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.31 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -275,17 +275,19 @@
 static int
 acpi_pci_attach(device_t dev)
 {
-	int busno;
+	int busno, domain;
 
 	/*
 	 * Since there can be multiple independantly numbered PCI
 	 * busses on systems with multiple PCI domains, we can't use
 	 * the unit number to decide which bus we are probing. We ask
-	 * the parent pcib what our bus number is.
+	 * the parent pcib what our domain and bus numbers are.
 	 */
+	domain = pcib_get_domain(dev);
 	busno = pcib_get_bus(dev);
 	if (bootverbose)
-		device_printf(dev, "physical bus=%d\n", busno);
+		device_printf(dev, "domain=%d, physical bus=%d\n",
+		    domain, busno);
 
 	/*
 	 * First, PCI devices are added as in the normal PCI bus driver.
@@ -297,7 +299,7 @@
 	 * pci_add_children() doesn't find.  We currently just ignore
 	 * these devices.
 	 */
-	pci_add_children(dev, busno, sizeof(struct acpi_pci_devinfo));
+	pci_add_children(dev, domain, busno, sizeof(struct acpi_pci_devinfo));
 	AcpiWalkNamespace(ACPI_TYPE_DEVICE, acpi_get_handle(dev), 1,
 	    acpi_pci_save_handle, dev, NULL);
 

==== //depot/projects/toestack/sys/dev/acpica/acpi_pcib_acpi.c#2 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.54 2007/05/02 17:50:35 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.55 2007/09/30 11:05:14 marius Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -259,6 +259,9 @@
     struct acpi_hpcib_softc	*sc = device_get_softc(dev);
 
     switch (which) {
+    case PCIB_IVAR_DOMAIN:
+	*result = 0;
+	return (0);
     case PCIB_IVAR_BUS:
 	*result = sc->ap_bus;
 	return (0);
@@ -278,6 +281,8 @@
     struct acpi_hpcib_softc	*sc = device_get_softc(dev);
 
     switch (which) {
+    case PCIB_IVAR_DOMAIN:
+	return (EINVAL);
     case PCIB_IVAR_BUS:
 	sc->ap_bus = value;
 	return (0);

==== //depot/projects/toestack/sys/dev/bge/if_bge.c#2 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.197 2007/06/04 18:25:03 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.198 2007/09/30 11:05:14 marius Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -2181,13 +2181,14 @@
 bge_has_multiple_ports(struct bge_softc *sc)
 {
 	device_t dev = sc->bge_dev;
-	u_int b, s, f, fscan;
+	u_int b, d, f, fscan, s;
 
+	d = pci_get_domain(dev);
 	b = pci_get_bus(dev);
 	s = pci_get_slot(dev);
 	f = pci_get_function(dev);
 	for (fscan = 0; fscan <= PCI_FUNCMAX; fscan++)
-		if (fscan != f && pci_find_bsf(b, s, fscan) != NULL)
+		if (fscan != f && pci_find_dbsf(d, b, s, fscan) != NULL)
 			return (1);
 	return (0);
 }

==== //depot/projects/toestack/sys/dev/cardbus/cardbus.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.65 2007/05/16 23:40:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.66 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -162,12 +162,13 @@
 {
 	device_t brdev = device_get_parent(cbdev);
 	device_t child;
+	int bus, domain, slot, func;
 	int cardattached = 0;
-	int bus, slot, func;
 	int cardbusfunchigh = 0;
 
 	cardbus_detach_card(cbdev); /* detach existing cards */
 	POWER_ENABLE_SOCKET(brdev, cbdev);
+	domain = pcib_get_domain(cbdev);
 	bus = pcib_get_bus(cbdev);
 	slot = 0;
 	/* For each function, set it up and try to attach a driver to it */
@@ -175,7 +176,7 @@
 		struct cardbus_devinfo *dinfo;
 
 		dinfo = (struct cardbus_devinfo *)
-		    pci_read_device(brdev, bus, slot, func,
+		    pci_read_device(brdev, domain, bus, slot, func,
 			sizeof(struct cardbus_devinfo));
 		if (dinfo == NULL)
 			continue;

==== //depot/projects/toestack/sys/dev/pccbb/pccbb.c#2 (text+ko) ====

@@ -75,7 +75,7 @@
  */
 

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Thu Oct  4 22:55:08 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 17E4016A46C; Thu,  4 Oct 2007 22:55:08 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C077416A421
	for <perforce@freebsd.org>; Thu,  4 Oct 2007 22:55:07 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B7B8213C4B0
	for <perforce@freebsd.org>; Thu,  4 Oct 2007 22:55:07 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l94Mt71H002271
	for <perforce@freebsd.org>; Thu, 4 Oct 2007 22:55:07 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l94Mt7OY002268
	for perforce@freebsd.org; Thu, 4 Oct 2007 22:55:07 GMT
	(envelope-from kmacy@freebsd.org)
Date: Thu, 4 Oct 2007 22:55:07 GMT
Message-Id: <200710042255.l94Mt7OY002268@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127195 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Oct 2007 22:55:08 -0000

http://perforce.freebsd.org/chv.cgi?CH=127195

Change 127195 by kmacy@kmacy_home:ethng on 2007/10/04 22:54:50

	Add support for my 5150s

Affected files ...

.. //depot/projects/ethng/src/lib/libpmc/libpmc.c#3 edit

Differences ...

==== //depot/projects/ethng/src/lib/libpmc/libpmc.c#3 (text+ko) ====

@@ -1949,11 +1949,11 @@
 		pmc_mdep_event_aliases = p5_aliases;
 		pmc_mdep_allocate_pmc = p5_allocate_pmc;
 		break;
-	case PMC_CPU_INTEL_P6:		/* P6 ... Pentium M CPUs have */
 	case PMC_CPU_INTEL_PII:		/* similar PMCs. */
 	case PMC_CPU_INTEL_PIII:
 #endif
 #if defined(__amd64__) || defined(__i386__)
+	case PMC_CPU_INTEL_P6:		/* P6 ... Pentium M CPUs have */
 	case PMC_CPU_INTEL_PM:
 		pmc_mdep_event_aliases = p6_aliases;
 		pmc_mdep_allocate_pmc = p6_allocate_pmc;

From owner-p4-projects@FreeBSD.ORG  Thu Oct  4 23:47:13 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D47DE16A468; Thu,  4 Oct 2007 23:47:12 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 367F516A41A
	for <perforce@FreeBSD.org>; Thu,  4 Oct 2007 23:47:12 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2B43B13C45A
	for <perforce@FreeBSD.org>; Thu,  4 Oct 2007 23:47:12 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l94NlCBV006775
	for <perforce@FreeBSD.org>; Thu, 4 Oct 2007 23:47:12 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l94NlCnA006763
	for perforce@freebsd.org; Thu, 4 Oct 2007 23:47:12 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Thu, 4 Oct 2007 23:47:12 GMT
Message-Id: <200710042347.l94NlCnA006763@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127198 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Oct 2007 23:47:13 -0000

http://perforce.freebsd.org/chv.cgi?CH=127198

Change 127198 by cnst@dale on 2007/10/04 23:46:34

	integrate

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/etc.defaults/rc.conf#3 integrate
.. //depot/projects/soc2007/cnst-sensors/etc.rc.d/Makefile#3 integrate
.. //depot/projects/soc2007/cnst-sensors/sys.conf/files#7 integrate
.. //depot/projects/soc2007/cnst-sensors/sys.modules/Makefile#4 integrate
.. //depot/projects/soc2007/cnst-sensors/usr.bin.systat/pigs.c#3 integrate
.. //depot/projects/soc2007/cnst-sensors/usr.sbin/Makefile#3 integrate

Differences ...

==== //depot/projects/soc2007/cnst-sensors/etc.defaults/rc.conf#3 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.317 2007/09/06 21:00:48 mlaier Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.318 2007/09/28 10:38:08 bushman Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -497,7 +497,6 @@
 auditd_enable="NO"	# Run the audit daemon.
 auditd_program="/usr/sbin/auditd"	# Path to the audit daemon.
 auditd_flags=""		# Which options to pass to the audit daemon.
-cached_enable="NO"	# Run the nsswitch caching daemon.
 cron_enable="YES"	# Run the periodic job daemon.
 cron_program="/usr/sbin/cron"	# Which cron executable to run (if enabled).
 cron_dst="YES"		# Handle DST transitions intelligently (YES/NO)
@@ -505,6 +504,7 @@
 lpd_enable="NO"		# Run the line printer daemon.
 lpd_program="/usr/sbin/lpd"	# path to lpd, if you want a different one.
 lpd_flags=""		# Flags to lpd (if enabled).
+nscd_enable="NO"	# Run the nsswitch caching daemon.
 chkprintcap_enable="NO"	# Run chkprintcap(8) before running lpd.
 chkprintcap_flags="-d"	# Create missing directories by default.
 dumpdev="AUTO"		# Device to crashdump to (device name, AUTO, or NO).

==== //depot/projects/soc2007/cnst-sensors/etc.rc.d/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $
-# $FreeBSD: src/etc/rc.d/Makefile,v 1.83 2007/09/07 15:44:09 mlaier Exp $
+# $FreeBSD: src/etc/rc.d/Makefile,v 1.84 2007/09/28 10:38:08 bushman Exp $
 
 .include <bsd.own.mk>
 
@@ -48,7 +48,7 @@
 .endif
 
 .if ${MK_NS_CACHING} != "no"
-FILES+= cached
+FILES+= nscd
 .endif
 
 FILESDIR=	/etc/rc.d

==== //depot/projects/soc2007/cnst-sensors/sys.conf/files#7 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1242 2007/08/09 01:11:21 marcel Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1243 2007/09/23 07:34:22 pjd Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and
@@ -1303,6 +1303,9 @@
 geom/shsec/g_shsec.c		optional geom_shsec
 geom/stripe/g_stripe.c		optional geom_stripe
 geom/uzip/g_uzip.c		optional geom_uzip
+geom/virstor/binstream.c	optional geom_virstor
+geom/virstor/g_virstor.c	optional geom_virstor
+geom/virstor/g_virstor_md.c	optional geom_virstor
 geom/zero/g_zero.c		optional geom_zero
 gnu/fs/ext2fs/ext2_alloc.c		optional ext2fs \
 	warning "kernel contains GPL contaminated ext2fs filesystem"

==== //depot/projects/soc2007/cnst-sensors/sys.modules/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/modules/Makefile,v 1.539 2007/08/15 19:26:02 des Exp $
+# $FreeBSD: src/sys/modules/Makefile,v 1.540 2007/09/26 21:14:18 marius Exp $
 
 .include <bsd.own.mk>
 
@@ -87,7 +87,7 @@
 	firewire \
 	firmware \
 	fxp \
-	${_gem} \
+	gem \
 	geom \
 	${_harp} \
 	hatm \
@@ -585,7 +585,6 @@
 _ath_rate_amrr=	ath_rate_amrr
 _ath_rate_onoe=	ath_rate_onoe
 _ath_rate_sample=ath_rate_sample
-_gem=		gem
 _powermac_nvram=	powermac_nvram
 _smbfs=		smbfs
 .endif
@@ -598,7 +597,6 @@
 _ath_rate_sample=ath_rate_sample
 _auxio=		auxio
 _em=		em
-_gem=		gem
 _i2c=		i2c
 _sound=		sound
 .endif

==== //depot/projects/soc2007/cnst-sensors/usr.bin.systat/pigs.c#3 (text+ko) ====

@@ -38,7 +38,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/systat/pigs.c,v 1.23 2007/09/11 07:51:03 ru Exp $");
+__FBSDID("$FreeBSD: src/usr.bin/systat/pigs.c,v 1.24 2007/09/17 05:27:19 jeff Exp $");
 
 /*
  * Pigs display from Bill Reeves at Lucasfilm
@@ -174,7 +174,7 @@
 		pt[i].pt_kp = &kpp[i];
 		pctp = &pt[i].pt_pctcpu;
 		ftime = kpp[i].ki_swtime;
-		if (ftime == 0 || (kpp[i].ki_sflag & PS_INMEM) == 0)
+		if (ftime == 0 || (kpp[i].ki_flag & P_INMEM) == 0)
 			*pctp = 0;
 		else
 			*pctp = ((double) kpp[i].ki_pctcpu /

==== //depot/projects/soc2007/cnst-sensors/usr.sbin/Makefile#3 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.371 2007/07/28 00:12:21 thompsa Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.373 2007/10/01 18:22:32 ru Exp $
 
 .include <bsd.own.mk>
 
@@ -27,7 +27,6 @@
 	bsnmpd \
 	${_btxld} \
 	burncd \
-	${_cached} \
 	cdcontrol \
 	chkgrp \
 	chown \
@@ -109,6 +108,7 @@
 	ngctl \
 	nghook \
 	nologin \
+	${_nscd} \
 	ntp \
 	${_nvram} \
 	${_ofwdump} \
@@ -269,14 +269,17 @@
 _authpf=	authpf
 .endif
 
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
+_pppctl=	pppctl
+.endif
+
 .if ${MK_LPR} != "no"
 _lpr=		lpr
 .endif
 
 .if ${MK_NS_CACHING} != "no"
-.if ${MK_LIBTHR} != "no" || \
-    (${MACHINE_ARCH} != "sparc64" && ${MK_LIBPTHREAD} != "no")
-_cached=	cached
+.if ${MK_LIBTHR} != "no" || ${MK_LIBPTHREAD} != "no"
+_nscd=		nscd
 .endif
 .endif
 
@@ -314,9 +317,6 @@
 _mptable=	mptable
 _ndiscvt=	ndiscvt
 _pnpinfo=	pnpinfo
-.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no"
-_pppctl=	pppctl
-.endif
 _sicontrol=	sicontrol
 _spkrtest=	spkrtest
 _zzz=		zzz
@@ -350,9 +350,6 @@
 _mount_smbfs=	mount_smbfs
 _mptable=	mptable
 _ndiscvt=	ndiscvt
-.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no"
-_pppctl=	pppctl
-.endif
 _sicontrol=	sicontrol
 _spkrtest=	spkrtest
 _zzz=		zzz
@@ -364,9 +361,6 @@
 .endif
 _kgmon=		kgmon
 _mount_smbfs=	mount_smbfs
-.if ${MK_LIBPTHREAD} != "no" || ${MK_LIBTHR} != "no"
-_pppctl=	pppctl
-.endif
 _zzz=		zzz
 .endif
 
@@ -378,9 +372,6 @@
 .if ${MACHINE_ARCH} == "sparc64"
 _eeprom=	eeprom
 _ofwdump=	ofwdump
-.if ${MK_LIBTHR} != "no"
-_pppctl=	pppctl
-.endif
 .endif
 
 .include <bsd.subdir.mk>

From owner-p4-projects@FreeBSD.ORG  Thu Oct  4 23:51:17 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6D68416A474; Thu,  4 Oct 2007 23:51:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E8C8016A46E
	for <perforce@FreeBSD.org>; Thu,  4 Oct 2007 23:51:16 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C8D6413C4B9
	for <perforce@FreeBSD.org>; Thu,  4 Oct 2007 23:51:16 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l94NpGcb007150
	for <perforce@FreeBSD.org>; Thu, 4 Oct 2007 23:51:16 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l94NpGaw007147
	for perforce@freebsd.org; Thu, 4 Oct 2007 23:51:16 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Thu, 4 Oct 2007 23:51:16 GMT
Message-Id: <200710042351.l94NpGaw007147@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127199 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Oct 2007 23:51:17 -0000

http://perforce.freebsd.org/chv.cgi?CH=127199

Change 127199 by cnst@dale on 2007/10/04 23:50:50

	branch etc/Makefile

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/etc/Makefile#1 branch

Differences ...

From owner-p4-projects@FreeBSD.ORG  Thu Oct  4 23:53:19 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9BEA616A41B; Thu,  4 Oct 2007 23:53:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2B90316A420
	for <perforce@FreeBSD.org>; Thu,  4 Oct 2007 23:53:19 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2382613C467
	for <perforce@FreeBSD.org>; Thu,  4 Oct 2007 23:53:19 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l94NrJ71007195
	for <perforce@FreeBSD.org>; Thu, 4 Oct 2007 23:53:19 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l94NrJWV007192
	for perforce@freebsd.org; Thu, 4 Oct 2007 23:53:19 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Thu, 4 Oct 2007 23:53:19 GMT
Message-Id: <200710042353.l94NrJWV007192@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127200 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Oct 2007 23:53:19 -0000

http://perforce.freebsd.org/chv.cgi?CH=127200

Change 127200 by cnst@dale on 2007/10/04 23:53:13

	connect sensorsd.conf to the build. 
	
	Obtained from:	Hasso Tepper via DragonFly BSD

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/etc/Makefile#2 edit

Differences ...

==== //depot/projects/soc2007/cnst-sensors/etc/Makefile#2 (text+ko) ====

@@ -17,7 +17,7 @@
 	portsnap.conf pf.conf pf.os phones profile protocols \
 	rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
 	rc.sendmail rc.shutdown \
-	rc.subr remote rpc services shells \
+	rc.subr remote rpc sensorsd.conf services shells \
 	snmpd.config sysctl.conf syslog.conf \
 	etc.${MACHINE_ARCH}/ttys \
 	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \

From owner-p4-projects@FreeBSD.ORG  Thu Oct  4 23:56:26 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3D1C416A468; Thu,  4 Oct 2007 23:56:26 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E143C16A41A
	for <perforce@FreeBSD.org>; Thu,  4 Oct 2007 23:56:25 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id D950F13C465
	for <perforce@FreeBSD.org>; Thu,  4 Oct 2007 23:56:25 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l94NuP0M007301
	for <perforce@FreeBSD.org>; Thu, 4 Oct 2007 23:56:25 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l94NuPTO007298
	for perforce@freebsd.org; Thu, 4 Oct 2007 23:56:25 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Thu, 4 Oct 2007 23:56:25 GMT
Message-Id: <200710042356.l94NuPTO007298@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127201 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 04 Oct 2007 23:56:26 -0000

http://perforce.freebsd.org/chv.cgi?CH=127201

Change 127201 by cnst@dale on 2007/10/04 23:56:20

	change some spaces to tabs

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/sys.dev.it/it.c#2 edit
.. //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78_isa.c#6 edit

Differences ...

==== //depot/projects/soc2007/cnst-sensors/sys.dev.it/it.c#2 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.dev.it/it.c#1 $	*/
+/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.dev.it/it.c#2 $	*/
 /*	$FreeBSD$	*/
 /*	$OpenBSD: it.c,v 1.22 2007/03/22 16:55:31 deraadt Exp $	*/
 
@@ -82,9 +82,9 @@
 
 static device_method_t it_methods[] = {
 	/* Methods from the device interface */
-	DEVMETHOD(device_probe,         it_probe),
-	DEVMETHOD(device_attach,        it_attach),
-	DEVMETHOD(device_detach,        it_detach),
+	DEVMETHOD(device_probe,		it_probe),
+	DEVMETHOD(device_attach,	it_attach),
+	DEVMETHOD(device_detach,	it_detach),
 
 	/* Terminate method list */
 	{ 0, 0 }

==== //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78_isa.c#6 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78_isa.c#5 $	*/
+/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.dev.lm/lm78_isa.c#6 $	*/
 /*	$FreeBSD$	*/
 /*	$OpenBSD: lm78_isa.c,v 1.2 2007/07/01 21:48:57 cnst Exp $	*/
 
@@ -70,9 +70,9 @@
 
 static device_method_t lm_isa_methods[] = {
 	/* Methods from the device interface */
-	DEVMETHOD(device_probe,         lm_isa_probe),
-	DEVMETHOD(device_attach,        lm_isa_attach),
-	DEVMETHOD(device_detach,        lm_isa_detach),
+	DEVMETHOD(device_probe,		lm_isa_probe),
+	DEVMETHOD(device_attach,	lm_isa_attach),
+	DEVMETHOD(device_detach,	lm_isa_detach),
 
 	/* Terminate method list */
 	{ 0, 0 }

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 00:01:38 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id F40B416A47B; Fri,  5 Oct 2007 00:01:37 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6CDE416A477
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 00:01:37 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0FD0C13C4B7
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 00:01:32 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9501V5k007646
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 00:01:31 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9501V7k007641
	for perforce@freebsd.org; Fri, 5 Oct 2007 00:01:31 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Fri, 5 Oct 2007 00:01:31 GMT
Message-Id: <200710050001.l9501V7k007641@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127202 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 00:01:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=127202

Change 127202 by cnst@dale on 2007/10/05 00:01:08

	remove extra space before a tab; noticed when comparing my patch
	against Hasso Tepper's DragonFly revision of this patch

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/usr.bin.systat/cmdtab.c#3 edit

Differences ...

==== //depot/projects/soc2007/cnst-sensors/usr.bin.systat/cmdtab.c#3 (text+ko) ====

@@ -83,7 +83,7 @@
 	  initifstat,	openifstat,	closeifstat,	cmdifstat,
 	  0,		CF_LOADAV },
 	{ "sensors",	showsensors,	fetchsensors,	labelsensors,
-	  initsensors, 	opensensors,	closesensors,	0,
+	  initsensors,	opensensors,	closesensors,	0,
 	  0,		CF_LOADAV },
         { NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0 }
 };

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 00:04:38 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D765B16A46B; Fri,  5 Oct 2007 00:04:37 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7E2D016A420
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 00:04:37 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id CFDA713C461
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 00:04:35 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9504Zo0008998
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 00:04:35 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9504ZBI008995
	for perforce@freebsd.org; Fri, 5 Oct 2007 00:04:35 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Fri, 5 Oct 2007 00:04:35 GMT
Message-Id: <200710050004.l9504ZBI008995@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127203 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 00:04:38 -0000

http://perforce.freebsd.org/chv.cgi?CH=127203

Change 127203 by cnst@dale on 2007/10/05 00:04:20

	remove settings that were used for debugging sensorsd and lm on FreeBSD;
	reminded by hasso's commit

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/etc/sensorsd.conf#5 edit

Differences ...

==== //depot/projects/soc2007/cnst-sensors/etc/sensorsd.conf#5 (text+ko) ====

@@ -1,4 +1,4 @@
-# $P4: //depot/projects/soc2007/cnst-sensors/etc/sensorsd.conf#4 $
+# $P4: //depot/projects/soc2007/cnst-sensors/etc/sensorsd.conf#5 $
 # $FreeBSD$
 # $OpenBSD: sensorsd.conf,v 1.8 2007/08/14 19:02:02 cnst Exp $
 
@@ -6,11 +6,6 @@
 # Sample sensorsd.conf file. See sensorsd.conf(5) for details.
 #
 
-#the following three entries are for debugging sensorsd(8) with lm(4)
-temp:low=24C:high=64C
-fan:low=0:high=1024
-volt:low=0V:high=12.6V
-
 # +5 voltage (volts)
 #hw.sensors.lm0.volt3:low=4.8V:high=5.2V
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 00:06:39 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C3DE716A46C; Fri,  5 Oct 2007 00:06:39 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1506B16A41B
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 00:06:39 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 0B9F613C455
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 00:06:39 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l9506ccE009107
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 00:06:38 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l9506cJJ009104
	for perforce@freebsd.org; Fri, 5 Oct 2007 00:06:38 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Fri, 5 Oct 2007 00:06:38 GMT
Message-Id: <200710050006.l9506cJJ009104@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127204 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 00:06:40 -0000

http://perforce.freebsd.org/chv.cgi?CH=127204

Change 127204 by cnst@dale on 2007/10/05 00:06:34

	SENSORS_DEBUG was only ever used for debugging lm(4) on FreeBSD,
	but it's not used anymore, so let's get rid of it

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/sys.sys/sensors.h#5 edit

Differences ...

==== //depot/projects/soc2007/cnst-sensors/sys.sys/sensors.h#5 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.sys/sensors.h#4 $	*/
+/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.sys/sensors.h#5 $	*/
 /*	$FreeBSD$	*/
 /*	$OpenBSD: sensors.h,v 1.23 2007/03/22 16:55:31 deraadt Exp $	*/
 
@@ -31,8 +31,6 @@
 #ifndef _SYS_SENSORS_H_
 #define _SYS_SENSORS_H_
 
-#define SENSORS_DEBUG
-
 /* Sensor types */
 enum sensor_type {
 	SENSOR_TEMP,			/* temperature (muK) */

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 00:23:58 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8534516A420; Fri,  5 Oct 2007 00:23:58 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3C7AA16A419
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 00:23:58 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3096E13C45D
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 00:23:58 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l950Nw3b010006
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 00:23:58 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l950Nwq9010003
	for perforce@freebsd.org; Fri, 5 Oct 2007 00:23:58 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Fri, 5 Oct 2007 00:23:58 GMT
Message-Id: <200710050023.l950Nwq9010003@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127205 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 00:23:58 -0000

http://perforce.freebsd.org/chv.cgi?CH=127205

Change 127205 by cnst@dale on 2007/10/05 00:23:54

	use .In for includes in manual pages
	
	Obtained from:	Sascha Wildner via DragonFly BSD

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/lib.libc.gen/sysctl.3#6 edit
.. //depot/projects/soc2007/cnst-sensors/share.man.man4/lm.4#2 edit
.. //depot/projects/soc2007/cnst-sensors/share.man.man9/sensor_attach.9#6 edit

Differences ...

==== //depot/projects/soc2007/cnst-sensors/lib.libc.gen/sysctl.3#6 (text+ko) ====

@@ -334,7 +334,7 @@
 .Sy sensor_type
 enumeration
 are defined in
-.Aq Pa sys/sensors.h .
+.In sys/sensors.h .
 .El
 .Ss CTL_KERN
 The string and integer information available for the CTL_KERN level

==== //depot/projects/soc2007/cnst-sensors/share.man.man4/lm.4#2 (text+ko) ====

@@ -1,4 +1,4 @@
-.\"	$P4: //depot/projects/soc2007/cnst-sensors/share.man.man4/lm.4#1 $
+.\"	$P4: //depot/projects/soc2007/cnst-sensors/share.man.man4/lm.4#2 $
 .\"	$FreeBSD$
 .\"	$OpenBSD: lm.4,v 1.16 2007/05/26 22:38:55 cnst Exp $
 .\"	$NetBSD: lm.4,v 1.11 2001/09/22 01:22:49 wiz Exp $
@@ -124,7 +124,7 @@
 The driver was then ported to
 .Fx
 by
-.An Constantine A. Murenin Aq cnst@FreeBSD.org 
+.An Constantine A. Murenin Aq cnst@FreeBSD.org
 as a part of a Google Summer of Code 2007 project.
 .Sh CAVEATS
 Some vendors connect these chips to non-standard thermal diodes and

==== //depot/projects/soc2007/cnst-sensors/share.man.man9/sensor_attach.9#6 (text+ko) ====

@@ -1,4 +1,4 @@
-.\"	$P4: //depot/projects/soc2007/cnst-sensors/share.man.man9/sensor_attach.9#5 $
+.\"	$P4: //depot/projects/soc2007/cnst-sensors/share.man.man9/sensor_attach.9#6 $
 .\"	$FreeBSD$
 .\"	$OpenBSD: sensor_attach.9,v 1.4 2007/03/22 16:55:31 deraadt Exp $
 .\"
@@ -38,7 +38,7 @@
 .Nm sensor_task_unregister
 .Nd sensors framework
 .Sh SYNOPSIS
-.Fd #include <sys/sensors.h>
+.In sys/sensors.h
 .Ft void
 .Fn "sensordev_install" "struct ksensordev *sensdev"
 .Ft void

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 00:41:18 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 593E516A49C; Fri,  5 Oct 2007 00:41:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B376D16A498
	for <perforce@freebsd.org>; Fri,  5 Oct 2007 00:41:17 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A917613C50B
	for <perforce@freebsd.org>; Fri,  5 Oct 2007 00:41:17 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l950fHvM010924
	for <perforce@freebsd.org>; Fri, 5 Oct 2007 00:41:17 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l950fHCf010920
	for perforce@freebsd.org; Fri, 5 Oct 2007 00:41:17 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 5 Oct 2007 00:41:17 GMT
Message-Id: <200710050041.l950fHCf010920@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127206 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 00:41:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=127206

Change 127206 by sam@sam_ebb on 2007/10/05 00:40:31

	fix fw image names

Affected files ...

.. //depot/projects/wifi/sys/modules/bwifw/Makefile#2 edit

Differences ...

==== //depot/projects/wifi/sys/modules/bwifw/Makefile#2 (text+ko) ====

@@ -3,19 +3,19 @@
 .PATH: ${.CURDIR}/../../contrib/dev/bwi
 
 FWFILE= wl_apsta-3.130.20.0.o
-FWIMGS=	ucode11.fw ucode2.fw ucode4.fw ucode5.fw \
-	a0g0bsinitvals2.fw a0g0bsinitvals5.fw a0g0initvals2.fw \
-	a0g0initvals5.fw a0g1bsinitvals5.fw a0g1initvals5.fw \
-	b0g0bsinitvals2.fw b0g0bsinitvals5.fw b0g0initvals2.fw \
-	    b0g0initvals5.fw \
-	pcm4.fw pcm5.fw
+_FWIMGS=ucode11 ucode2 ucode4 ucode5 \
+	a0g0bsinitvals2 a0g0bsinitvals5 a0g0initvals2 \
+	a0g0initvals5 a0g1bsinitvals5 a0g1initvals5 \
+	b0g0bsinitvals2 b0g0bsinitvals5 b0g0initvals2 b0g0initvals5 \
+	pcm4 pcm5
+FWIMGS=	${_FWIMGS:C/.*/&.fw/}
 CLEANFILES+=${FWFILE} ${FWIMGS} v3
 
 SUBDIR=	fwcutter
 FWCUTTER= fwcutter/b43-fwcutter
 
 KMOD=	bwi_v3
-FIRMWS=	${FWIMGS:C/.*/&:${KMOD}_&/}
+FIRMWS=	${_FWIMGS:C/.*/&.fw:${KMOD}_&/}
 
 bwi_v3:	${FWIMGS}
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 01:37:20 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1E08F16A419; Fri,  5 Oct 2007 01:37:20 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C7BF716A417
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 01:37:19 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id BB9E713C478
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 01:37:19 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l951bJBE023674
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 01:37:19 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l951bJe0023671
	for perforce@freebsd.org; Fri, 5 Oct 2007 01:37:19 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Fri, 5 Oct 2007 01:37:19 GMT
Message-Id: <200710050137.l951bJe0023671@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127208 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 01:37:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=127208

Change 127208 by cnst@dale on 2007/10/05 01:37:12

	note first appearance in FreeBSD and add my email address

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/share.man.man9/sensor_attach.9#7 edit

Differences ...

==== //depot/projects/soc2007/cnst-sensors/share.man.man9/sensor_attach.9#7 (text+ko) ====

@@ -1,4 +1,4 @@
-.\"	$P4: //depot/projects/soc2007/cnst-sensors/share.man.man9/sensor_attach.9#6 $
+.\"	$P4: //depot/projects/soc2007/cnst-sensors/share.man.man9/sensor_attach.9#7 $
 .\"	$FreeBSD$
 .\"	$OpenBSD: sensor_attach.9,v 1.4 2007/03/22 16:55:31 deraadt Exp $
 .\"
@@ -150,5 +150,7 @@
 The framework was ported to
 .Fx
 by
-.An Constantine A. Murenin
-as a Google Summer of Code 2007 project.
+.An Constantine A. Murenin Aq cnst@FreeBSD.org
+as a Google Summer of Code 2007 project,
+and first appeared in
+.Fx 7.XXX.

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 01:42:28 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 5B09816A420; Fri,  5 Oct 2007 01:42:28 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 12CF416A418
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 01:42:27 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 06E5C13C480
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 01:42:27 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l951gQGR024027
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 01:42:26 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l951gPsr024024
	for perforce@freebsd.org; Fri, 5 Oct 2007 01:42:25 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Fri, 5 Oct 2007 01:42:25 GMT
Message-Id: <200710050142.l951gPsr024024@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127209 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 01:42:28 -0000

http://perforce.freebsd.org/chv.cgi?CH=127209

Change 127209 by cnst@dale on 2007/10/05 01:42:18

	update my copyright

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#14 edit

Differences ...

==== //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#14 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#13 $	*/
+/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#14 $	*/
 /*	$FreeBSD$	*/
 /*	$OpenBSD: kern_sensors.c,v 1.19 2007/06/04 18:42:05 deraadt Exp $	*/
 /*	$OpenBSD: kern_sysctl.c,v 1.154 2007/06/01 17:29:10 beck Exp $	*/
@@ -6,6 +6,7 @@
 /*-
  * Copyright (c) 2005 David Gwynne <dlg@openbsd.org>
  * Copyright (c) 2006 Constantine A. Murenin <cnst+openbsd@bugmail.mojo.ru>
+ * Copyright (c) 2007 Constantine A. Murenin <cnst+GSoC2007@FreeBSD.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 01:53:40 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3536F16A41B; Fri,  5 Oct 2007 01:53:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9F19516A418
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 01:53:39 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 91C4E13C49D
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 01:53:39 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l951rdM5024796
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 01:53:39 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l951rd4G024793
	for perforce@freebsd.org; Fri, 5 Oct 2007 01:53:39 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Fri, 5 Oct 2007 01:53:39 GMT
Message-Id: <200710050153.l951rd4G024793@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127210 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 01:53:40 -0000

http://perforce.freebsd.org/chv.cgi?CH=127210

Change 127210 by cnst@dale on 2007/10/05 01:53:31

	remove extra newline

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#15 edit

Differences ...

==== //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#15 (text+ko) ====

@@ -1,4 +1,4 @@
-/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#14 $	*/
+/*	$P4: //depot/projects/soc2007/cnst-sensors/sys.kern/kern_sensors.c#15 $	*/
 /*	$FreeBSD$	*/
 /*	$OpenBSD: kern_sensors.c,v 1.19 2007/06/04 18:42:05 deraadt Exp $	*/
 /*	$OpenBSD: kern_sysctl.c,v 1.154 2007/06/01 17:29:10 beck Exp $	*/
@@ -366,7 +366,6 @@
 
 	free(usd, M_TEMP);
 	return (error);
-
 }
 
 int

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 01:56:49 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D07A616A420; Fri,  5 Oct 2007 01:56:48 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6F4E116A418
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 01:56:48 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 495E413C48E
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 01:56:48 +0000 (UTC)
	(envelope-from cnst@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l951ums1024925
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 01:56:48 GMT
	(envelope-from cnst@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l951umqZ024922
	for perforce@freebsd.org; Fri, 5 Oct 2007 01:56:48 GMT
	(envelope-from cnst@FreeBSD.org)
Date: Fri, 5 Oct 2007 01:56:48 GMT
Message-Id: <200710050156.l951umqZ024922@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cnst@FreeBSD.org using -f
From: "Constantine A. Murenin" <cnst@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127211 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 01:56:49 -0000

http://perforce.freebsd.org/chv.cgi?CH=127211

Change 127211 by cnst@dale on 2007/10/05 01:56:37

	sync the cvsdiff script, adding etc/Makefile

Affected files ...

.. //depot/projects/soc2007/cnst-sensors/sensors.cvsdiff.sh#5 edit

Differences ...

==== //depot/projects/soc2007/cnst-sensors/sensors.cvsdiff.sh#5 (text+ko) ====

@@ -8,6 +8,7 @@
  usr.sbin/sensorsd\
 "
 FILES="\
+ etc/Makefile\
  etc/sensorsd.conf\
  etc/defaults/rc.conf\
  etc/rc.d/Makefile\

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 02:10:04 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3EE0F16A41A; Fri,  5 Oct 2007 02:10:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D8E5016A417
	for <perforce@freebsd.org>; Fri,  5 Oct 2007 02:10:03 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id C81DD13C47E
	for <perforce@freebsd.org>; Fri,  5 Oct 2007 02:10:03 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l952A34j026766
	for <perforce@freebsd.org>; Fri, 5 Oct 2007 02:10:03 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l952A2Oq026736
	for perforce@freebsd.org; Fri, 5 Oct 2007 02:10:02 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 5 Oct 2007 02:10:02 GMT
Message-Id: <200710050210.l952A2Oq026736@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127212 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 02:10:04 -0000

http://perforce.freebsd.org/chv.cgi?CH=127212

Change 127212 by jb@jb_freebsd1 on 2007/10/05 02:09:26

	IFC

Affected files ...

.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#17 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#17 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/share/sgml/authors.ent#9 integrate
.. //depot/projects/dtrace/ports/LEGAL#21 integrate
.. //depot/projects/dtrace/ports/MOVED#42 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.port.mk#12 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#17 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.xorg.mk#2 integrate
.. //depot/projects/dtrace/ports/UPDATING#34 integrate
.. //depot/projects/dtrace/src/bin/sh/eval.c#5 integrate
.. //depot/projects/dtrace/src/bin/sh/sh.1#8 integrate
.. //depot/projects/dtrace/src/contrib/gcc/opts.c#5 integrate
.. //depot/projects/dtrace/src/contrib/groff/tmac/doc-common#5 integrate
.. //depot/projects/dtrace/src/contrib/groff/tmac/doc-syms#5 integrate
.. //depot/projects/dtrace/src/contrib/groff/tmac/groff_mdoc.man#5 integrate
.. //depot/projects/dtrace/src/contrib/wpa_supplicant/main.c#4 integrate
.. //depot/projects/dtrace/src/crypto/openssl/ssl/ssl_lib.c#7 integrate
.. //depot/projects/dtrace/src/etc/mtree/BSD.include.dist#9 integrate
.. //depot/projects/dtrace/src/etc/mtree/BSD.local.dist#7 integrate
.. //depot/projects/dtrace/src/etc/mtree/BSD.x11-4.dist#4 integrate
.. //depot/projects/dtrace/src/etc/mtree/README#4 integrate
.. //depot/projects/dtrace/src/etc/rc.d/cached#4 delete
.. //depot/projects/dtrace/src/gnu/usr.bin/groff/tmac/mdoc.local#9 integrate
.. //depot/projects/dtrace/src/lib/libkse/Makefile#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/amd64/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/amd64/amd64/context.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/amd64/amd64/enter_uts.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/amd64/amd64/pthread_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/amd64/include/atomic_ops.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/amd64/include/pthread_md.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/arm/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/arm/arm/context.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/arm/arm/pthread_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/arm/include/atomic_ops.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/arm/include/pthread_md.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/i386/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/i386/i386/pthread_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/i386/i386/thr_enter_uts.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/i386/i386/thr_getcontext.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/i386/include/atomic_ops.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/i386/include/pthread_md.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/ia64/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/ia64/ia64/context.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/ia64/ia64/enter_uts.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/ia64/ia64/pthread_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/ia64/include/atomic_ops.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/ia64/include/pthread_md.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/include/atomic_ops.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/include/pthread_md.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/assym.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/assym.s#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/context.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/enter_uts.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/powerpc/powerpc/pthread_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/include/atomic_ops.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/include/pthread_md.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/sparc64/assym.s#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/sparc64/pthread_md.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/arch/sparc64/sparc64/thr_getcontext.S#1 branch
.. //depot/projects/dtrace/src/lib/libkse/pthread.map#1 branch
.. //depot/projects/dtrace/src/lib/libkse/support/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/support/thr_support.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/sys/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/sys/lock.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/sys/lock.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/sys/thr_error.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/Makefile#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/README#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/guard_b.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/guard_b.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/guard_s.pl#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/hello_b.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/hello_d.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/hello_d.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/hello_s.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/join_leak_d.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/join_leak_d.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/mutex_d.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/mutex_d.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/propagate_s.pl#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/sem_d.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/sem_d.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/sigsuspend_d.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/sigsuspend_d.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/sigwait_d.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/sigwait_d.exp#1 branch
.. //depot/projects/dtrace/src/lib/libkse/test/verify#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_accept.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_aio_suspend.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_atfork.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_destroy.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_get_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getdetachstate.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getguardsize.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getinheritsched.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getschedparam.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getschedpolicy.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getscope.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getstack.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getstackaddr.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_getstacksize.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_init.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setcreatesuspend_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setdetachstate.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setguardsize.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setinheritsched.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setschedparam.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setschedpolicy.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setscope.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setstack.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setstackaddr.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_attr_setstacksize.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_autoinit.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_barrier.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_barrierattr.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_cancel.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_clean.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_close.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_concurrency.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_cond.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_condattr_destroy.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_condattr_init.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_condattr_pshared.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_connect.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_creat.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_create.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_detach.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_equal.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_execve.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_exit.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_fcntl.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_find_thread.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_fork.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_fsync.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_getprio.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_getschedparam.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_info.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_init.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_join.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_kern.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_kill.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_main_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mattr_init.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mattr_kind_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mattr_pshared.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_msync.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_multi_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex_prioceiling.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutex_protocol.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_mutexattr_destroy.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_nanosleep.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_once.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_open.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_pause.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_poll.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_printf.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_priority_queue.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_private.h#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_pselect.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_pspinlock.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_raise.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_read.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_readv.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_resume_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_rtld.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_rwlock.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_rwlockattr.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_select.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_self.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sem.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_seterrno.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_setprio.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_setschedparam.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sig.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigaction.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigaltstack.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigmask.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigpending.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigprocmask.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigsuspend.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sigwait.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_single_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_sleep.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_spec.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_spinlock.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_stack.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_suspend_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_switch_np.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_symbols.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_system.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_tcdrain.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_vfork.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_wait.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_wait4.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_waitpid.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_write.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_writev.c#1 branch
.. //depot/projects/dtrace/src/lib/libkse/thread/thr_yield.c#1 branch
.. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.c#8 integrate
.. //depot/projects/dtrace/src/sys/boot/common/module.c#4 integrate
.. //depot/projects/dtrace/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-all.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#14 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#11 integrate
.. //depot/projects/dtrace/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_sx.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet/sctputil.c#10 integrate
.. //depot/projects/dtrace/src/tools/regression/bin/sh/builtins/case1.0#1 branch
.. //depot/projects/dtrace/src/usr.sbin/cached/Makefile#6 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agent.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agent.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/Makefile.inc#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/group.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/group.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/passwd.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/passwd.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/services.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/agents/services.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cached.8#5 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cached.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cached.conf.5#5 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cachedcli.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cachedcli.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cachelib.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cachelib.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cacheplcs.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/cacheplcs.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/config.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/config.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/debug.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/debug.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/hashtable.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/log.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/log.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/mp_rs_query.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/mp_rs_query.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/mp_ws_query.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/mp_ws_query.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/parser.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/parser.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/protocol.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/protocol.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/query.c#4 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/query.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/singletons.c#3 delete
.. //depot/projects/dtrace/src/usr.sbin/cached/singletons.h#3 delete
.. //depot/projects/dtrace/src/usr.sbin/pciconf/pciconf.8#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/pciconf/pciconf.c#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#4 integrate
.. //depot/projects/dtrace/www/en/platforms/amd64/motherboards.sgml#17 integrate
.. //depot/projects/dtrace/www/en/projects/newbies.sgml#6 integrate
.. //depot/projects/dtrace/www/en/where.sgml#10 integrate
.. //depot/projects/dtrace/www/share/sgml/advisories.xml#13 integrate
.. //depot/projects/dtrace/www/share/sgml/events.xml#11 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#21 integrate
.. //depot/projects/dtrace/www/zh_CN/share/sgml/header.l10n.ent#5 integrate
.. //depot/projects/dtrace/www/zh_CN/share/sgml/libcommon.xsl#6 integrate
.. //depot/projects/dtrace/www/zh_CN/share/sgml/navibar.l10n.ent#4 integrate
.. //depot/projects/dtrace/www/zh_CN/share/sgml/news.xml#7 integrate
.. //depot/projects/dtrace/www/zh_CN/share/sgml/press.xml#6 integrate

Differences ...

==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml#17 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.314 2007/09/03 16:39:51 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.315 2007/10/03 20:35:35 danger Exp $
 -->
 
 <chapter id="security">
@@ -4220,12 +4220,13 @@
         <filename>~/.ssh/id_dsa</filename> or
         <filename>~/.ssh/id_rsa</filename>, whereas the public key is
         stored in <filename>~/.ssh/id_dsa.pub</filename> or
-        <filename>~/.ssh/id_rsa.pub</filename>, respectively for DSA and
-        RSA key types.  The public key must be placed in
-        <filename>~/.ssh/authorized_keys</filename> of the remote
-        machine in order for the setup to work.  Similarly, RSA version
-        1 public keys should be placed in
-        <filename>~/.ssh/authorized_keys</filename>.</para>
+	<filename>~/.ssh/id_rsa.pub</filename>, respectively for
+	<acronym>DSA</acronym> and <acronym>RSA</acronym> key types.
+	The public key must be placed in the
+	<filename>~/.ssh/authorized_keys</filename> file of the	remote
+	machine for both <acronym>RSA</acronym> or
+	<acronym>DSA</acronym> keys in order for the setup to
+	work.</para>
 
       <para>This will allow connection to the remote machine based upon
         SSH keys instead of passwords.</para>

==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#17 (text+ko) ====

@@ -2,8 +2,8 @@
      The FreeBSD Documentation Project
      The FreeBSD Simplified Chinese Project
 
-     Original Revision: 1.825
-     $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.26 2007/04/23 06:34:27 delphij Exp $
+     Original Revision: 1.872
+     $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.27 2007/10/02 02:56:37 loader Exp $
 -->
 
 <!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -335,6 +335,12 @@
 	  ľÚČý˛˝ŇÔşóŁŹ źě˛éĘǡńËůÓĐĐ½¨ľÄĿŸśźąťŐýȡɞłýÁËĄŁ
 	  ÔÚľÚËIJ˝ŇÔşóŁŹ ĘÔ×ĹÔËĐĐŇťĎÂËů×°ľÄČíźţŁŹ
 	  ȡąŁľąËüŇÔ package ˇ˝Ę˝°˛×°ľÄĘąşňҲÄÜŐýłŁš¤×÷ĄŁ</para>
+
+	<para>×ÔśŻťŻŐâĐŠ˛˝Öč×îźňľĽľÄˇ˝ˇ¨ĘÇͨšý <application>ports tinderbox</application>
+	  Ŕ´˝řĐвâĘÔĄŁ ËüżÉŇÔÎŹť¤ <literal>jails</literal> ˛˘ÔÚĆäÖĐÍęłÉČŤ˛ż˛âĘÔš¤×÷ŁŹ
+	  śř˛ťťáĆĆťľŐýÔÚÔËĐĐľÄϾͳľÄ×´ĚŹĄŁ Çë˛Îźű
+	  <filename>ports/ports-mgmt/tinderbox</filename>
+	  ŇÔÁË˝â¸üśŕľÄĐĹϢĄŁ</para>
       </sect1>
 
       <sect1 id="porting-portlint">
@@ -1013,6 +1019,25 @@
 	  <makevar>PORTNAME</makevar> ÖĐĄŁ</para>
       </sect2>
 
+      <sect2>
+	<title><makevar>LATEST_LINK</makevar></title>
+
+	<para>ÓĐĘąŁŹ ÔÚ ports ĚןţÖĐżÉÄÜťá´ćÔÚÍŹŇťłĚĐňľÄśŕ¸ö°ćąžĄŁ
+	  Ë÷ŇýşÍÔ¤ąŕŇë°üľÄÁŞąŕϾͳśźĐčŇŞÄÜšť˝ŤËüĂÇĘÓÎŞ˛ťÍŹľÄČíźţ°üŁŹ žĄšÜĆä
+	  <makevar>PORTNAME</makevar>Ą˘ <makevar>PKGNAMEPREFIX</makevar>ŁŹ ŇÔź°
+	  even <makevar>PKGNAMESUFFIX</makevar> żÉÄÜĘÇҝģҝŃůľÄĄŁ Óöľ˝ŐâÖÖÇéżöĘąŁŹ
+	  žÍĐčŇŞ˝ŤłýÁË <quote>Ö÷</quote> port ÖŽÍâľÄĆäËű port
+	  ÖĐľÄ <makevar>LATEST_LINK</makevar> ąäÁżÉčÎŞ˛ťÍŹľÄÖľ
+	  &mdash; Çë˛Îźű <filename>editors/vim5</filename> şÍ
+	  <filename>editors/vim</filename> portŁŹ ŇÔź°
+	  <filename>www/apache*</filename> ĎľÁĐŁŹ ŇÔÁË˝âËüľÄÓᨥŁ
+	  ĐčҪעŇâľÄĘÇŁŹ ČçşÎȡś¨ <quote>Ö÷</quote> °ćąž &mdash;
+	  <quote>×îÁ÷ĐĐ</quote>Ą˘ <quote>ĘÜÖ§łÖ×îşĂ</quote>ŁŹ
+	  <quote>ąäśŻ×îÉŮ</quote>ŁŹ ľČľČ &mdash; ŇŃž­łŹšýÁËąžĘéÄÜšť¸řłöľÄ˝¨Ň顜ΧŁť
+	  ŐâŔďÖťĘÇĎňÄú˝éÉÜÔÚŃĄś¨ÁËŇť¸ö
+	  <quote>Ö÷</quote> port ÖŽşóČçşÎÖ¸ś¨ĆäËű port ľÄ°ćąžĄŁ</para>
+      </sect2>
+
     <sect2 id="porting-pkgname">
       <title>°üĂüĂűšćÔň</title>
 
@@ -1051,16 +1076,28 @@
 
 	<listitem>
 	  <para><filename>name</filename> ˛żˇÖľÄĘ××Öĸӌ¸Ă
-	    ĐĄĐ´ĄŁ (ÓŕĎ¾IJżˇÖÄÜ°üşŹ´óĐ´×ÖĸŁŹ ËůŇÔľąÄú
+	    ĐĄĐ´ĄŁ (ÓŕĎ¾IJżˇÖżÉŇÔ°üşŹ´óĐ´×ÖĸŁŹ ËůŇÔľąÄú
 	    ҪתťťŇť¸ö°üşŹ´óĐ´×ÖĸČíźţľÄĂű×ÖĘąŁŹ ÄúĐčŇŞ
-	    ×Ôźş×öłöĹМϥŁ) śÔÓÚ<literal>perl 5</literal>
+	    ×Ôźş×öłöĹМϥŁ) śÔÓÚ <literal>Perl 5</literal>
 	    ÄŁżéľÄĂüĂűŁŹ Óиö´ŤÍłľÄšćÔňĘÇŁŹ ÔÚÇ°Ăć
 	    źÓÉĎ <literal>p5-</literal>
 	    ˛˘°ŃÁ˝¸öĂ°şĹľÄ˛żˇÖ¸ÄÎŞÁŹ×ֺţŹ Č磺
-	    <literal>Data::Dumper</literal> ÄŁżéąäłÉ
-	    <literal>p5-Data-Dumper</literal>ĄŁ
-	    ČçšűČíźţľÄĂű×ÖŔďťšÓĐĘý×ÖĄ˘ ÁŹ×ֺť˘ ĎÂťŽĎߣŹ
-	    ÄúҲżÉŇÔ°ŃŐâĐŠ°üŔ¨˝řŔ´ (ŔýČç <literal>kinput2</literal>)ĄŁ</para>
+	    <literal>Data::Dumper</literal> ÄŁżéśÔÓŚľÄĂű×ÖŁŹ žÍÓŚ¸ĂĘÇ
+	    <literal>p5-Data-Dumper</literal>ĄŁ</para>
+	</listitem>
+	
+	<listitem>
+	  <para>ȡČĎ port ľÄĂű×ֺͰ湞֎źäÓĐÇĺÎúľÄˇÖ¸ôŁŹ ˛˘ˇĹČë <makevar>PORTNAME</makevar> şÍ
+	    <makevar>PORTVERSION</makevar> ąäÁżĄŁ ÔÚ
+	    <makevar>PORTNAME</makevar> ÖĐ°üşŹ°ćąž˛żˇÖľÄΨҝŔíÓÉĘÇÉĎÓÎČíźţ°üŐćľÄ˛ÉÓĂŐâŃůľÄĂüĂűˇ˝Ę˝ŁŹ
+	    ŔŕËĆ <filename>textproc/libxml2</filename> ťň
+	    <filename>japanese/kinput2-freewnn</filename> port ŐâŃůĄŁ ˇńÔňŁŹ
+	    ÔÚ <makevar>PORTNAME</makevar> ÖОͲťÓŚ°üşŹČκΰ湞ĐĹϢĄŁ
+	    Đíśŕ port ˛ÉÓĂÍŹŃůľÄ <makevar>PORTNAME</makevar> Ăű×ÖĘÇşÜŐýłŁľÄŁŹ
+	    <filename>www/apache*</filename> port ąăĘÇČç´ËŁť ÔÚŐâÖÖÇéżöĎÂŁŹ
+	    ˛ťÍŹľÄ°ćąž (ŇÔź°˛ťÍŹľÄË÷ŇýĎî) ĘÇÓÉ <makevar>PKGNAMEPREFIX</makevar>Ą˘
+	    <makevar>PKGNAMESUFFIX</makevar>ŁŹ ŇÔź°
+	    <makevar>LATEST_LINK</makevar> ľÄÖľľÄ˛ťÍŹśřÓĐËůÇřąđľÄĄŁ</para>
 	</listitem>
 
 	<listitem>
@@ -1539,6 +1576,12 @@
 	      </row>
 
 	      <row>
+		<entry><filename>kld*</filename></entry>
+		<entry>żÉźÓÔŘÄÚşËÄŁżéĄŁ</entry>
+		<entry></entry>
+	      </row>
+
+	      <row>
 		<entry><filename>korean</filename></entry>
 		<entry>şŤÓďÓďŃÔÖ§łÖĄŁ</entry>
 		<entry></entry>
@@ -1861,6 +1904,12 @@
 	      </row>
 
 	      <row>
+		<entry><filename>x11-drivers</filename></entry>
+		<entry>X11 ÇýśŻłĚĐňĄŁ</entry>
+		<entry></entry>
+	      </row>
+
+	      <row>
 		<entry><filename>x11-fm</filename></entry>
 		<entry>X11 ĎÂľÄÎÄźţšÜŔíĆ÷ĄŁ</entry>
 		<entry></entry>
@@ -1965,6 +2014,12 @@
 	    </para>
 	  </listitem>
 
+          <listitem>
+	    <para>ĐčŇŞ°˛×°żÉźÓÔŘÄÚşËÄŁżéľÄ port ÓŚÔÚĆä <makevar>CATEGORIES</makevar>
+	      ÖĐšéČëĐéÄâˇÖŔŕ <filename>kld</filename>ĄŁ
+	    </para>
+	  </listitem>
+
 	  <listitem>
 	    <para><filename>misc</filename>
 	      ˇÖŔŕľÄ port ˛ťÄÜÓĐĆäËüˇÇĐéÄâľÄˇÖŔॣ
@@ -3495,10 +3550,21 @@
     <sect1 id="makefile-info">
       <title>Info ÎÄźţ</title>
 
-      <para>ČçšűČíźţ°üĐčŇŞ°˛×° GNU ÎÄźţŁŹ
-	ÔňĐčŇŞÔÚ <makevar>INFO</makevar> ąäÁżÖĐÁĐłö (˛ťĐčŇŞÖ¸ś¨
-	<literal>.info</literal> şó׺)ŁŹ ŐâŃů°˛×°/ĐśÔŘ´úÂëžÍťá×ÔśŻľŘÔÚע˛á°üĘą˝ŤËüĂÇźÓČëľ˝
-	<filename>pkg-plist</filename> ÁËĄŁ</para>
+      <para>ČçšűČíźţ°üĐčŇŞ°˛×° GNU info ÎÄźţŁŹ
+	ÔňĐčŇŞÔÚ <makevar>INFO</makevar> ąäÁżÖĐҝҝÁĐłö (˛ťĐčŇŞÖ¸ś¨
+	<literal>.info</literal> şó׺)ĄŁ ϾͳźŮś¨ŐâĐŠÎÄźţžůťá°˛×°ľ˝
+	<filename><makevar>PREFIX</makevar>/<makevar>INFO_PATH</makevar></filename> ĿŸÖĐĄŁ
+	ČçšűČíźţ°üÓĐĐčŇŞŁŹ ҲżÉŇÔͨšýĐŢ¸Ä <makevar>INFO_PATH</makevar> Ŕ´Ö¸ś¨˛ťÍŹľÄÎťÖĂĄŁ
+	˛ťšýŁŹ ˛˘˛ťÍĆźöŐâŃů×öĄŁ ËůÓĐÁĐłöľÄĎîÄżžůĘÇĎŕśÔÓÚ
+	<filename><makevar>PREFIX</makevar>/<makevar>INFO_PATH</makevar></filename> ľÄÎÄźţ¡žśĄŁ
+	ŔýČ磏 <filename role="package">lang/gcc33</filename> ąíĘž˝Ť
+	info ÎÄźţ°˛×°ľ˝
+	<filename><makevar>PREFIX</makevar>/<makevar>INFO_PATH</makevar>/gcc33</filename>ŁŹ
+	Ňň´Ë <makevar>INFO</makevar> ÓŚĐ´łÉŔŕËĆŐâŃůŁş
+	<programlisting>INFO= gcc33/cpp gcc33/cppinternals gcc33/g77 ...
+</programlisting>
+	 ŐâŃů°˛×°/ĐśÔŘ´úÂëžÍťá×ÔśŻľŘÔÚע˛á°üÖŽÇ°˝ŤËüĂÇźÓČëľ˝ÁŮĘąľÄ
+	<filename>pkg-plist</filename> ÖĐÁËĄŁ</para>
     </sect1>
 
       <sect1 id="makefile-options">
@@ -3512,7 +3578,7 @@
 	Ö§łÖŐâĐŠĚŘĐÔżÉŇÔČĂÓĂť§ĚĺŃé¸üşĂŁŹ ˛˘´ďľ˝Ę°뚌ąśľÄЧšűĄŁ</para>
 
       <sect2>
-          <title>żŞšŘ (<makevar>KNOBS</makevar>)</title>
+          <title>żŞšŘ (Knobs)</title>
 
 	<sect3>
 	  <title><makevar>WITH_<replaceable>*</replaceable></makevar> şÍ
@@ -3680,6 +3746,7 @@
 	      śř <makevar>WITH_*</makevar> şÍ <makevar>WITHOUT_*</makevar>
 	      ÖťÓĐÔÚŇýÓĂÁË
 	      <filename>bsd.port.pre.mk</filename> ÖŽşó˛ĹÄÜżŞĘźźě˛âĄŁ</para>
+	</sect3>
 
 	<sect3>
 	  <title>Ŕý×Ó</title>
@@ -3702,6 +3769,7 @@
 
 .include &lt;bsd.port.post.mk&gt;</programlisting></para>
 	  </example>
+	</sect3>
 
       </sect2>
 
@@ -3939,20 +4007,37 @@
 	  </listitem>
 
 	  <listitem>
+	    <para><makevar>DATADIR_REL</makevar> ťáŐšżŞłÉ
+	      <filename>share/<makevar>PORTNAME</makevar></filename>ĄŁ</para>
+	  </listitem>
+
+	  <listitem>
 	    <para><makevar>DOCSDIR</makevar> ťáŐšżŞłÉ
 	      <filename><makevar>PREFIX</makevar>/share/doc/<makevar>PORTNAME</makevar></filename>ĄŁ</para>
 	  </listitem>
 
 	  <listitem>
+	    <para><makevar>DOCSDIR_REL</makevar> ťáŐšżŞłÉ
+	      <filename>share/doc/<makevar>PORTNAME</makevar></filename>ĄŁ</para>
+	  </listitem>
+
+	  <listitem>
 	    <para><makevar>EXAMPLESDIR</makevar> ťáŐšżŞłÉ
 	      <filename><makevar>PREFIX</makevar>/share/examples/<makevar>PORTNAME</makevar></filename>ĄŁ</para>
 	  </listitem>
+
+	  <listitem>
+	    <para><makevar>EXAMPLESDIR_REL</makevar> ťáŐšżŞłÉ
+	      <filename>share/examples/<makevar>PORTNAME</makevar></filename>ĄŁ</para>
+	  </listitem>
 	</itemizedlist>
 
 	<note>
-	  <para><makevar>NOPORTDOCS</makevar> ÖťżŘÖĆ˝ŤŇŞ×°ľ˝ <makevar>DOCSDIR</makevar>
-	    ľÄÄÇĐŠÎÄľľŁŹ śř˛ťÓŚÓ°ĎěąęןľÄÁŞťúĘֲᥢ info Ęֲᣏ ŇÔź°ÓŚ×°ľ˝
-	    <makevar>DATADIR</makevar>Ą˘ <makevar>EXAMPLESDIR</makevar> ľÄÎÄźţĄŁ</para>
+	  <para><makevar>NOPORTDOCS</makevar> ÖťżŘÖĆ˝ŤŇŞ°˛×°ľ˝ <makevar>DOCSDIR</makevar>
+	    ľÄÄÇĐŠÎÄľľŁŹ śř˛ťÓŚÓ°ĎěąęןľÄÁŞťúĘÖ˛áŇÔź° info ĘÖ˛áľÄ°˛×°ĄŁ °˛×°ľ˝
+	    <makevar>DATADIR</makevar> şÍ <makevar>EXAMPLESDIR</makevar>
+	    ľÄÎÄźţÔňĎŕÓŚľŘĘÜ <makevar>NOPORTDATA</makevar> şÍ
+	    <makevar>NOPORTEXAMPLES</makevar> żŘÖĆĄŁ</para>
 	</note>
 
 	<para>ŐâĐŠąäÁżŇ˛ťáąťľźłöľ˝ <makevar>PLIST_SUB</makevar> ÖĐĄŁ
@@ -3963,7 +4048,7 @@
 	  (¸üśŕľÄ <filename>pkg-plist</filename> ´úťťżÉŇÔÔÚ
 	  <link linkend="plist-sub">ŐâŔď</link> ŐŇľ˝ĄŁ)</para>
 
-	<para>ËůÓоİ˛×°ľÄÎÄľľÎÄźţşÍĿŸŁŹ
+	<para>ËůÓСÇÎŢĚőźţ°˛×°ľÄÎÄľľÎÄźţşÍĿŸŁŹ
 	  śźÓŚÔÚ <filename>pkg-plist</filename> łöĎÖŁŹ ˛˘ÇŇĘšÓĂ
 	  <literal>%%PORTDOCS%%</literal> ǰ׺ŁŹ ŔýČ磺</para>
 
@@ -3988,6 +4073,11 @@
         <programlisting>PORTDOCS=       README.* ChangeLog docs/*</programlisting>
 
 	<note>
+	  <para>Óë <makevar>PORTDOCS</makevar> ŔŕËĆŁŹ
+	  śÔÓŚÓÚ <makevar>DATADIR</makevar> şÍ
+	  <makevar>EXAMPLESDIR</makevar> ľÄąäÁżˇÖąđĘÇ <makevar>PORTDATA</makevar>
+	  şÍ <makevar>PORTEXAMPLES</makevar>ĄŁ</para>
+ 
 	  <para>ÄúҲżÉŇÔĘšÓĂ <filename>pkg-message</filename> Őâ¸öÎÄźţŁŹ
 	    Ŕ´ÔÚ°˛×°ĘąĎÔʞҝЊĐĹϢĄŁ ˛Îźű <link
 	    linkend="porting-message">šŘÓÚĘšÓĂ
@@ -4253,6 +4343,8 @@
 	  <literal>GNU_CONFIGURE=yes</literal>ĄŁ
 	  ČçšűĎŁÍű´ŤśîÍâľÄ˛ÎĘý¸ř <command>configure</command> ˝Ĺąž
 	  (ÄŹČϲÎĘýÎŞ <literal>--prefix=&dollar;{PREFIX}
+	  --infodir=&dollar;{PREFIX}/&dollar;{INFO_PATH}
+	  --mandir=&dollar;{MANPREFIX}/man
 	  &dollar;{CONFIGURE_TARGET}</literal>)ŁŹ
 	  ӌͨšý <makevar>CONFIGURE_ARGS</makevar> Ŕ´Ö¸ś¨ŐâĐŠ˛ÎĘýĄŁ
 	  ŔŕËƾأŹ żÉŇÔͨšý
@@ -4410,12 +4502,10 @@
 	  <para>żÉŇÔÍŹĘąÖ¸ś¨śŕ¸ö˛ťÍŹľÄš¤žßŁŹ żÉŇÔÔÚŇťĐĐÖĐÖ¸ś¨ŁŹ ҲżÉŇÔÓĂ
 	    Makefile ľÄ <literal>+=</literal> ˝áššĄŁ</para>
 
-	  <para>ÔÚżŞĘź˝éÉÜĆäËüš¤žßÖŽÇ°ŁŹ ĐčŇŞÇżľ÷ľÄĘÇŁŹ ŐâĐŠ˝áššÖťÄÜÓĂÓÚšš˝¨ portĄŁ
-	    ČçšűĎŁÍű˝řĐĐżçƽ̨ľÄżŞˇ˘ŁŹ ŔýČçÔÚ IDE ÖĐŁŹ ÔňÓŚĘšÓĂ
-	    <literal>devel/gnu-{automake,autoconf,libtool}</literal> ŐâĐŠ portĄŁ <filename
-	    role="package">devel/anjuta</filename> ŇÔź° <filename
-	    role="package">devel/kdevelop</filename> (ˇÖąđśÔÓŚÓÚ GNOME şÍ KDE)
-	    ĘÇšŘÓÚČçşÎ×öľ˝ŐâŇťľăľÄÁźşĂˇśŔýĄŁ</para>
+          <para>×îşóŁŹ żÉŇÔĘšÓĂŇť¸öĚŘĘâľÄĂűÎŞ
+	    <literal>autotools</literal> ľÄš¤žßŁŹ
+	    Ëüťá°˛×°ČŤ˛żżÉÓĂľÄ autotools °ćąžŁŹ
+	    ŇÔĘĘÓŚżçƽ̨żŞˇ˘ľÄĐčŇŞĄŁ ÄúżÉŇÔͨšý°˛×° <literal>devel/autotools</literal> port Ŕ´´ďľ˝ŐâҝĿľÄĄŁ</para>
 
 	</sect2>
 
@@ -4442,39 +4532,6 @@
 	  <para>ČçšűÖ¸ś¨ÁË <literal>:env</literal> ˛Ů×÷ˇűŁŹ ÔňąíĘžÖťÉčÖĂťˇžłŁŹ
 	    śřĚřšýĆäËűľÄ˛Ů×÷ĄŁ</para>
 
-	  <informaltable frame="none">
-	    <tgroup cols="2">
-	      <thead>
-		<row>
-		  <entry>ĎČÇ°ľÄĐ´ˇ¨</entry>
-
-		  <entry>ĐÂľÄ <makevar>USE_AUTOTOOLS</makevar> ˝ášš</entry>
-		</row>
-	      </thead>
-
-	      <tbody>
-		<row>
-		  <entry><literal>USE_LIBTOOL_VER=15</literal></entry>
-
-		  <entry><literal>libtool:15</literal></entry>
-		</row>
-
-		<row>
-		  <entry><literal>USE_INC_LIBTOOL_VER=15</literal></entry>
-
-		  <entry>ŇѲťÔŮĘšÓĂ</entry>
-		</row>
-
-		<row>
-		  <entry><literal>WANT_LIBTOOL_VER=15</literal></entry>
-
-		  <entry><literal>libtool:15:env</literal></entry>
-		</row>
-
-	      </tbody>
-	    </tgroup>
-	  </informaltable>
-
 	  <para>×îşóŁŹ <makevar>LIBTOOLFLAGS</makevar> şÍ
 	    <makevar>LIBTOOLFILES</makevar> żÉŇÔÓĂŔ´Ěćťť×Đ޸ľIJÎĘýŁŹ ŇÔź°˝Ťąť
 	    <command>libtool</command> Đ޲šľÄÎÄźţĄŁ śŕĘý port ˛ťĐčŇŞŐâŃů×öĄŁ
@@ -4498,27 +4555,6 @@
 	    Đ­ÖúżŞˇ˘ČËÔąĎűłýÔÚ <makevar>USE_AUTOTOOLS</makevar> żňźÜŇÔÍâľÄŁŹ
 	    śÔÓÚ autotools port ľÄŇŔŔľĄŁ Őâ¸öš¤žß˛˘˛ťĚᚊĆäËüľÄ˛Ů×÷ˇűĄŁ</para>
 
-	  <informaltable frame="none">
-	    <tgroup cols="2">
-	      <thead>
-		<row>
-		  <entry>ĎČÇ°ľÄĐ´ˇ¨</entry>
-
-		  <entry>ĐÂľÄ <makevar>USE_AUTOTOOLS</makevar> ˝ášš</entry>
-		</row>
-	      </thead>
-
-	      <tbody>
-		<row>
-		  <entry><literal>USE_LIBLTDL=YES</literal></entry>
-
-		  <entry><literal>libltdl:15</literal></entry>
-		</row>
-
-	      </tbody>
-	    </tgroup>
-	  </informaltable>
-
 	</sect2>
 
 	<sect2 id="using-autoconf">
@@ -4546,40 +4582,6 @@
 	    ÔňąíĘžÖťÉčÖĂÓĂÓÚşóĐřš¤×÷ľÄťˇžłĄŁ Čçšű˛ťÖ¸ś¨ŁŹ
 	    ÔňťáśÔ port ˝řĐĐĎŕÓŚľÄĐ޲šşÍÖŘĐÂĹäÖĂĄŁ</para>
 
-	  <informaltable frame="none">
-	    <tgroup cols="2">
-	      <thead>
-		<row>
-		  <entry>ĎČÇ°ľÄĐ´ˇ¨</entry>
-
-		  <entry>ĐÂľÄ <makevar>USE_AUTOTOOLS</makevar> ˝ášš</entry>
-		</row>
-	      </thead>
-
-	      <tbody>
-		<row>
-		  <entry><literal>USE_AUTOCONF_VER=213</literal></entry>
-
-		  <entry><literal>autoconf:213</literal></entry>
-		</row>
-
-		<row>
-		  <entry><literal>WANT_AUTOCONF_VER=259</literal></entry>
-
-		  <entry><literal>autoconf:259:env</literal></entry>
-		</row>
-
-		<row>
-		  <entry><literal>USE_AUTOHEADER_VER=253</literal></entry>
-
-		  <entry><literal>autoheader:253</literal> (implies
-		    <literal>autoconf:253</literal>)</entry>
-		</row>
-
-	      </tbody>
-	    </tgroup>
-	  </informaltable>
-
 	  <para>ĆäËüľÄżÉŃĄąäÁżŁŹ Čç
 	    <makevar>AUTOCONF_ARGS</makevar> şÍ
 	    <makevar>AUTOHEADER_ARGS</makevar> żÉŇÔͨšý port ľÄ
@@ -4625,42 +4627,8 @@
 	    <literal>:env</literal> ˛Ů×÷ˇűąíĘž˝ö˝öÉčÖĂÓĂÓÚşóĐřĘšÓþĝˇžłŁŹ
 	    Čçšű˛ťÉčÖĂŁŹ ÔňťáśÔ port ˝řĐĐÖŘĐÂĹäÖĂĄŁ</para>
 
-	  <informaltable frame="none">
-	    <tgroup cols="2">
-	      <thead>
-		<row>
-		  <entry>ĎČÇ°ľÄĐ´ˇ¨</entry>
-
-		  <entry><makevar>USE_AUTOTOOLS</makevar> construct</entry>
-		</row>
-	      </thead>
-
-	      <tbody>
-		<row>
-		  <entry><literal>USE_AUTOMAKE_VER=14</literal></entry>
-
-		  <entry><literal>automake:14</literal></entry>
-		</row>
-
-		<row>
-		  <entry><literal>WANT_AUTOMAKE_VER=15</literal></entry>
-
-		  <entry><literal>automake:15:env</literal></entry>
-		</row>
-
-		<row>
-		  <entry><literal>USE_ACLOCAL_VER=19</literal></entry>
-
-		  <entry><literal>aclocal:19</literal> (implies
-		    <literal>automake:19</literal>)</entry>
-		</row>
-
-	      </tbody>
-	    </tgroup>
-	  </informaltable>
-
-	  <para>As with
-	    <command>autoconf</command> şÍ <command>autoheader</command>Ą˘
+	  <para>śÔÓÚ
+	    <command>autoconf</command> şÍ <command>autoheader</command> śřŃÔŁŹ
 	    <command>automake</command> şÍ <command>aclocal</command>
 	    ĚᚊÁËśÔÓŚľÄżÉŃĄ˛ÎĘýąäÁż <makevar>AUTOMAKE_ARGS</makevar> şÍ
 	    <makevar>ACLOCAL_ARGS</makevar>ŁŹ ČçšűĐčŇŞľÄť°ŁŹ
@@ -4779,6 +4747,15 @@
       <para>ŇÔÉĎšćÔňÓĐŇť¸öŔýÍ⣏ ź´śÔӌĿŸ˛ť´ćÔÚťňÔ´Âë°ü˛ťÔÚÄǸöĿŸÖĐĘąŁŹ ÔĘĐíĘšÓĂ×÷ŐßľÄ id ×÷ÎŞ
 	<makevar>MASTER_SITE_SUBDIR</makevar>ĄŁ</para>
 
+      <para>ËůÓĐŐâĐŠŃĄĎîžůÍŹĘą˝ÓĘÜ <literal>YES</literal>
+	şÍ°ćąž´ŽŁŹ ŔŕËĆ <literal>5.8.0+</literal> ŐâŃůľÄĐ´ˇ¨ĄŁ ĘšÓĂ
+	<literal>YES</literal> ąíĘž port ÄÜšťĹäşĎËůÓĐĘÜÖ§łÖľÄ <application>Perl</application> °ćąžŔ´ĘšÓĂĄŁ
+	Čçšű port ÖťÄÜĹäşĎĚŘś¨°ćąžľÄ <application>Perl</application> Ŕ´ĘšÓĂŁŹ
+	ÔňżÉŇÔÓĂ°ćąž´ŽŔ´ąíĘžŁŹ ŔýČç×îľÍ°ćąž
+	(Čç <literal>5.7.3+</literal>)Ą˘ ×î¸ß°ćąž (Čç
+	<literal>5.8.0-</literal>) ťňÄł¸öžßĚĺľÄ°ćąž (Čç
+	<literal>5.8.3</literal>)ĄŁ</para>
+
       <table frame="none">
 	<title>ÓĂÓÚÓĂľ˝ <literal>perl</literal> ľÄ port ľÄąäÁż</title>
 
@@ -4903,7 +4880,44 @@
       <title>ĘšÓĂ X11</title>
 
       <sect2 id="x11-variables">
-	<title>ąäÁżś¨Ňĺ</title>
+	<title>X.Org ×éźţ</title>
+
+	<para>ÔÚ Ports ĚןţÖĐĚᚊľÄ X11 ĘľĎÖĘÇ X.OrgĄŁ
+	  ČçšűÄúľÄÓŚÓĂłĚĐňÓĂľ˝ÁË X ×éźţŁŹ ÔňÓŚ˝Ť
+	  <makevar>USE_XORG</makevar> ÉčÎŞËůĐčŇŞľÄÄÇĐŠ×éźţĄŁ
+	  ĿǰżÉÓĂľÄ×éźţ°üŔ¨Łş</para>
+
+	<para><literal>bigreqsproto compositeproto damageproto dmx dmxproto
+	  evieproto fixesproto fontcacheproto fontenc fontsproto fontutil
+	  glproto ice inputproto kbproto libfs oldx printproto randrproto
+	  recordproto renderproto resourceproto scrnsaverproto sm trapproto
+	  videoproto x11 xau xaw xaw6 xaw7 xaw8 xbitmaps xcmiscproto xcomposite
+	  xcursor xdamage xdmcp xevie xext xextproto xf86bigfontproto
+	  xf86dgaproto xf86driproto xf86miscproto xf86rushproto
+	  xf86vidmodeproto xfixes xfont xfontcache xft xi xinerama
+	  xineramaproto xkbfile xkbui xmu xmuu xorg-server xp xpm xprintapputil
+	  xprintutil xpr oto xproxymngproto xrandr xrender xres xscrnsaver xt
+	  xtrans xtrap xtst xv xvmc xxf86dga xxf86misc xxf86vm</literal>.</para>
+
+	<para>×îĐÂľÄÁĐąíŁŹ żÉŇÔÔÚ
+	  <filename>/usr/ports/Mk/bsd.xorg.mk</filename> ÖĐŐŇľ˝ĄŁ</para>
+
+	<para>The Mesa Project ĘÇŇť¸öÖÂÁŚÓÚ×ÔÓÉľÄ OpenGL
+	  ĘľĎ־ğƝŽĄŁ ÄúżÉŇÔĘšÓĂ <makevar>USE_GL</makevar> ąäÁżŔ´ČĂ port ŇŔŔľĆ䲝͏ľÄ×éźţĄŁ
+	  żÉÓĂľÄŃĄĎî°üŔ¨Łş <literal>glut, glu, glw, gl</literal> şÍ
+	  <literal>linux</literal>ĄŁ ÎŞÁËĘľĎÖĎňÇ°źćČÝŁŹ
+	  ľąĘšÓĂ <literal>yes</literal> ʹϾͳťá×ÔśŻ˝ŤĆäÓłÉäÎŞ <literal>glu</literal>ĄŁ</para>
+
+	<example id="use-xorg-example">
+	  <title>ĘšÓĂ USE_XORG ľÄŔý×Ó</title>
+	  <programlisting>USE_XORG=   xrender xft xkbfile xt xaw
+USE_GL=     glu</programlisting>
+	</example>
+
+	<para>Đíśŕ ports ťáś¨Ňĺ <makevar>USE_XLIB</makevar>ŁŹ
+	  ŐâťáľźÖ port ŇŔŔľ 50 śŕ¸öśŻĚŹÁŹ˝ÓżâĄŁ ÓÉÓÚËüłöĎÖÓÚ X.org
+	  ÄŁżéťŻÖŽÇ°ŁŹ Ňň´ËŐâ¸öąäÁż˝öÎŞĎňÇ°źćČÝľÄÔ­ŇňĚᚊŁŹ
+	  ĐÂľÄ port ˛ťÓŚÔŮĘšÓĂËüĄŁ</para>
 
       <table frame="none">
 	<title>ÓĂľ˝ X ľÄ port żÉŇÔĘšÓþĹäÁż</title>
@@ -4911,29 +4925,23 @@
 	<tgroup cols="2">
 	  <tbody>
 	    <row>
-	      <entry><makevar>USE_X_PREFIX</makevar></entry>
-
-	      <entry>´Ë port ˝ŤÎÄźţ°˛×°ľ˝ <makevar>X11BASE_REL</makevar> śřˇÇͨłŁľÄ
-		<makevar>PREFIX</makevar>ĄŁ</entry>
-	    </row>
-
-	    <row>
 	      <entry><makevar>USE_XLIB</makevar></entry>
 
-	      <entry>´Ë port ÓĂľ˝ÁË X żâĄŁ</entry>
+	      <entry>´Ë port ÓĂľ˝ÁË X żâĄŁ ŇŃšýĘą - ÄúÓŚĘšÓĂ <makevar>USE_XORG</makevar> ąäÁżÁĐłöÓĂľ˝ľÄ
+		X.Org ×éźţŁŹ śř˛ťĘÇĘšÓĂŐâ¸öąäÁżĄŁ</entry>
 	    </row>
 
 	    <row>
-	      <entry><makevar>USE_MOTIF</makevar></entry>
+	      <entry><makevar>USE_IMAKE</makevar></entry>
 
-	      <entry>´Ë port ĘšÓĂ Motif š¤žß°üĄŁ</entry>
+	      <entry>´Ë port ÓĂľ˝ÁË <command>imake</command>ĄŁ</entry>
 	    </row>
 
 	    <row>
-	      <entry><makevar>USE_IMAKE</makevar></entry>
+	      <entry><makevar>USE_X_PREFIX</makevar></entry>
 
-	      <entry>´Ë port ÓĂľ˝ÁË <command>imake</command>ĄŁ ŐâŇťąäÁżŇ˛ťá×ÔśŻÉčÖĂ
-		<makevar>USE_X_PREFIX</makevar>ĄŁ</entry>
+	      <entry>ŇŃšýĘąĄŁ ĿǰĆä×÷ÓĂÓë
+		<makevar>USE_XLIB</makevar> ĎŕÍŹŁŹ ˛˘żÉŇÔÖą˝ÓÓĂşóŐßĚćťťĄŁ</entry>
 	    </row>
 
 	    <row>
@@ -5121,10 +5129,7 @@
 	  ͨšýĎÂĂćľÄšŮˇ˝ hackŁŹ Ô¤ąŕŇë°üšš˝¨źŻČş˝ŤĆôśŻ˛ÉÓĂĐéÄâÖĄťş´ćľÄ
 	  X serverĄŁ ŐâŃůŁŹ ąŕŇëšýłĚ˝ŤÓĐżÉÓĂľÄ <envar>DISPLAY</envar>ĄŁ</para>
 
-	<programlisting>.if defined(PACKAGE_BUILDING)
-BUILD_DEPENDS+= Xvfb:${X_VFBSERVER_PORT} \
-                ${X11BASE}/lib/X11/fonts/misc/8x13O.pcf.gz:${X_FONTS_MISC_PORT}
-.endif</programlisting>
+	<programlisting>USE_DISPLAY=  yes</programlisting>
 
       </sect2>
 
@@ -5328,11 +5333,17 @@
       <sect2 id="qt4-components">
 	<title>×éźţľÄŃĄÔń (˝öĎŢ Qt 4.x)</title>
 
-	<para>ľą <makevar>USE_QT_VER</makevar> ÉčÎŞ 4 ĘąŁŹ żÉŇÔͨšý
-	  <makevar>QT_COMPONENTS</makevar> ąäÁżŔ´Ö¸ś¨
-	  Qt4 š¤žßşÍşŻĘýżâĄŁ ĎÂąíÖĐÁĐłöÁË×îÖŘŇŞľÄҝЊ×éźţ (ČŤ˛ż×éźţżÉŇÔÔÚ
-	  <filename>/usr/ports/Mk/bsd.kde.mk</filename> ÖĐľÄ
-	  <makevar>_QT_COMPONENTS_ALL</makevar> ąäÁżÖĐŐŇľ˝)Łş</para>
+	<para>ľą°Ń <makevar>USE_QT_VER</makevar> ÉčÎŞ 4 ĘąŁŹ žÍżÉŇÔͨšý
+	  <makevar>QT_COMPONENTS</makevar> ąäÁżŔ´Ö¸ś¨śÔ
+	  Qt4 š¤žßşÍşŻĘýżâľÄŇŔŔľÁËĄŁ ͨšýÔÚ×éźţľÄĂűłĆşóĂćĚíźÓ <literal>_build</literal> ťň <literal>_run</literal>
+	  ŐâŃůľÄşó׺ŁŹ ÔňżÉĎŕÓŚľŘ˝ŤŐâŇŔŔľšŘĎľĎŢÓÚÁŞąŕťňÔËĐĐĘążĚĄŁ
+	  ÔÚĂťÓĐÖ¸ś¨şó׺ʹŁŹ ϾͳďČĎÔÚÁŞąŕşÍÔËĐĐĘążĚžůŇŔŔľ¸Ă×éźţĄŁ
+	  ͨłŁÇéżöĎÂÔÚÖ¸Ă÷şŻĘýżâŇťŔŕľÄ×éźţĘąÓŚ˛ťĘšÓĂşó׺ŁŹ
+	  ÁŞąŕš¤žßŔŕ×éźţÓŚĘšÓĂ <literal>_build</literal> şó׺ŁŹ
+	  śř˛ĺźţŔŕ×éźţŁŹ ÔňÓŚĘšÓĂ <literal>_run</literal> şó׺ĄŁ
+	  ĎÂąíÖĐÁĐłöÁËҝЊ×ÓĂľÄ×éźţ (ČŤ˛żżÉÓĂľÄ×éźţŁŹ ÔňÔÚ
+	  <filename>/usr/ports/Mk/bsd.qt.mk</filename>
+	  ÖĐľÄ <makevar>_QT_COMPONENTS_ALL</makevar> ÁĐłö)Łş</para>
 
 	<table frame="none">
 	  <title>żÉÓĂľÄ Qt4 şŻĘýżâ×éźţ</title>
@@ -5377,6 +5388,11 @@
 	      </row>
 
 	      <row>
+		<entry><literal>script</literal></entry>
+		<entry>˝ĹąžşŻĘýżâ</entry>
+	      </row>
+
+	      <row>
 		<entry><literal>sql</literal></entry>
 		<entry>SQL şŻĘýżâ</entry>
 	      </row>
@@ -5407,24 +5423,26 @@
 	    <tbody>
 	      <row>
 		<entry><literal>moc</literal></entry>
-		<entry>ÔŞśÔĎóąŕŇëĆ÷ (ź¸şőËůÓĐľÄ Qt ÓŚÓĂłĚĐňśźĐčŇŞŐâ¸ö)</entry>
+		<entry>ÔŞśÔĎóąŕŇëĆ÷ (ź¸şőËůÓĐľÄ Qt ÓŚÓĂłĚĐňÔÚÁŞąŕšýłĚÖĐśźĐčŇŞËü)</entry>
 	      </row>
 
 	      <row>
 		<entry><literal>qmake</literal></entry>
-		<entry>ÓĂÓÚ Qt š¤łĚľÄÁŞąŕš¤žß</entry>
+		<entry>Makefile ÉúłÉĆ÷ / ÁŞąŕš¤žß</entry>
 	      </row>
 
 	      <row>
 		<entry><literal>rcc</literal></entry>
 		<entry>×ĘÔ´ąŕŇëĆ÷ (ČçšűÓŚÓĂłĚĐňÖĐ°üşŹ
 		  <filename>*.rc</filename> ťň <filename>*.qrc</filename>
-		  ÎÄźţ)</entry>
+		  ÎÄźţŁŹ žÍĐčŇŞËü)</entry>
 	      </row>
 
 	      <row>
 		<entry><literal>uic</literal></entry>
-		<entry>ÓĂť§˝çĂćąŕŇëĆ÷ (ČçšűÓŚÓĂłĚĐňÓĂľ˝ÁË GUI)</entry>
+		<entry>ÓĂť§˝çĂćąŕŇëĆ÷ (ČçšűÓŚÓĂłĚĐňÖĐ°üşŹĘšÓĂ Qt Designer
+		  ´´˝¨ľÄ <filename>*.ui</filename> ÎÄźţĘąžÍĐčŇŞËü
+		  - Ňť°ăËľŔ´ Qt ÓŚÓĂłĚĐňśźťáĘšÓĂ GUI ľÄ)</entry>
 	      </row>
 
 	    </tbody>
@@ -5461,12 +5479,17 @@
 	<example id="qt4-components-example">
 	  <title>ŃĄÔń Qt4 ×éźţ</title>
 
-	  <para>ĎÂĂćĘÇ port
-	    <filename role="package">editors/texmaker</filename> ÖĐľÄŇť¸öĆŹśÎŁŹ
-	    ËüÓĂľ˝ÁË Qt4 ÍźĐÎÓĂť§˝çĂ溯Ęýżâ (ŐâĘąťáÄŹČĎĘšÓĂşËĐÄşŻĘýżâ) ź°ÁŞąŕš¤žßŁş</para>
+	  <para>ÔÚŐâ¸öŔý×ÓÖĐŁŹ ÎŇĂÇ˝ŤŇŞŇĆÖ˛ľÄÓŚÓĂłĚĐňÓĂľ˝ÁË
+	    Qt4 ÍźĐÎÓĂť§˝çĂ溯ĘýżâĄ˘ Qt4 şËĐÄ (core) şŻĘýżâĄ˘
+	    ËůÓĐ Qt4 ´úÂëÉúłÉš¤žßŇÔź° Qt4 ľÄ
+	    Makefile ÉúłÉĆ÷ĄŁ ÓÉÓÚ gui şŻĘýżâťá×ÔśŻ¸˝´řśÔşËĐÄşŻĘýżâľÄŇŔŔľŁŹ
+	    Ňň´Ë˛˘˛ťĐčŇŞĂ÷ȡָłöĐčŇŞ corelib ľÄŇŔŔľšŘĎľĄŁ Qt4 ´úÂëÉúłÉš¤žß mocĄ˘
+	    uic şÍ rcc ŇÔź° Makefile ÉúłÉĆ÷
+	    qmake ÖťÔÚÁŞąŕšýłĚÖвŝáÓĂľ˝ŁŹ
+	    Ňň´ËżÉŇÔÖ¸ś¨ <literal>_build</literal> şó׺Łş</para>
 
 	  <programlisting>USE_QT_VER=    4
-QT_COMPONENTS= gui moc qmake rcc uic</programlisting>
+QT_COMPONENTS= gui moc_build qmake_build rcc_build uic_build</programlisting>
 	</example>
       </sect2>
 
@@ -5515,21 +5538,6 @@
 	  </listitem>
 	</itemizedlist>
 
-	<note>
-	  <para>ĿǰŁŹ <filename>bsd.kde.mk</filename> ťš˛ťÖ§łÖ pre/postmkŁŹ
-	    ҲžÍĘÇËľŁŹ ÔÚĘšÓĂÁË <filename>bsd.port.pre.mk</filename> ÖŽşóŁŹ žÍ˛ťÄÜÔŮÖ¸ś¨
-	    <makevar>USE_QT_VER</makevar> şÍ <makevar>QT_COMPONENTS</makevar>
-	    ÁËĄŁ ČçšűÄúľÄ port ĐčŇŞŐâŃů×öŁŹ ÇëŇÔ´ŤÍłˇ˝Ę˝ąŕĐ´ŇŔŔľšŘĎľŁŹ ŔýČ磺</para>
-
-	  <programlisting>.include &lt;bsd.port.pre.mk&gt;
-
-.if defined(WITH_QT)
-BUILD_DEPENDS+=	moc4:${PORTSDIR}/devel/qt4-moc
-LIB_DEPENDS+=	QtCore:${PORTSDIR}/devel/qt4-corelib
-.endif
-
-.include &lt;bsd.port.post.mk&gt;</programlisting>
-	</note>
       </sect2>
 
     </sect1>
@@ -6022,7 +6030,10 @@
 	  <filename><makevar>PREFIX</makevar>/www/<replaceable>ÓŚÓĂłĚĐňľÄĂű×Ö</replaceable></filename>ĄŁ
 	  ÎŞˇ˝ąăĆđźűŁŹ Őâ¸ö¡žśÔÚ
 	  <filename>Makefile</filename> şÍ <filename>pkg-plist</filename>
-	  žůŇÔ <makevar>WWWDIR</makevar> ąäÁżľÄĐÎĘ˝ĚᚊĄŁ</para>
+	  žůŇÔ <makevar>WWWDIR</makevar> ąäÁżľÄĐÎĘ˝ĚᚊĄŁ ÔÚ
+	  <filename>Makefile</filename> ÖĐżÉŇÔĘšÓĂ
+	  <makevar>WWWDIR_REL</makevar> Ŕ´ąíĘž°üşŹÁË
+	  <makevar>PREFIX</makevar> ľÄ¸ĂąäÁżÖľĄŁ</para>
 
 	<para>web ˇţÎńĆ÷˝řłĚËůÓĂľÄÓĂť§şÍÓĂť§×飏 ˇÖąđŇÔ
 	  <makevar>WWWOWN</makevar> şÍ <makevar>WWWGRP</makevar> ąäÁżľÄĐÎĘ˝ĚᚊŁŹ
@@ -6704,6 +6715,7 @@
 	    </tbody>
 	  </tgroup>
 	</table>
+      </sect2>
 
       <sect2 id="wx-components">
 	<title>ŃĄÔń×éźţ</title>
@@ -7805,6 +7817,10 @@
 	<filename>Makefile</filename> ÖĐĘšÓĂĄŁ ×îĐ°湞ľÄ &os; ˛˘˛ťÎŞ˝ĹąžĂűÔöźÓČκκó׺ŁŹ
 	ľŤ˝ĎÔçľÄ°ćąžÔňÔřĘšÓĂšý
 	<filename>.sh</filename> şó׺ĄŁ</para>
+      <note>
+	<para>ĐÂÔöľÄ˝Ĺąžžů˛ťÓŚĘšÓĂ <filename>.sh</filename>
+	  şó׺ĄŁ δŔ´ŁŹ ČÔČť°üşŹŐâŇťşó׺ľÄ˝Ĺąž˝ŤąťĹúÁż¸ÄĂűĄŁ</para>
+      </note>
 
       <sect2>
 	<title>ĐśÔŘʹ֚ͣˇţÎń</title>
@@ -8377,15 +8393,17 @@
 	  ĘľźĘÉĎŁŹ port ťá°˛×°ľ˝
 	  <makevar>DESTDIR</makevar>/<makevar>PREFIX</makevar>ŁŹ
 	  ˛˘×˘˛áľ˝ÎťÓÚ <makevar>DESTDIR</makevar>/var/db/pkg
-	  ľÄÔ¤ąŕŇë°üĘýžÝżâÖĐĄŁ ÔÚ׍д port ĘąŁŹ ×ńŃ­
-	  <makevar>DESTDIR</makevar> ľÄĹäÖĂĘŽˇÖÖŘŇŞĄŁ</para>
+	  ľÄÔ¤ąŕŇë°üĘýžÝżâÖĐĄŁ ÓÉÓÚ <makevar>DESTDIR</makevar> ĘÇÓÉ
+	  ports żňźÜ˝ĺÓÉ &man.chroot.8; Ŕ´ĘľĎ־ģŹ ÄúÔÚ׍дˇűşĎ
+	  <makevar>DESTDIR</makevar> šćˇśľÄ ports Ęą˛˘˛ťĐčҪʲôśîÍâľÄš¤×÷ĄŁ</para>
 
 	<para>Ňť°ăśřŃÔ <makevar>PREFIX</makevar> ťáÉčÎŞ
 	  <makevar>LOCALBASE_REL</makevar> (ÄŹČĎĘÇ
 	  <filename>/usr/local</filename>)ĄŁ ČçšűÉčÖĂÁË
 	  <makevar>USE_X_PREFIX</makevar> ťň <makevar>USE_IMAKE</makevar>ŁŹ
-	  Ôň <makevar>PREFIX</makevar> ťáÉčÎŞ <makevar>X11BASE_REL</makevar> (ÄŹČĎĘÇ
-	  <filename>/usr/X11R6</filename>)ĄŁ ČçšűÉčÖĂÁË
+	  Ôň <makevar>PREFIX</makevar> ťáÉčÎŞ <makevar>X11BASE</makevar>
+	  (ÎŞÁËĎňÇ°źćČÝŁŹ Őâ¸öąäÁżľÄÄŹČĎÖľĘÇ <makevar>LOCALBASE</makevar>ŁŹ
+	  δŔ´Ëü˝ŤąťÉžłý)ĄŁ ČçšűÉčÖĂÁË
 	  <makevar>USE_LINUX_PREFIX</makevar>ŁŹ Ôň <makevar>PREFIX</makevar>
 	  ťáÉčÎŞ <makevar>LINUXBASE_REL</makevar> (ÄŹČĎĘÇ
 	  <filename>/compat/linux</filename>)ĄŁ</para>
@@ -8435,47 +8453,6 @@

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 02:13:10 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 14C0716A468; Fri,  5 Oct 2007 02:13:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5D16516A418
	for <perforce@freebsd.org>; Fri,  5 Oct 2007 02:13:09 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 4C70D13C468
	for <perforce@freebsd.org>; Fri,  5 Oct 2007 02:13:09 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l952D9ie027052
	for <perforce@freebsd.org>; Fri, 5 Oct 2007 02:13:09 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l952D7YT027049
	for perforce@freebsd.org; Fri, 5 Oct 2007 02:13:07 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 5 Oct 2007 02:13:07 GMT
Message-Id: <200710050213.l952D7YT027049@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127213 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 02:13:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=127213

Change 127213 by jb@jb_freebsd1 on 2007/10/05 02:12:39

	IF6

Affected files ...

.. //depot/projects/dtrace6/src/contrib/groff/tmac/doc-common#2 integrate
.. //depot/projects/dtrace6/src/contrib/groff/tmac/doc-syms#2 integrate
.. //depot/projects/dtrace6/src/contrib/groff/tmac/groff_mdoc.man#2 integrate
.. //depot/projects/dtrace6/src/crypto/openssl/ssl/ssl_lib.c#2 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/groff/tmac/mdoc.local#2 integrate
.. //depot/projects/dtrace6/src/sbin/adjkerntz/adjkerntz.c#2 integrate
.. //depot/projects/dtrace6/src/sys/alpha/isa/isa.c#2 integrate
.. //depot/projects/dtrace6/src/sys/alpha/pci/apecs_pci.c#2 integrate
.. //depot/projects/dtrace6/src/sys/alpha/pci/lca_pci.c#2 integrate
.. //depot/projects/dtrace6/src/sys/alpha/pci/pcibus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/amd64/amd64/nexus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/dtrace6/src/sys/arm/arm/nexus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/dtrace6/src/sys/arm/xscale/i80321/obio.c#2 integrate
.. //depot/projects/dtrace6/src/sys/conf/files.amd64#3 integrate
.. //depot/projects/dtrace6/src/sys/conf/files.i386#3 integrate
.. //depot/projects/dtrace6/src/sys/dev/mxge/eth_z8e.dat.gz.uu#2 delete
.. //depot/projects/dtrace6/src/sys/dev/mxge/eth_z8e.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#2 delete
.. //depot/projects/dtrace6/src/sys/dev/mxge/ethp_z8e.h#1 branch
.. //depot/projects/dtrace6/src/sys/dev/mxge/if_mxge.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mxge/if_mxge_var.h#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mxge/mcp_gen_header.h#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mxge/mxge_eth_z8e.c#1 branch
.. //depot/projects/dtrace6/src/sys/dev/mxge/mxge_ethp_z8e.c#1 branch
.. //depot/projects/dtrace6/src/sys/dev/mxge/mxge_lro.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mxge/mxge_mcp.h#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/dtrace6/src/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/dtrace6/src/sys/fs/fifofs/fifo_vnops.c#2 integrate
.. //depot/projects/dtrace6/src/sys/i386/conf/NOTES#3 integrate
.. //depot/projects/dtrace6/src/sys/i386/i386/nexus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/ia64/ia64/nexus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/vfs_vnops.c#2 integrate
.. //depot/projects/dtrace6/src/sys/modules/mxge/mxge_eth_z8e/Makefile#2 integrate
.. //depot/projects/dtrace6/src/sys/modules/mxge/mxge_ethp_z8e/Makefile#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/powermac/macio.c#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/powermac/uninorth.c#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/powerpc/openpic.c#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/psim/iobus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/ebus/ebus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/sparc64/sparc64/nexus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/vm/vnode_pager.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/Makefile#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/atalk.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/bpf.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/inet.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/inet6.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/ipsec.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/ipx.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/main.c#3 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/mbuf.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/mroute.c#3 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/mroute6.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/netgraph.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/netstat.h#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/pfkey.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/route.c#2 integrate
.. //depot/projects/dtrace6/src/usr.bin/netstat/unix.c#2 integrate

Differences ...

==== //depot/projects/dtrace6/src/contrib/groff/tmac/doc-common#2 (text+ko) ====

@@ -431,11 +431,13 @@
 .ds doc-operating-system-NetBSD-1.6   1.6
 .ds doc-operating-system-NetBSD-1.6.1 1.6.1
 .ds doc-operating-system-NetBSD-1.6.2 1.6.2
+.ds doc-operating-system-NetBSD-1.6.3 1.6.3
 .ds doc-operating-system-NetBSD-2.0   2.0
 .ds doc-operating-system-NetBSD-2.0.1 2.0.1
 .ds doc-operating-system-NetBSD-2.0.2 2.0.2
 .ds doc-operating-system-NetBSD-2.1   2.1
 .ds doc-operating-system-NetBSD-3.0   3.0
+.ds doc-operating-system-NetBSD-4.0   4.0
 .
 .ds doc-operating-system-FreeBSD-1.0     1.0
 .ds doc-operating-system-FreeBSD-1.1     1.1
@@ -480,13 +482,25 @@
 .ds doc-operating-system-FreeBSD-5.2.1   5.2.1
 .ds doc-operating-system-FreeBSD-5.3     5.3
 .ds doc-operating-system-FreeBSD-5.4     5.4
+.ds doc-operating-system-FreeBSD-5.5     5.5
 .ds doc-operating-system-FreeBSD-6.0     6.0
 .ds doc-operating-system-FreeBSD-6.1     6.1
+.ds doc-operating-system-FreeBSD-6.2     6.2
+.ds doc-operating-system-FreeBSD-7.0     7.0
 .
 .ds doc-operating-system-Darwin-8.0.0 8.0.0
 .ds doc-operating-system-Darwin-8.1.0 8.1.0
 .ds doc-operating-system-Darwin-8.2.0 8.2.0
 .ds doc-operating-system-Darwin-8.3.0 8.3.0
+.ds doc-operating-system-Darwin-8.4.0 8.4.0
+.ds doc-operating-system-Darwin-8.5.0 8.5.0
+.
+.ds doc-operating-system-DragonFly-1.0 1.0
+.ds doc-operating-system-DragonFly-1.1 1.1
+.ds doc-operating-system-DragonFly-1.2 1.2
+.ds doc-operating-system-DragonFly-1.3 1.3
+.ds doc-operating-system-DragonFly-1.4 1.4
+.ds doc-operating-system-DragonFly-1.5 1.5
 .
 .de Os
 .  ie "\$1"" \

==== //depot/projects/dtrace6/src/contrib/groff/tmac/doc-syms#2 (text+ko) ====

@@ -204,13 +204,13 @@
 .as doc-str-At-v7  " \*[doc-Tn-font-size]AT&T UNIX\*[doc-str-At]
 .ds doc-str-At-V   \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V
 .as doc-str-At-V   " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.1
+.ds doc-str-At-V.1 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~1
 .as doc-str-At-V.1 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.2
+.ds doc-str-At-V.2 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~2
 .as doc-str-At-V.2 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.3
+.ds doc-str-At-V.3 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~3
 .as doc-str-At-V.3 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
-.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V.4
+.ds doc-str-At-V.4 \*[doc-Tn-font-size]AT&T\*[doc-str-At] System\~V Release\~4
 .as doc-str-At-V.4 " \*[doc-Tn-font-size]UNIX\*[doc-str-At]
 .
 .de At
@@ -260,6 +260,70 @@
 ..
 .
 .
+.\" NS Dx user macro
+.\" NS   print DragonFly
+.\" NS
+.\" NS modifies:
+.\" NS   doc-arg-ptr
+.\" NS   doc-curr-font
+.\" NS   doc-curr-size
+.\" NS   doc-macro-name
+.\" NS
+.\" NS local variable:
+.\" NS   doc-str-Dx
+.\" NS   doc-str-Dx1
+.\" NS
+.\" NS width register `Dx' defined in doc-common
+.
+.\" we use the doc-operating-system-DragonFly-* strings defined in doc-common
+.
+.de Dx
+.  nr doc-curr-font \n[.f]
+.  nr doc-curr-size \n[.ps]
+.  ds doc-str-Dx \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]
+.
+.  \" default value if no argument
+.  ds doc-str-Dx1 \*[doc-Tn-font-size]\%DragonFly\*[doc-str-Dx]
+.
+.  if !\n[doc-arg-limit] \
+.    if \n[.$] \{\
+.      ds doc-macro-name Dx
+.      doc-parse-args \$@
+.    \}
+.
+.  if (\n[doc-arg-limit] > \n[doc-arg-ptr]) \{\
+.    nr doc-arg-ptr +1
+.    ie (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
+.      ie \A\*[doc-arg\n[doc-arg-ptr]] \{\
+.        ie d doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]] \
+.          as doc-str-Dx1 \~\*[doc-operating-system-DragonFly-\*[doc-arg\n[doc-arg-ptr]]]
+.        el \{\
+.          tmc mdoc warning: .Dx: Unknown DragonFly version
+.          tm1 " `\*[doc-arg\n[doc-arg-ptr]]' (#\n[.c])
+.          as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]]
+.      \}\}
+.      el \
+.        as doc-str-Dx1 \~\*[doc-arg\n[doc-arg-ptr]]
+.    \}
+.    el \
+.      nr doc-arg-ptr -1
+.  \}
+.
+.  \" replace current argument with result
+.  ds doc-arg\n[doc-arg-ptr] "\*[doc-str-Dx1]
+.  nr doc-type\n[doc-arg-ptr] 2
+.  ds doc-space\n[doc-arg-ptr] "\*[doc-space]
+.
+.  \" recompute space vector for remaining arguments
+.  nr doc-num-args (\n[doc-arg-limit] - \n[doc-arg-ptr])
+.  nr doc-arg-limit \n[doc-arg-ptr]
+.  if \n[doc-num-args] \
+.    doc-parse-space-vector
+.
+.  doc-print-recursive
+..
+.
+.
 .\" NS Fx user macro
 .\" NS   print FreeBSD
 .\" NS
@@ -543,6 +607,12 @@
 .als doc-str-St--isoC-90 doc-str-St--isoC
 .ds doc-str-St--isoC-99        \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899:1999
 .as doc-str-St--isoC-99        " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^99\*[doc-str-St]\*[Rq])
+.ds doc-str-St--isoC-amd1       \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/AMD1:1995
+.as doc-str-St--isoC-amd1       " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Amendment 1\*[Rq])
+.ds doc-str-St--isoC-tcor1      \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR1:1994
+.as doc-str-St--isoC-tcor1      " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 1\*[Rq])
+.ds doc-str-St--isoC-tcor2      \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 9899/TCOR2:1995
+.as doc-str-St--isoC-tcor2      " (\*[Lq]\*[doc-Tn-font-size]ISO\~C\^90\*[doc-str-St], Technical Corrigendum 2\*[Rq])
 .
 .\" POSIX Part 1: System API
 .ds doc-str-St--p1003.1        \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1003.1
@@ -604,6 +674,8 @@
 .
 .\" Miscellaneous
 .ds doc-str-St--ieee754        \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 754-1985
+.ds doc-str-St--ieee1275-94     \*[doc-Tn-font-size]\%IEEE\*[doc-str-St] Std 1275-1994
+.as doc-str-St--ieee1275-94     " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq])
 .ds doc-str-St--iso8802-3      \*[doc-Tn-font-size]ISO/IEC\*[doc-str-St] 8802-3:1989
 .
 .de St

==== //depot/projects/dtrace6/src/contrib/groff/tmac/groff_mdoc.man#2 (text+ko) ====

@@ -183,6 +183,7 @@
 .    It "BSD Macro"
 .    It "NetBSD Macro"
 .    It "FreeBSD Macro"
+.    It "DragonFly Macro"
 .    It "OpenBSD Macro"
 .    It "BSD/OS Macro"
 .    It "UNIX Macro"
@@ -812,9 +813,9 @@
 Local, OS-specific additions might be found in the file
 .Pa mdoc.local ;
 look for strings named
-.Ql volume-ds-XXX
+.Ql volume\-ds\-XXX
 (for the former type) and
-.Ql volume-as-XXX
+.Ql volume\-as\-XXX
 (for the latter type);
 .Ql XXX
 then denotes the keyword to be used with the
@@ -847,7 +848,7 @@
 local additions might be defined in
 .Pa mdoc.local ;
 look for strings named
-.Ql operating-system-XXX-YYY ,
+.Ql operating\-system\-XXX\-YYY ,
 where
 .Ql XXX
 is the acronym for the operating system and
@@ -868,9 +869,11 @@
 1.0, 1.1, 1.1.5, 1.1.5.1, 2.0, 2.0.5, 2.1, 2.1.5, 2.1.6, 2.1.7, 2.2, 2.2.1,
 2.2.2, 2.2.5, 2.2.6, 2.2.7, 2.2.8, 3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 4.0, 4.1,
 4.1.1, 4.2, 4.3, 4.4, 4.5, 4.6, 4.6.2, 4.7, 4.8, 4.9, 4.10, 4.11, 5.0, 5.1,
-5.2, 5.2.1, 5.3, 5.4, 6.0, 6.1
+5.2, 5.2.1, 5.3, 5.4, 5.5, 6.0, 6.1, 6.2, 7.0
+.It DragonFly
+1.0, 1.1, 1.2, 1.3, 1.4, 1.5
 .It Darwin
-8.0.0, 8.1.0, 8.2.0, 8.3.0
+8.0.0, 8.1.0, 8.2.0, 8.3.0, 8.4.0, 8.5.0
 .El
 .Ed
 .Pp
@@ -1199,7 +1202,7 @@
 If this is not desirable,
 .
 .Bd -literal -offset indent
-\&.An -nosplit
+\&.An \-nosplit
 .Ed
 .Pp
 .
@@ -1207,7 +1210,7 @@
 To turn splitting back on, write
 .
 .Bd -literal -offset indent
-\&.An -split
+\&.An \-split
 .Ed
 .
 .Ss "Arguments"
@@ -1577,10 +1580,10 @@
 .Sx RETURN VALUES
 section.
 .Pp
-.Dl Usage: .Rv Oo -std Oc Op Ao function Ac ...
+.Dl Usage: .Rv Oo \-std Oc Op Ao function Ac ...
 .Pp
 For example,
-.Ql ".Rv -std atexit"
+.Ql ".Rv \-std atexit"
 produces:
 .
 .Bd -ragged -offset -indent
@@ -1607,10 +1610,10 @@
 .Sx DIAGNOSTICS
 section.
 .Pp
-.Dl Usage: .Ex Oo -std Oc Op Ao utility Ac ...
+.Dl Usage: .Ex Oo \-std Oc Op Ao utility Ac ...
 .Pp
 For example,
-.Ql ".Ex -std cat"
+.Ql ".Ex \-std cat"
 produces:
 .
 .Bd -ragged -offset -indent
@@ -1734,7 +1737,7 @@
 Local, OS-specific additions might be found in the file
 .Pa mdoc.local ;
 look for strings named
-.Ql str-Lb-XXX .
+.Ql str\-Lb\-XXX .
 .Ql XXX
 then denotes the keyword to be used with the
 .Ql .Lb
@@ -1752,16 +1755,16 @@
 The
 .Ql .Li
 literal macro may be used for special characters, variable constants, etc.\&
--- anything which should be displayed as it would be typed.
+\- anything which should be displayed as it would be typed.
 .Pp
 .Dl Usage: .Li Ao argument Ac ...
 .Pp
-.Bl -tag -width ".Li .Li\ cntrl-D\ )\ ,"  -compact -offset 15n
+.Bl -tag -width ".Li .Li\ cntrl\-D\ )\ ,"  -compact -offset 15n
 .It Li ".Li \een"
 .Li \en
 .It Li ".Li M1 M2 M3 ;"
 .Li M1 M2 M3 ;
-.It Li ".Li cntrl-D ) ,"
+.It Li ".Li cntrl\-D ) ,"
 .Li cntrl-D ) ,
 .It Li ".Li 1024 ..."
 .Li 1024 ...
@@ -1809,7 +1812,7 @@
 .Bl -tag -width ".Li .Nm\ groff_mdoc" -compact -offset 15n
 .It Li ".Nm groff_mdoc"
 .Nm groff_mdoc
-.It Li ".Nm \e-mdoc"
+.It Li ".Nm \e\-mdoc"
 .Nm \-mdoc
 .It Li ".Nm foo ) ) ,"
 .Nm foo ) ) ,
@@ -1927,16 +1930,16 @@
 .Pp
 .Tn ANSI/ISO C
 .Pp
-.Bl -tag -width ".Li -iso9945-1-90" -compact -offset indent
-.It Li -ansiC
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
+.It Li \-ansiC
 .St -ansiC
-.It Li -ansiC-89
+.It Li \-ansiC\-89
 .St -ansiC-89
-.It Li -isoC
+.It Li \-isoC
 .St -isoC
-.It Li -isoC-90
+.It Li \-isoC\-90
 .St -isoC-90
-.It Li -isoC-99
+.It Li \-isoC\-99
 .St -isoC-99
 .El
 .Pp
@@ -1944,30 +1947,30 @@
 .Tn POSIX
 Part 1: System API
 .Pp
-.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent
-.It Li -iso9945-1-90
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
+.It Li \-iso9945\-1\-90
 .St -iso9945-1-90
-.It Li -iso9945-1-96
+.It Li \-iso9945\-1\-96
 .St -iso9945-1-96
-.It Li -p1003.1
+.It Li \-p1003.1
 .St -p1003.1
-.It Li -p1003.1-88
+.It Li \-p1003.1\-88
 .St -p1003.1-88
-.It Li -p1003.1-90
+.It Li \-p1003.1\-90
 .St -p1003.1-90
-.It Li -p1003.1-96
+.It Li \-p1003.1\-96
 .St -p1003.1-96
-.It Li -p1003.1b-93
+.It Li \-p1003.1b\-93
 .St -p1003.1b-93
-.It Li -p1003.1c-95
+.It Li \-p1003.1c\-95
 .St -p1003.1c-95
-.It Li -p1003.1g-2000
+.It Li \-p1003.1g\-2000
 .St -p1003.1g-2000
-.It Li -p1003.1i-95
+.It Li \-p1003.1i\-95
 .St -p1003.1i-95
-.It Li -p1003.1-2001
+.It Li \-p1003.1\-2001
 .St -p1003.1-2001
-.It Li -p1003.1-2004
+.It Li \-p1003.1\-2004
 .St -p1003.1-2004
 .El
 .Pp
@@ -1975,52 +1978,52 @@
 .Tn POSIX
 Part 2: Shell and Utilities
 .Pp
-.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent
-.It Li -iso9945-2-93
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
+.It Li \-iso9945\-2\-93
 .St -iso9945-2-93
-.It Li -p1003.2
+.It Li \-p1003.2
 .St -p1003.2
-.It Li -p1003.2-92
+.It Li \-p1003.2\-92
 .St -p1003.2-92
-.It Li -p1003.2a-92
+.It Li \-p1003.2a\-92
 .St -p1003.2a-92
 .El
 .Pp
 .
 X/Open
-.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
 .Pp
-.It Li -susv2
+.It Li \-susv2
 .St -susv2
-.It Li -svid4
+.It Li \-svid4
 .St -svid4
-.It Li -xbd5
+.It Li \-xbd5
 .St -xbd5
-.It Li -xcu5
+.It Li \-xcu5
 .St -xcu5
-.It Li -xcurses4.2
+.It Li \-xcurses4.2
 .St -xcurses4.2
-.It Li -xns5
+.It Li \-xns5
 .St -xns5
-.It Li -xns5.2
+.It Li \-xns5.2
 .St -xns5.2
-.It Li -xpg3
+.It Li \-xpg3
 .St -xpg3
-.It Li -xpg4
+.It Li \-xpg4
 .St -xpg4
-.It Li -xpg4.2
+.It Li \-xpg4.2
 .St -xpg4.2
-.It Li -xsh5
+.It Li \-xsh5
 .St -xsh5
 .El
 .Pp
 .
 Miscellaneous
 .Pp
-.Bl -tag -width ".Li -p1003.1g-2000" -compact -offset indent
-.It Li -ieee754
+.Bl -tag -width ".Li \-p1003.1g\-2000" -compact -offset indent
+.It Li \-ieee754
 .St -ieee754
-.It Li -iso8802-3
+.It Li \-iso8802\-3
 .St -iso8802-3
 .El
 .
@@ -2110,7 +2113,7 @@
 .Ss "BSD Macro"
 .
 .Pp
-.Dl "Usage: .Bx" Bro -alpha | -beta | -devel Brc ...
+.Dl "Usage: .Bx" Bro \-alpha | \-beta | \-devel Brc ...
 .Dl "       .Bx" Oo Ao version Ac Oo Ao release Ac Oc Oc ...
 .Pp
 .Bl -tag -width ".Li .Bx\ -devel" -compact -offset 15n
@@ -2169,6 +2172,25 @@
 command above in section
 .Sx "TITLE MACROS" .
 .
+.Ss "DragonFly Macro"
+.
+.Pp
+.Dl Usage: .Dx Oo Ao version Ac Oc ...
+.Pp
+.Bl -tag -width ".Li .Dx\ 1.4\ ." -compact -offset 15n
+.It Li .Dx
+.Dx
+.It Li ".Dx 1.4 ."
+.Dx 1.4 .
+.El
+.Pp
+For possible values of
+.Ao version Ac
+see the description of the
+.Ql .Os
+command above in section
+.Sx "TITLE MACROS" .
+.
 .Ss "OpenBSD Macro"
 .
 .Pp
@@ -2362,7 +2384,7 @@
 .Dq
 .It Li ".Dq string abc ."
 .Dq string abc .
-.It Li ".Dq \'^[A-Z]\'"
+.It Li ".Dq \'^[A\-Z]\'"
 .Dq \'^[A-Z]\'
 .It Li ".Ql man mdoc"
 .Ql man mdoc
@@ -2555,7 +2577,7 @@
 \&.%A "Matthew Bar"
 \&.%A "John Foo"
 \&.%T "Implementation Notes on foobar(1)"
-\&.%R "Technical Report ABC-DE-12-345"
+\&.%R "Technical Report ABC\-DE\-12\-345"
 \&.%Q "Drofnats College, Nowhere"
 \&.%D "April 1991"
 \&.Re
@@ -2728,7 +2750,7 @@
 .Pp
 .Ql .Nd
 first prints
-.Ql - ,
+.Ql \- ,
 then all its arguments.
 .
 .It Li ".Sh LIBRARY"
@@ -3135,10 +3157,10 @@
 .Ql .Dl
 is parsed but not callable.
 .Pp
-.Dl % ls -ldg /usr/local/bin
+.Dl % ls \-ldg /usr/local/bin
 .Pp
 The above was produced by:
-.Li ".Dl % ls -ldg /usr/local/bin" .
+.Li ".Dl % ls \e\-ldg /usr/local/bin" .
 .
 .It Li .Bd
 Begin display.
@@ -3210,7 +3232,7 @@
 macros, so one is guaranteed the two types of displays will line up.
 The indentation value is normally set to\~6n or about two thirds of an inch
 (six constant width characters).
-.It Ar indent-two
+.It Ar indent\-two
 Indent two times the default indent value.
 .It Ar right
 This
@@ -3305,7 +3327,7 @@
 A bullet list.
 .
 .Bd -literal -offset indent
-\&.Bl -bullet -offset indent -compact
+\&.Bl \-bullet \-offset indent \-compact
 \&.It
 Bullet one goes here.
 \&.It
@@ -3329,7 +3351,7 @@
 A dash list.
 .
 .Bd -literal -offset indent
-\&.Bl -dash -offset indent -compact
+\&.Bl \-dash \-offset indent \-compact
 \&.It
 Dash one goes here.
 \&.It
@@ -3353,7 +3375,7 @@
 An enumerated list.
 .
 .Bd -literal -offset indent
-\&.Bl -enum -offset indent -compact
+\&.Bl \-enum \-offset indent \-compact
 \&.It
 Item one goes here.
 \&.It
@@ -3378,10 +3400,10 @@
 flag (starting with the second-level list):
 .
 .Bd -literal -offset indent
-\&.Bl -enum -offset indent -compact
+\&.Bl \-enum \-offset indent \-compact
 \&.It
 Item one goes here
-\&.Bl -enum -nested -compact
+\&.Bl \-enum \-nested \-compact
 \&.It
 Item two goes here.
 \&.It
@@ -3416,7 +3438,7 @@
 without list markers.
 .
 .Bd -literal -offset indent
-\&.Bl -item -offset indent
+\&.Bl \-item \-offset indent
 \&.It
 Item one goes here.
 Item one goes here.
@@ -3470,7 +3492,7 @@
 The raw text:
 .
 .Bd -literal -offset indent
-\&.Bl -tag -width "PPID" -compact -offset indent
+\&.Bl \-tag \-width "PPID" \-compact \-offset indent
 \&.It SL
 sleep time of the process (seconds blocked)
 \&.It PAGEIN
@@ -3479,10 +3501,10 @@
 resulting from references by the process
 to pages not loaded in core.
 \&.It UID
-numerical user-id of process owner
+numerical user\-id of process owner
 \&.It PPID
 numerical id of parent of process priority
-(non-positive when in non-interruptible wait)
+(non\-positive when in non\-interruptible wait)
 \&.El
 .Ed
 .Pp
@@ -3497,7 +3519,7 @@
 Example:
 .
 .Bd -literal -offset indent
-\&.Bl -diag
+\&.Bl \-diag
 \&.It You can't use Sy here.
 The message says all.
 \&.El
@@ -3527,7 +3549,7 @@
 And the unformatted text which created it:
 .
 .Bd -literal -offset indent
-\&.Bl -hang -offset indent
+\&.Bl \-hang \-offset indent
 \&.It Em Hanged
 labels appear similar to tagged lists when the
 label is smaller than the label width.
@@ -3561,7 +3583,7 @@
 The raw text:
 .
 .Bd -literal -offset indent
-\&.Bl -ohang -offset indent
+\&.Bl \-ohang \-offset indent
 \&.It Sy SL
 sleep time of the process (seconds blocked)
 \&.It Sy PAGEIN
@@ -3570,10 +3592,10 @@
 resulting from references by the process
 to pages not loaded in core.
 \&.It Sy UID
-numerical user-id of process owner
+numerical user\-id of process owner
 \&.It Sy PPID
 numerical id of parent of process priority
-(non-positive when in non-interruptible wait)
+(non\-positive when in non\-interruptible wait)
 \&.El
 .Ed
 .Pp
@@ -3606,7 +3628,7 @@
 Here is the source text which produced the above example:
 .
 .Bd -literal -offset indent
-\&.Bl -inset -offset indent
+\&.Bl \-inset \-offset indent
 \&.It Em Tag
 The tagged list (also called a tagged paragraph)
 is the most common type of list used in the
@@ -3671,12 +3693,18 @@
 was produced by:
 .
 .Bd -literal
-\&.Bl -column -offset indent ".Sy String" ".Sy Nroff" ".Sy Troff"
+\&.Bl \-column \-offset indent ".Sy String" ".Sy Nroff" ".Sy Troff"
 \&.It Sy String Ta Sy Nroff Ta Sy Troff
 \&.It Li <= Ta <= Ta \e*(<=
 \&.It Li >= Ta >= Ta \e*(>=
 \&.El
 .Ed
+.Pp
+.
+Don't abuse this list type!
+For more complicated cases it might be far better and easier to use
+.Xr tbl 1 ,
+the table preprocessor.
 .El
 .Pp
 .
@@ -3698,7 +3726,7 @@
 Example:
 .
 .Bd -literal -offset indent
-\&.Bl -tag -width ".Fl test Ao Ar string Ac"
+\&.Bl \-tag \-width ".Fl test Ao Ar string Ac"
 \&.It Fl test Ao Ar string Ac
 This is a longer sentence to show how the
 \&.Fl width
@@ -4007,19 +4035,19 @@
 .Xr groff 1 ,
 resulting in multiple pages instead of a single, very long page:
 .Pp
-.Dl groff -Tlatin1 -rcR=0 -mdoc foo.man > foo.txt
+.Dl groff \-Tlatin1 \-rcR=0 \-mdoc foo.man > foo.txt
 .Pp
 For double-sided printing, set register
 .Ql D
 to\~1:
 .Pp
-.Dl groff -Tps -rD1 -mdoc foo.man > foo.ps
+.Dl groff \-Tps \-rD1 \-mdoc foo.man > foo.ps
 .Pp
 To change the document font size to 11pt or 12pt, set register
 .Ql S
 accordingly:
 .Pp
-.Dl groff -Tdvi -rS11 -mdoc foo.man > foo.dvi
+.Dl groff \-Tdvi \-rS11 \-mdoc foo.man > foo.dvi
 .Pp
 Register
 .Ql S
@@ -4033,7 +4061,7 @@
 .Ql LT ,
 respectively:
 .Pp
-.Dl groff -Tutf8 -rLL=100n -rLT=100n -mdoc foo.man | less
+.Dl groff \-Tutf8 \-rLL=100n \-rLT=100n \-mdoc foo.man | less
 .Pp
 If not set, both registers default to 78n for TTY devices and 6.5i
 otherwise.

==== //depot/projects/dtrace6/src/crypto/openssl/ssl/ssl_lib.c#2 (text+ko) ====

@@ -1149,7 +1149,6 @@
 char *SSL_get_shared_ciphers(SSL *s,char *buf,int len)
 	{
 	char *p;
-	const char *cp;
 	STACK_OF(SSL_CIPHER) *sk;
 	SSL_CIPHER *c;
 	int i;
@@ -1162,20 +1161,21 @@
 	sk=s->session->ciphers;
 	for (i=0; i<sk_SSL_CIPHER_num(sk); i++)
 		{
-		/* Decrement for either the ':' or a '\0' */
-		len--;
+		int n;
+
 		c=sk_SSL_CIPHER_value(sk,i);
-		for (cp=c->name; *cp; )
+		n=strlen(c->name);
+		if (n+1 > len)
 			{
-			if (len-- <= 0)
-				{
-				*p='\0';
-				return(buf);
-				}
-			else
-				*(p++)= *(cp++);
+			if (p != buf)
+				--p;
+			*p='\0';
+			return buf;
 			}
+		strcpy(p,c->name);
+		p+=n;
 		*(p++)=':';
+		len-=n+1;
 		}
 	p[-1]='\0';
 	return(buf);

==== //depot/projects/dtrace6/src/gnu/usr.bin/groff/tmac/mdoc.local#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/gnu/usr.bin/groff/tmac/mdoc.local,v 1.48.2.9 2006/09/16 01:31:48 kensmith Exp $
+.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.48.2.11 2007/10/04 04:56:41 ru Exp $
 .\"
 .\"     %beginstrip%
 .
@@ -58,13 +58,14 @@
 .ds doc-str-Lb-libugidfw   File System Firewall Interface Library (libugidfw, \-lugidfw)
 .ds doc-str-Lb-libvgl      Video Graphics Library (libvgl, \-lvgl)
 .
+.\" FreeBSD architectures not found in doc-common
+.ds doc-volume-as-arm      arm
+.
 .\" Default .Os value
 .ds doc-default-operating-system FreeBSD\~6.2
 .
 .\" FreeBSD releases not found in doc-common
-.ds doc-operating-system-FreeBSD-5.5    5.5
-.ds doc-operating-system-FreeBSD-6.2    6.2
-.ds doc-operating-system-FreeBSD-7.0    7.0
+.ds doc-operating-system-FreeBSD-6.3    6.3
 .
 .ec
 .

==== //depot/projects/dtrace6/src/sbin/adjkerntz/adjkerntz.c#2 (text+ko) ====

@@ -32,7 +32,7 @@
 #endif /* not lint */
 #endif
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.29 2004/04/27 14:43:03 ghelmer Exp $");
+__FBSDID("$FreeBSD: src/sbin/adjkerntz/adjkerntz.c,v 1.29.8.1 2007/10/02 05:44:53 ru Exp $");
 
 /*
  * Andrey A. Chernov   <ache@astral.msk.su>    Dec 20 1993
@@ -127,7 +127,13 @@
 
 	(void) signal(SIGHUP, SIG_IGN);
 
-	if (init && daemon(0, 1)) {
+	if (init && daemon(0,
+#ifdef DEBUG
+	    1
+#else
+	    0
+#endif
+	    )) {
 		syslog(LOG_ERR, "daemon: %m");
 		return 1;
 	}

==== //depot/projects/dtrace6/src/sys/alpha/isa/isa.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36.8.1 2006/03/10 19:37:30 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.36.8.2 2007/10/03 20:41:32 jhb Exp $");
 
 #define __RMAN_RESOURCE_VISIBLE
 #include <sys/param.h>
@@ -232,6 +232,7 @@
 	    res = rman_reserve_resource(&isa_drq_rman, start, start, 1,
 					0, child);
 	    
+	rman_set_rid(res, *rid);
 	if (res && !passthrough) {
 		rle = resource_list_find(rl, type, *rid);
 		rle->start = rman_get_start(res);

==== //depot/projects/dtrace6/src/sys/alpha/pci/apecs_pci.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15.10.1 2007/10/03 20:41:33 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -79,12 +79,17 @@
 apecs_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid,
 			  u_long start, u_long end, u_long count, u_int flags)
 {
+	struct resource *rv = NULL;
+
 	if ((hwrpb->rpb_type == ST_DEC_2100_A50) &&
 	    (type == SYS_RES_IRQ))
-		return isa_alloc_intr(bus, child, start);
+		rv = isa_alloc_intr(bus, child, start);
 	else
-		return alpha_pci_alloc_resource(bus, child, type, rid,
-					  start, end, count, flags);
+		rv = alpha_pci_alloc_resource(bus, child, type, rid,
+		    start, end, count, flags);
+	if (rv != NULL)
+		rman_set_rid(rv, *rid);
+	return (rv);
 }
 
 static int

==== //depot/projects/dtrace6/src/sys/alpha/pci/lca_pci.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17 2003/08/22 07:20:27 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/lca_pci.c,v 1.17.10.1 2007/10/03 20:41:33 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -78,11 +78,16 @@
 lca_pcib_alloc_resource(device_t bus, device_t child, int type, int *rid,
 			u_long start, u_long end, u_long count, u_int flags)
 {
+	struct resource *rv = NULL;
+
 	if (type == SYS_RES_IRQ)
-		return isa_alloc_intr(bus, child, start);
+		rv = isa_alloc_intr(bus, child, start);
 	else
-		return alpha_pci_alloc_resource(bus, child, type, rid,
-					  start, end, count, flags);
+		rv = alpha_pci_alloc_resource(bus, child, type, rid,
+		    start, end, count, flags);
+	if (rv != NULL)
+		rman_set_rid(rv, *rid);
+	return (rv);
 }
 
 static int

==== //depot/projects/dtrace6/src/sys/alpha/pci/pcibus.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36 2005/01/05 20:05:52 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/pci/pcibus.c,v 1.36.2.1 2007/10/03 20:41:33 jhb Exp $");
 
 #include "opt_isa.h"
 
@@ -97,7 +97,12 @@
 alpha_platform_alloc_ide_intr(int chan)
 {
 	int irqs[2] = { 14, 15 };
-	return isa_alloc_intr(0, 0, irqs[chan]);
+	struct resource *rv;
+
+	rv = isa_alloc_intr(0, 0, irqs[chan]);
+	if (rv != NULL)
+		rman_set_rid(rv, *rid);
+	return (rv);
 }
 
 int
@@ -230,9 +235,11 @@
 #ifdef DEV_ISA
 		if((start >= ISA_IRQ_OFFSET) &&
 		   (end < ISA_IRQ_OFFSET + ISA_IRQ_LEN)) {
-		  	return isa_alloc_intrs(bus, child,
-					       start - ISA_IRQ_OFFSET,
-					       end - ISA_IRQ_OFFSET);
+		  	rv = isa_alloc_intrs(bus, child,
+			    start - ISA_IRQ_OFFSET, end - ISA_IRQ_OFFSET);
+			if (rv != NULL)
+				rman_set_rid(rv, *rid);
+			return (rv);
 		}
 		else
 #endif
@@ -252,6 +259,7 @@
 	if (rv == 0)
 		return 0;
 
+	rman_set_rid(rv, *rid);
 	rman_set_bustag(rv, ALPHAPCI_GET_BUSTAG(bus, type));
 	rman_set_bushandle(rv, rv->r_start);
 	switch (type) {

==== //depot/projects/dtrace6/src/sys/amd64/amd64/nexus.c#2 (text+ko) ====


>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 02:17:14 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8AB9616A41B; Fri,  5 Oct 2007 02:17:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3E43816A417
	for <perforce@freebsd.org>; Fri,  5 Oct 2007 02:17:14 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 174CA13C467
	for <perforce@freebsd.org>; Fri,  5 Oct 2007 02:17:14 +0000 (UTC)
	(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l952HEpO027164
	for <perforce@freebsd.org>; Fri, 5 Oct 2007 02:17:14 GMT
	(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l952HD6O027161
	for perforce@freebsd.org; Fri, 5 Oct 2007 02:17:13 GMT
	(envelope-from jb@freebsd.org)
Date: Fri, 5 Oct 2007 02:17:13 GMT
Message-Id: <200710050217.l952HD6O027161@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127214 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 02:17:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=127214

Change 127214 by jb@jb_freebsd1 on 2007/10/05 02:16:43

	IFopensolaris

Affected files ...

.. //depot/projects/dtrace/src/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.ucaller.d#1 branch

Differences ...

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 04:56:14 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3028316A41B; Fri,  5 Oct 2007 04:56:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 18BD016A418
	for <perforce@freebsd.org>; Fri,  5 Oct 2007 04:56:13 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F2C1713C448
	for <perforce@freebsd.org>; Fri,  5 Oct 2007 04:56:12 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l954uCDu047864
	for <perforce@freebsd.org>; Fri, 5 Oct 2007 04:56:12 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l954uCTX047861
	for perforce@freebsd.org; Fri, 5 Oct 2007 04:56:12 GMT
	(envelope-from sam@freebsd.org)
Date: Fri, 5 Oct 2007 04:56:12 GMT
Message-Id: <200710050456.l954uCTX047861@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127216 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 04:56:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=127216

Change 127216 by sam@sam_ebb on 2007/10/05 04:55:38

	Checkpoint work:
	o add amrr rate control; need to check if data_txcnt is
	  the retry count (for now assume it's tries and -1)
	o hold node for tx mgt frames and implement M_TXCB
	o fix 4-byte register read that should be 2 bytes
	  (noticed in obsd commit)

Affected files ...

.. //depot/projects/wifi/sys/dev/bwi/bwimac.c#2 edit
.. //depot/projects/wifi/sys/dev/bwi/bwiphy.c#2 edit
.. //depot/projects/wifi/sys/dev/bwi/bwirf.c#2 edit
.. //depot/projects/wifi/sys/dev/bwi/if_bwi.c#2 edit
.. //depot/projects/wifi/sys/dev/bwi/if_bwi_pci.c#2 edit
.. //depot/projects/wifi/sys/dev/bwi/if_bwivar.h#2 edit

Differences ...

==== //depot/projects/wifi/sys/dev/bwi/bwimac.c#2 (text+ko) ====

@@ -64,6 +64,7 @@
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
+#include <net80211/ieee80211_amrr.h>
 
 #include <machine/bus.h>
 
@@ -345,7 +346,7 @@
 	/*
 	 * Initialize PHY
 	 */
-	CSR_WRITE_4(sc, BWI_BBP_ATTEN, 0);
+	CSR_WRITE_2(sc, BWI_BBP_ATTEN, 0);
 	bwi_phy_init(mac);
 
 	/* TODO: interference mitigation */

==== //depot/projects/wifi/sys/dev/bwi/bwiphy.c#2 (text+ko) ====

@@ -61,6 +61,7 @@
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
+#include <net80211/ieee80211_amrr.h>
 
 #include <machine/bus.h>
 

==== //depot/projects/wifi/sys/dev/bwi/bwirf.c#2 (text+ko) ====

@@ -61,6 +61,7 @@
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
+#include <net80211/ieee80211_amrr.h>
 
 #include <machine/bus.h>
 

==== //depot/projects/wifi/sys/dev/bwi/if_bwi.c#2 (text+ko) ====

@@ -62,6 +62,7 @@
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
 #include <net80211/ieee80211_regdomain.h>
+#include <net80211/ieee80211_amrr.h>
 
 #include <net/bpf.h>
 
@@ -100,6 +101,9 @@
 static void	bwi_scan_end(struct ieee80211com *);
 static int	bwi_newstate(struct ieee80211com *, enum ieee80211_state, int);
 static void	bwi_updateslot(struct ifnet *);
+static struct ieee80211_node *bwi_node_alloc(struct ieee80211_node_table *);
+static void	bwi_newassoc(struct ieee80211_node *, int);
+static void	bwi_amrr_timeout(void *);
 static int	bwi_media_change(struct ifnet *);
 
 static void	bwi_calibrate(void *);
@@ -355,6 +359,7 @@
 		device_get_unit(sc->sc_dev));
 
 	callout_init(&sc->sc_calib_ch, CALLOUT_MPSAFE);
+	callout_init(&sc->sc_amrr_ch, CALLOUT_MPSAFE);
 
 	ifp->if_softc = sc;
 	ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
@@ -428,8 +433,13 @@
 	ic->ic_scan_start = bwi_scan_start;
 	ic->ic_scan_end = bwi_scan_end;
 	ic->ic_set_channel = bwi_set_channel;
+	ic->ic_node_alloc = bwi_node_alloc;
+	ic->ic_newassoc = bwi_newassoc;
 	/* complete initialization */
 	ieee80211_media_init(ic, bwi_media_change, ieee80211_media_status);
+	ieee80211_amrr_init(&sc->sc_amrr, ic,
+	    IEEE80211_AMRR_MIN_SUCCESS_THRESHOLD,
+	    IEEE80211_AMRR_MAX_SUCCESS_THRESHOLD);
 
 	/*
 	 * Attach radio tap
@@ -462,6 +472,7 @@
 	int i;
 
 	bwi_stop(sc);
+	callout_stop(&sc->sc_amrr_ch);
 	ieee80211_ifdetach(&sc->sc_ic);
 
 	for (i = 0; i < sc->sc_nmac; ++i)
@@ -1207,14 +1218,11 @@
 		struct ieee80211_frame *wh;
 		struct ieee80211_node *ni;
 		struct mbuf *m;
-		int mgt_pkt = 0;
 
 		IF_DEQUEUE(&ic->ic_mgtq, m);
 		if (m != NULL) {
 			ni = (struct ieee80211_node *)m->m_pkthdr.rcvif;
 			m->m_pkthdr.rcvif = NULL;
-
-			mgt_pkt = 1;
 		} else {
 			struct ether_header *eh;
 
@@ -1267,11 +1275,6 @@
 		}
 		wh = NULL;	/* Catch any invalid use */
 
-		if (mgt_pkt) {
-			ieee80211_free_node(ni);
-			ni = NULL;
-		}
-
 		if (bwi_encap(sc, idx, m, ni) != 0) {
 			/* 'm' is freed in bwi_encap() if we reach here */
 			if (ni != NULL)
@@ -1520,6 +1523,7 @@
 	BWI_LOCK(sc);
 
 	callout_stop(&sc->sc_calib_ch);
+	callout_stop(&sc->sc_amrr_ch);
 
 	if (nstate == IEEE80211_S_INIT)
 		goto back;
@@ -1537,6 +1541,11 @@
 
 		/* Initial TX power calibration */
 		bwi_mac_calibrate_txpower(mac);
+
+		/* start automatic rate control timer */
+		if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE)
+			callout_reset(&sc->sc_amrr_ch, hz / 2,
+			    bwi_amrr_timeout, sc);
 	} else {
 		bwi_set_bssid(sc, bwi_zero_addr);
 	}
@@ -1553,6 +1562,56 @@
 	return error;
 }
 
+/* ARGUSED */
+static struct ieee80211_node *
+bwi_node_alloc(struct ieee80211_node_table *nt __unused)
+{
+	struct bwi_node *bn;
+
+	bn = malloc(sizeof(struct bwi_node), M_80211_NODE, M_NOWAIT | M_ZERO);
+	return bn != NULL ? &bn->ni : NULL;
+}
+
+static void
+bwi_newassoc(struct ieee80211_node *ni, int isnew)
+{
+	struct bwi_softc *sc = ni->ni_ic->ic_ifp->if_softc;
+	int i;
+
+	ieee80211_amrr_node_init(&sc->sc_amrr, &((struct bwi_node *)ni)->amn);
+
+	/* set rate to some reasonable initial value */
+	for (i = ni->ni_rates.rs_nrates - 1;
+	     i > 0 && (ni->ni_rates.rs_rates[i] & IEEE80211_RATE_VAL) > 72;
+	     i--);
+	ni->ni_txrate = i;
+}
+
+static void
+bwi_iter_func(void *arg, struct ieee80211_node *ni)
+{
+	struct bwi_softc *sc = arg;
+	struct bwi_node *bn = (struct bwi_node *)ni;
+
+	ieee80211_amrr_choose(&sc->sc_amrr, ni, &bn->amn);
+}
+
+static void
+bwi_amrr_timeout(void *arg)
+{
+	struct bwi_softc *sc = arg;
+	struct ieee80211com *ic = &sc->sc_ic;
+
+	BWI_LOCK(sc);
+	if (ic->ic_opmode == IEEE80211_M_STA)
+		bwi_iter_func(sc, ic->ic_bss);
+	else
+		ieee80211_iterate_nodes(&ic->ic_sta, bwi_iter_func, sc);
+	BWI_UNLOCK(sc);
+
+	callout_reset(&sc->sc_amrr_ch, hz / 2, bwi_amrr_timeout, sc);
+}
+
 static int
 bwi_media_change(struct ifnet *ifp)
 {
@@ -2736,28 +2795,15 @@
 	 * Find TX rate
 	 */
 	bzero(tb->tb_rate_idx, sizeof(tb->tb_rate_idx));
-	if (ni != NULL) {
-		if (ic->ic_fixed_rate != IEEE80211_FIXED_RATE_NONE) {
-			/* NB: no fallback */
-			rate = rate_fb = ic->ic_fixed_rate;
-		} else {
-			/* TODO: TX rate control */
-			rate = rate_fb = (1 * 2);
-		}
-	} else {
-		/* Fixed at 1Mbits/s for mgt frames */
-		rate = rate_fb = (1 * 2);
-	}
-
 	if (IEEE80211_IS_MULTICAST(wh->i_addr1))
 		rate = rate_fb = ic->ic_mcast_rate;
+	else if (ic->ic_fixed_rate == IEEE80211_FIXED_RATE_NONE) {
+		rate = ni->ni_rates.rs_rates[ni->ni_txrate] & IEEE80211_RATE_VAL;
+		rate_fb = (ni->ni_txrate > 0) ?
+		   ni->ni_rates.rs_rates[ni->ni_txrate-1] & IEEE80211_RATE_VAL : rate;
+	} else
+		rate = rate_fb = ic->ic_fixed_rate;
 
-	if (rate == 0 || rate_fb == 0) {
-		if_printf(ic->ic_ifp, "invalid rate %u or fallback rate %u",
-			  rate, rate_fb);
-		rate = rate_fb = (1 * 2); /* Force 1Mbits/s */
-	}
-
 	/*
 	 * TX radio tap
 	 */
@@ -2790,14 +2836,14 @@
 	bcopy(wh->i_fc, hdr->txh_fc, sizeof(hdr->txh_fc));
 	bcopy(wh->i_addr1, hdr->txh_addr1, sizeof(hdr->txh_addr1));
 
-	if (ni != NULL && !IEEE80211_IS_MULTICAST(wh->i_addr1)) {
+	if (!IEEE80211_IS_MULTICAST(wh->i_addr1)) {
 		uint16_t dur;
 		uint8_t ack_rate;
 
 		ack_rate = ieee80211_ack_rate(ni, rate_fb);
 		dur = ieee80211_txtime(ni,
-		sizeof(struct ieee80211_frame_ack) + IEEE80211_CRC_LEN,
-		ack_rate, ic->ic_flags & ~IEEE80211_F_SHPREAMBLE);
+		    sizeof(struct ieee80211_frame_ack) + IEEE80211_CRC_LEN,
+		    ack_rate, ic->ic_flags & ~IEEE80211_F_SHPREAMBLE);
 
 		hdr->txh_fb_duration = htole16(dur);
 	}
@@ -2940,6 +2986,7 @@
 	struct bwi_txbuf_data *tbd;
 	struct bwi_txbuf *tb;
 	int ring_idx, buf_idx;
+	struct ieee80211_node *ni;
 
 	if (tx_id == 0) {
 		if_printf(ifp, "zero tx id\n");
@@ -2966,14 +3013,30 @@
 	tb = &tbd->tbd_buf[buf_idx];
 
 	bus_dmamap_unload(sc->sc_buf_dtag, tb->tb_dmap);
-	m_freem(tb->tb_mbuf);
-	tb->tb_mbuf = NULL;
 
+	ni = tb->tb_ni;
 	if (tb->tb_ni != NULL) {
+		struct bwi_node *bn = (struct bwi_node *) tb->tb_ni;
+
+		/* XXX only for unicast frames */
 		/* Feed back 'acked and data_txcnt' */
+		if (acked)
+			bn->amn.amn_success++;
+		bn->amn.amn_txcnt++;
+		bn->amn.amn_retrycnt += data_txcnt-1;
+
+		/*
+		 * Do any tx complete callback.  Note this must
+		 * be done before releasing the node reference.
+		 */
+		if (tb->tb_mbuf->m_flags & M_TXCB)
+			ieee80211_process_callback(ni, tb->tb_mbuf, !acked);
+
 		ieee80211_free_node(tb->tb_ni);
 		tb->tb_ni = NULL;
 	}
+	m_freem(tb->tb_mbuf);
+	tb->tb_mbuf = NULL;
 
 	if (tbd->tbd_used == 0)
 		sc->sc_tx_timer = 0;

==== //depot/projects/wifi/sys/dev/bwi/if_bwi_pci.c#2 (text+ko) ====

@@ -55,6 +55,7 @@
 
 #include <net80211/ieee80211_var.h>
 #include <net80211/ieee80211_radiotap.h>
+#include <net80211/ieee80211_amrr.h>
 
 #include <dev/pci/pcivar.h>
 #include <dev/pci/pcireg.h>
@@ -285,3 +286,4 @@
 MODULE_VERSION(if_bwi, 1);
 MODULE_DEPEND(if_bwi, wlan, 1, 1, 1);		/* 802.11 media layer */
 MODULE_DEPEND(if_bwi, firmware, 1, 1, 1);	/* firmware support */
+MODULE_DEPEND(if_bwi, wlan_amrr, 1, 1, 1);

==== //depot/projects/wifi/sys/dev/bwi/if_bwivar.h#2 (text+ko) ====

@@ -488,9 +488,15 @@
 	/* TODO: sq */
 };
 
+struct bwi_node {
+	struct ieee80211_node		ni;	/* must be the first */
+	struct ieee80211_amrr_node	amn;
+};
+
 struct bwi_softc {
 	struct ifnet		*sc_ifp;
 	struct ieee80211com	sc_ic;
+	struct ieee80211_amrr	sc_amrr;
 	uint32_t		sc_flags;	/* BWI_F_ */
 	device_t		sc_dev;
 	struct mtx		sc_mtx;
@@ -520,6 +526,7 @@
 	bus_space_handle_t	sc_mem_bh;
 
 	struct callout		sc_calib_ch;
+	struct callout		sc_amrr_ch;
 
 	struct bwi_regwin	*sc_cur_regwin;
 	struct bwi_regwin	sc_com_regwin;

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 10:59:56 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BA90216A420; Fri,  5 Oct 2007 10:59:56 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 4309B16A41A
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 10:59:56 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 2669B13C458
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 10:59:56 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l95AxuxW088999
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 10:59:56 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l95Axtpd088996
	for perforce@freebsd.org; Fri, 5 Oct 2007 10:59:56 GMT
	(envelope-from fli@FreeBSD.org)
Date: Fri, 5 Oct 2007 10:59:56 GMT
Message-Id: <200710051059.l95Axtpd088996@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127222 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 10:59:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=127222

Change 127222 by fli@fli_genesis on 2007/10/05 10:59:46

	Must supply a pointer to a record_res {} as record_res_add() will
	return a pointer to the new resource through this argument.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/input.c#2 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/input.c#2 (text+ko) ====

@@ -134,7 +134,7 @@
 		error = mdns_pkg_getauth(pkg, i, &rs);
 		if (error != 0)
 			break;
-		record_res_add(&auth, NULL, 0, NULL, rs.r_name, rs.r_class,
+		record_res_add(&auth, &rr, 0, NULL, rs.r_name, rs.r_class,
 		    rs.r_type, rs.r_data, rs.r_datalen);
 	}
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 11:57:00 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E949D16A543; Fri,  5 Oct 2007 11:56:59 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9ECA316A418
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 11:56:59 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 82DAC13C45B
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 11:56:59 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l95Bux8g093085
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 11:56:59 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l95BuxHE093082
	for perforce@freebsd.org; Fri, 5 Oct 2007 11:56:59 GMT
	(envelope-from fli@FreeBSD.org)
Date: Fri, 5 Oct 2007 11:56:59 GMT
Message-Id: <200710051156.l95BuxHE093082@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127223 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 11:57:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=127223

Change 127223 by fli@fli_genesis on 2007/10/05 11:56:26

	- Add obj_clean() that garbage collects old objects.
	- Add obj_destroy() to free objects on shutdown.
	- Don't call obj_flush() in obj_free(), obj_clean does that now.
	- Minor whitespace fixes.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.c#3 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.h#3 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.c#3 (text+ko) ====

@@ -78,7 +78,7 @@
 	{ .os_sz = sizeof(struct cs_client) },
 	/* Query consumer */
 	{ .os_sz = sizeof(struct query_cons) },
-	/* Query type */ 
+	/* Query type */
 	{ .os_sz = sizeof(struct query_type) },
 	/* Outstanding UNIX pipe client query */
 	{ .os_sz = sizeof(struct csc_query) }
@@ -131,6 +131,51 @@
 }
 
 /*
+ * Destroy and free object types
+ */
+void
+obj_destroy()
+{
+	struct objs *os;
+	struct obj *o, *o2;
+	int i;
+
+	for (i = 0; i < obj_table_size; i++) {
+		os = &obj_table[i];
+		MDNS_INIT_ASSERT(os, os_magic);
+		MTX_LOCK(os, os_mtx);
+		TAILQ_FOREACH_SAFE(o, &os->os_free, o_next, o2) {
+			TAILQ_REMOVE(&os->os_free, o, o_next);
+			free(o);
+		}
+
+		MDNS_INIT_UNSET(os, os_magic);
+		MTX_UNLOCK(os, os_mtx);
+		MTX_DESTROY(os, os_mtx);
+	}
+	dprintf(DEBUG_OA, "Object allocator destroyed");
+}
+
+/*
+ * Garbage collect old objects
+ */
+void
+obj_clean()
+{
+	int i;
+	struct objs *os;
+
+	dprintf(DEBUG_OA, "Garbage collecting objects");
+	for (i = 0; i < obj_table_size; i++) {
+		os = &obj_table[i];
+		MDNS_INIT_ASSERT(os, os_magic);
+		MTX_LOCK(os, os_mtx);
+		obj_flush(i);
+		MTX_UNLOCK(os, os_mtx);
+	}
+}
+
+/*
  * Allocate an object of `type'
  */
 void *
@@ -185,6 +230,5 @@
 	MTX_LOCK(os, os_mtx);
 	TAILQ_INSERT_HEAD(&os->os_free, o, o_next);
 	dprintf(DEBUG_OA, "Released object type=%d o=%x", type, o);
-	obj_flush(type);
 	MTX_UNLOCK(os, os_mtx);
 }

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/objalloc.h#3 (text+ko) ====

@@ -27,8 +27,8 @@
 #ifndef _OBJALLOC_H_
 #define _OBJALLOC_H_
 
-#define OBJ_PKGCHAIN	0 /* struct mdns_pkgchain {} */	
-#define OBJ_PKG			1 /* struct mdns_packet {} */ 
+#define OBJ_PKGCHAIN		0 /* struct mdns_pkgchain {} */	
+#define OBJ_PKG			1 /* struct mdns_packet {} */
 #define OBJ_PKGRES		2 /* struct mdns_pkg_res {} */
 #define OBJ_PAC			3 /* struct dbr_pac {} */
 #define OBJ_OQE			4 /* struct oq_entry {} */
@@ -39,6 +39,8 @@
 #define _OBJ_MAX		8
 
 void obj_init(void);
+void obj_destroy(void);
+void obj_clean(void);
 void * obj_alloc(int);
 void obj_free(int, void *);
 

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 11:58:09 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AA94516A4D1; Fri,  5 Oct 2007 11:58:09 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 64F2316A4A0
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 11:58:09 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B5F6013C49D
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 11:58:01 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l95Bw1ui093119
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 11:58:01 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l95Bw1Ar093114
	for perforce@freebsd.org; Fri, 5 Oct 2007 11:58:01 GMT
	(envelope-from fli@FreeBSD.org)
Date: Fri, 5 Oct 2007 11:58:01 GMT
Message-Id: <200710051158.l95Bw1Ar093114@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127224 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 11:58:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=127224

Change 127224 by fli@fli_genesis on 2007/10/05 11:57:44

	- Add a periodic timer that calls obj_clean().
	- Add a call to obj_destroy() on exit to free memory. 

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#8 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#8 (text+ko) ====

@@ -153,6 +153,17 @@
 }
 
 /*
+ * Periodic object garabge collector, runs every 60 seconds
+ */
+static int
+evh_objclean(const struct event_tmr *ev __unused, const ev_arg arg __unused)
+{
+
+	obj_clean();
+	return (0);
+}
+
+/*
  * Link state change.
  * This routine is called 3 seconds after the real link state change
  * occured, this is to catch and ignore sporadic link changes.
@@ -957,6 +968,7 @@
 	freeifaddrs(ifap);
 
 	tmr_start(&glob, 1000, evh_cacheclean, &glob, 0);
+	tmr_start(&glob, 60000, evh_objclean, NULL, 0);
 
 	uid = getuid();
 	euid = geteuid();
@@ -1001,6 +1013,7 @@
 	wq_destroy(glob.g_wq);
 	event_destroy(glob.g_evl);
 	mdns_bufpool_destroy(glob.g_bp);
+	obj_destroy();
 
 	return (0);
 }

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 12:27:35 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7C53C16A420; Fri,  5 Oct 2007 12:27:35 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E9CB416A417
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 12:27:34 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 971BF13C447
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 12:27:34 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l95CRYFK095930
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 12:27:34 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l95CRXee095927
	for perforce@freebsd.org; Fri, 5 Oct 2007 12:27:33 GMT
	(envelope-from zec@FreeBSD.org)
Date: Fri, 5 Oct 2007 12:27:33 GMT
Message-Id: <200710051227.l95CRXee095927@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127225 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 12:27:35 -0000

http://perforce.freebsd.org/chv.cgi?CH=127225

Change 127225 by zec@zec_tpx32 on 2007/10/05 12:27:00

	IFC @ 127220

Affected files ...

.. //depot/projects/vimage/src/sys/amd64/amd64/legacy.c#3 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#9 integrate
.. //depot/projects/vimage/src/sys/amd64/include/legacyvar.h#2 integrate
.. //depot/projects/vimage/src/sys/amd64/pci/pci_bus.c#5 integrate
.. //depot/projects/vimage/src/sys/arm/arm/locore.S#3 integrate
.. //depot/projects/vimage/src/sys/arm/conf/AVILA#4 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321_pci.c#4 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/i8134x/i81342_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_npe.c#4 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_npevar.h#3 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_pci.c#4 integrate
.. //depot/projects/vimage/src/sys/boot/common/module.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/forth/loader.conf#7 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#17 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/npe/IxNpeMicrocode.dat.uu#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/npe/LICENSE#1 branch
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_pci.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/cardbus/cardbus.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/gem/if_gem.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/gem/if_gem_pci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/gem/if_gemreg.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/gem/if_gemvar.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/pccbb/pccbb.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/pccbb/pccbb_pci.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/pccbb/pccbbvar.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pci.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pci_pci.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pci_private.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pcib_private.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pcivar.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_axe.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_axereg.h#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#12 integrate
.. //depot/projects/vimage/src/sys/dev/usb/uscanner.c#4 integrate
.. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vfsops.c#6 integrate
.. //depot/projects/vimage/src/sys/geom/geom_event.c#2 integrate
.. //depot/projects/vimage/src/sys/i386/conf/GENERIC#11 integrate
.. //depot/projects/vimage/src/sys/i386/i386/legacy.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/include/legacyvar.h#2 integrate
.. //depot/projects/vimage/src/sys/i386/pci/pci_bus.c#5 integrate
.. //depot/projects/vimage/src/sys/ia64/conf/GENERIC#5 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sx.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/sched_ule.c#13 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_bio.c#8 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#12 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#26 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#15 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#17 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#19 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_input.c#20 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.c#19 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.h#10 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#19 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#15 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#20 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_var.h#13 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.c#20 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_bio.c#6 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_nfsiod.c#2 integrate
.. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#6 integrate
.. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/conf/NOTES#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/grackle.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powermac/uninorth.c#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/apb.c#2 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcibus.c#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#8 integrate
.. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#6 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/hv_pci.c#3 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#11 integrate
.. //depot/projects/vimage/src/sys/sys/pciio.h#2 integrate
.. //depot/projects/vimage/src/sys/vm/vm_object.c#8 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.c#10 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.h#7 integrate

Differences ...

==== //depot/projects/vimage/src/sys/amd64/amd64/legacy.c#3 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.60 2007/03/20 20:21:44 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.61 2007/09/30 11:05:13 marius Exp $");
 
 /*
  * This code implements a system driver for legacy systems that do not
@@ -207,6 +207,9 @@
 	struct legacy_device *atdev = DEVTOAT(child);
 
 	switch (which) {
+	case LEGACY_IVAR_PCIDOMAIN:
+		*result = 0;
+		break;
 	case LEGACY_IVAR_PCIBUS:
 		*result = atdev->lg_pcibus;
 		break;
@@ -223,6 +226,8 @@
 	struct legacy_device *atdev = DEVTOAT(child);
 
 	switch (which) {
+	case LEGACY_IVAR_PCIDOMAIN:
+		return EINVAL;
 	case LEGACY_IVAR_PCIBUS:
 		atdev->lg_pcibus = value;
 		break;

==== //depot/projects/vimage/src/sys/amd64/conf/GENERIC#9 (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.483 2007/07/01 21:47:45 njl Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.484 2007/09/26 20:05:06 brueffer Exp $
 
 cpu		HAMMER
 ident		GENERIC
@@ -30,7 +30,7 @@
 options 	PREEMPTION		# Enable kernel thread preemption
 options 	INET			# InterNETworking
 options 	INET6			# IPv6 communications protocols
-options 	SCTP			# Stream Transmission Control Protocol 
+options 	SCTP			# Stream Control Transmission Protocol 
 options 	FFS			# Berkeley Fast Filesystem
 options 	SOFTUPDATES		# Enable FFS soft updates support
 options 	UFS_ACL			# Support for access control lists

==== //depot/projects/vimage/src/sys/amd64/include/legacyvar.h#2 (text+ko) ====

@@ -23,19 +23,21 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.7 2005/09/18 01:42:43 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/legacyvar.h,v 1.8 2007/09/30 11:05:13 marius Exp $
  */
 
 #ifndef _MACHINE_LEGACYVAR_H_
 #define	_MACHINE_LEGACYVAR_H_
 
 enum legacy_device_ivars {
+	LEGACY_IVAR_PCIDOMAIN,
 	LEGACY_IVAR_PCIBUS
 };
 
 #define LEGACY_ACCESSOR(var, ivar, type)				\
     __BUS_ACCESSOR(legacy, var, LEGACY, ivar, type)
 
+LEGACY_ACCESSOR(pcidomain,		PCIDOMAIN,	uint32_t)
 LEGACY_ACCESSOR(pcibus,			PCIBUS,		uint32_t)
 
 #undef LEGACY_ACCESSOR

==== //depot/projects/vimage/src/sys/amd64/pci/pci_bus.c#5 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.121 2007/05/02 17:50:34 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.122 2007/09/30 11:05:13 marius Exp $");
 
 #include "opt_cpu.h"
 
@@ -276,6 +276,9 @@
 {
 
 	switch (which) {
+	case  PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return 0;
 	case  PCIB_IVAR_BUS:
 		*result = legacy_get_pcibus(dev);
 		return 0;
@@ -289,6 +292,8 @@
 {
 
 	switch (which) {
+	case  PCIB_IVAR_DOMAIN:
+		return EINVAL;
 	case  PCIB_IVAR_BUS:
 		legacy_set_pcibus(dev, value);
 		return 0;

==== //depot/projects/vimage/src/sys/arm/arm/locore.S#3 (text+ko) ====

@@ -37,7 +37,7 @@
 #include <machine/asm.h>
 #include <machine/armreg.h>
 #include <machine/pte.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.16 2007/02/26 02:03:48 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/locore.S,v 1.17 2007/09/27 20:52:17 cognet Exp $");
 
 /* What size should this really be ? It is only used by initarm() */
 #define INIT_ARM_STACK_SIZE	2048
@@ -134,7 +134,7 @@
 	adds	r1, r1, #-1
 	bhi	2b
 3:
-	ldmia	r4!, {r1,r2,r3}   /* # of sections, PA|attr, VA */
+	ldmia	r4!, {r1,r2,r3}   /* # of sections, VA, PA|attr */
 	cmp	r1, #0
 	adrne	r5, 2b
 	bicne	r5, r5, #0xff000000

==== //depot/projects/vimage/src/sys/arm/conf/AVILA#4 (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/arm/conf/AVILA,v 1.4 2007/05/24 16:27:48 sam Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.6 2007/09/27 22:39:49 cognet Exp $
 
 machine		arm
 ident		AVILA
@@ -104,8 +104,8 @@
 device		avila_ata	# Gateworks CF/IDE support
 
 device		npe		# Network Processing Engine
-device		npe_fw		# NPE firmware
-device		firmware	# firmware support for npe_fw
+device		npe_fw
+device		firmware
 device		qmgr		# Q Manager (required by npe)
 device		miibus		# NB: required by npe
 device		ether

==== //depot/projects/vimage/src/sys/arm/xscale/i80321/i80321_pci.c#4 (text+ko) ====

@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.11 2007/07/27 14:53:42 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i80321/i80321_pci.c,v 1.12 2007/09/30 11:05:13 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -250,8 +250,10 @@
 {
 	struct i80321_pci_softc *sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
-
 		*result = sc->sc_busno;
 		return (0);
 		
@@ -265,6 +267,8 @@
 	struct i80321_pci_softc * sc = device_get_softc(dev);
 
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_busno = result;
 		return (0);

==== //depot/projects/vimage/src/sys/arm/xscale/i8134x/i81342_pci.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.1 2007/07/27 14:50:57 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/i81342_pci.c,v 1.2 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -481,8 +481,10 @@
 {
 	struct i81342_pci_softc *sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
-
 		*result = sc->sc_busno;
 		return (0);
 		
@@ -496,6 +498,8 @@
 	struct i81342_pci_softc * sc = device_get_softc(dev);
 
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_busno = result;
 		return (0);

==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/files.ixp425#3 (text+ko) ====

@@ -1,4 +1,4 @@
-#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.2 2006/12/07 00:49:33 sam Exp $
+#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.4 2007/09/27 22:39:49 cognet Exp $
 arm/arm/cpufunc_asm_xscale.S		standard
 arm/arm/irq_dispatch.S			standard
 arm/xscale/ixp425/ixp425.c		standard
@@ -16,12 +16,7 @@
 arm/xscale/ixp425/ixp425_a4x_io.S	optional	uart
 dev/uart/uart_dev_ns8250.c		optional	uart
 #
-# NPE-based Ethernet support (requires qmgr also).  Note the
-# firmware images must be downloaded from the Intel web site.
-# The URL seems to change frequently; try this as a starting
-# place:
-#
-# http://www.intel.com/design/network/products/npfamily/download_ixp400.htm
+# NPE-based Ethernet support (requires qmgr also).
 #
 arm/xscale/ixp425/if_npe.c		optional npe
 arm/xscale/ixp425/ixp425_npe.c		optional npe
@@ -41,7 +36,7 @@
 	clean		"IxNpeMicrocode.fwo"
 IxNpeMicrocode.dat			optional npe_fw			\
 	dependency	".PHONY"					\
-	compile-with	"if [ -e $S/arm/xscale/ixp425/IxNpeMicrocode.dat ]; then ln -sf $S/arm/xscale/ixp425/IxNpeMicrocode.dat .; else echo 'WARNING, no IxNpeMicrocode.dat file; you must obtain this from the Intel web site'; false; fi" \
+	compile-with	"uudecode < $S/contrib/dev/npe/IxNpeMicrocode.dat.uu" \
 	no-obj no-implicit-rule						\
 	clean		"IxNpeMicrocode.dat"
 #

==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_npe.c#4 (text+ko) ====

@@ -57,7 +57,7 @@
  * SUCH DAMAGE.
 */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.6 2007/05/24 16:31:22 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npe.c,v 1.8 2007/09/27 22:39:49 cognet Exp $");
 
 /*
  * Intel XScale Network Processing Engine (NPE) support.

==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_npevar.h#3 (text+ko) ====

@@ -21,7 +21,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npevar.h,v 1.2 2007/05/24 16:31:22 sam Exp $
+ * $FreeBSD: src/sys/arm/xscale/ixp425/ixp425_npevar.h,v 1.4 2007/09/27 22:39:49 cognet Exp $
  */
 
 #ifndef _IXP425_NPEVAR_H_

==== //depot/projects/vimage/src/sys/arm/xscale/ixp425/ixp425_pci.c#4 (text+ko) ====

@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.4 2007/03/06 10:58:22 piso Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/ixp425_pci.c,v 1.5 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -229,6 +229,9 @@
 
 	sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		*result = 0;
+		return (0);
 	case PCIB_IVAR_BUS:
 		*result = sc->sc_bus;
 		return (0);
@@ -244,6 +247,8 @@
 
 	sc = device_get_softc(dev);
 	switch (which) {
+	case PCIB_IVAR_DOMAIN:
+		return (EINVAL);
 	case PCIB_IVAR_BUS:
 		sc->sc_bus = value;
 		return (0);

==== //depot/projects/vimage/src/sys/boot/common/module.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.26 2006/01/12 13:18:49 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/boot/common/module.c,v 1.27 2007/10/04 18:29:52 obrien Exp $");
 
 /*
  * file/module function dispatcher, support, etc.
@@ -75,6 +75,7 @@
 static char *kld_ext_list[] = {
     ".ko",
     "",
+    ".debug",
     NULL
 };
 

==== //depot/projects/vimage/src/sys/boot/forth/loader.conf#7 (text+ko) ====

@@ -6,7 +6,7 @@
 #
 # All arguments must be in double quotes.
 #
-# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.121 2007/06/25 05:06:55 rafan Exp $
+# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.122 2007/09/26 08:38:25 ru Exp $
 
 ##############################################################
 ###  Basic configuration options  ############################
@@ -44,7 +44,8 @@
 #autoboot_delay="10"		# Delay in seconds before autobooting,
 				# set to -1 if you don't want user to be
 				# allowed to interrupt autoboot process and
-				# escape to the loader prompt
+				# escape to the loader prompt, set to
+				# "NO" to disable autobooting
 #beastie_disable="NO"		# Turn the beastie boot menu on and off
 #loader_logo="fbsdbw"		# Desired logo: fbsdbw, beastiebw, beastie, none
 #comconsole_speed="9600"	# Set the current serial console speed

==== //depot/projects/vimage/src/sys/conf/NOTES#17 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1453 2007/09/23 07:34:22 pjd Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1454 2007/09/26 21:14:17 marius Exp $
 #
 # NOTES -- Lines that can be cut/pasted into kernel and hints configs.
 #
@@ -1766,6 +1766,7 @@
 # fpa:  Support for the Digital DEFPA PCI FDDI. `device fddi' is also needed.
 # fxp:  Intel EtherExpress Pro/100B
 #	(hint of prefer_iomap can be done to prefer I/O instead of Mem mapping)
+# gem:  Apple GMAC/Sun ERI/Sun GEM
 # hme:  Sun HME (Happy Meal Ethernet)
 # le:   AMD Am7900 LANCE and Am79C9xx PCnet
 # lge:	Support for PCI gigabit ethernet adapters based on the Level 1
@@ -1880,6 +1881,7 @@
 device		dc		# DEC/Intel 21143 and various workalikes
 device		fxp		# Intel EtherExpress PRO/100B (82557, 82558)
 hint.fxp.0.prefer_iomap="0"
+device		gem		# Apple GMAC/Sun ERI/Sun GEM
 device		hme		# Sun HME (Happy Meal Ethernet)
 device		lge		# Level 1 LXT1001 gigabit Ethernet
 device		my		# Myson Fast Ethernet (MTD80X, MTD89X)

==== //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 (text+ko) ====

@@ -209,6 +209,8 @@
 	winner = dmu_buf_set_user(db, zap, &zap->zap_m.zap_phys, zap_evict);
 
 	if (winner != NULL) {
+		rw_exit(&zap->zap_rwlock);
+		rw_destroy(&zap->zap_rwlock);
 		if (!zap->zap_ismicro)
 			mutex_destroy(&zap->zap_f.zap_num_entries_mtx);
 		kmem_free(zap, sizeof (zap_t));

==== //depot/projects/vimage/src/sys/dev/acpica/acpi_pci.c#2 (text+ko) ====

@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.30 2006/05/11 22:13:20 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pci.c,v 1.31 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -275,17 +275,19 @@
 static int
 acpi_pci_attach(device_t dev)
 {
-	int busno;
+	int busno, domain;
 
 	/*
 	 * Since there can be multiple independantly numbered PCI
 	 * busses on systems with multiple PCI domains, we can't use
 	 * the unit number to decide which bus we are probing. We ask
-	 * the parent pcib what our bus number is.
+	 * the parent pcib what our domain and bus numbers are.
 	 */
+	domain = pcib_get_domain(dev);
 	busno = pcib_get_bus(dev);
 	if (bootverbose)
-		device_printf(dev, "physical bus=%d\n", busno);
+		device_printf(dev, "domain=%d, physical bus=%d\n",
+		    domain, busno);
 
 	/*
 	 * First, PCI devices are added as in the normal PCI bus driver.
@@ -297,7 +299,7 @@
 	 * pci_add_children() doesn't find.  We currently just ignore
 	 * these devices.
 	 */
-	pci_add_children(dev, busno, sizeof(struct acpi_pci_devinfo));
+	pci_add_children(dev, domain, busno, sizeof(struct acpi_pci_devinfo));
 	AcpiWalkNamespace(ACPI_TYPE_DEVICE, acpi_get_handle(dev), 1,
 	    acpi_pci_save_handle, dev, NULL);
 

==== //depot/projects/vimage/src/sys/dev/acpica/acpi_pcib_acpi.c#5 (text+ko) ====

@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.54 2007/05/02 17:50:35 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib_acpi.c,v 1.55 2007/09/30 11:05:14 marius Exp $");
 
 #include "opt_acpi.h"
 #include <sys/param.h>
@@ -259,6 +259,9 @@
     struct acpi_hpcib_softc	*sc = device_get_softc(dev);
 
     switch (which) {
+    case PCIB_IVAR_DOMAIN:
+	*result = 0;
+	return (0);
     case PCIB_IVAR_BUS:
 	*result = sc->ap_bus;
 	return (0);
@@ -278,6 +281,8 @@
     struct acpi_hpcib_softc	*sc = device_get_softc(dev);
 
     switch (which) {
+    case PCIB_IVAR_DOMAIN:
+	return (EINVAL);
     case PCIB_IVAR_BUS:
 	sc->ap_bus = value;
 	return (0);

==== //depot/projects/vimage/src/sys/dev/ata/ata-all.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.279 2007/02/23 16:25:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.280 2007/10/04 19:17:15 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
@@ -738,7 +738,7 @@
 
     atadev->flags &= ~ATA_D_48BIT_ACTIVE;
 
-    if ((request->u.ata.lba >= ATA_MAX_28BIT_LBA ||
+    if (((request->u.ata.lba + request->u.ata.count) >= ATA_MAX_28BIT_LBA ||
 	 request->u.ata.count > 256) &&
 	atadev->param.support.command2 & ATA_SUPPORT_ADDRESS48) {
 

==== //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#8 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.199 2007/09/10 19:16:39 simon Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.201 2007/10/04 19:17:15 sos Exp $");
 
 #include "opt_ata.h"
 #include <sys/param.h>
@@ -1216,6 +1216,7 @@
      { ATA_AMD766,  0x00, AMDNVIDIA, AMDCABLE|AMDBUG, ATA_UDMA5, "766" },
      { ATA_AMD768,  0x00, AMDNVIDIA, AMDCABLE,        ATA_UDMA5, "768" },
      { ATA_AMD8111, 0x00, AMDNVIDIA, AMDCABLE,        ATA_UDMA6, "8111" },
+     { ATA_AMD5536, 0x00, AMDNVIDIA, 0x00,            ATA_UDMA5, "CS5536" },
      { 0, 0, 0, 0, 0, 0}};
     char buffer[64]; 
 
@@ -5095,6 +5096,7 @@
      { ATA_VIA8235,   0x00, VIA133, 0x00,    ATA_UDMA6, "8235" },
      { ATA_VIA8237,   0x00, VIA133, 0x00,    ATA_UDMA6, "8237" },
      { ATA_VIA8237A,  0x00, VIA133, 0x00,    ATA_UDMA6, "8237A" },
+     { ATA_VIA8237S,  0x00, VIA133, 0x00,    ATA_UDMA6, "8237S" },
      { ATA_VIA8251,   0x00, VIA133, 0x00,    ATA_UDMA6, "8251" },
      { 0, 0, 0, 0, 0, 0 }};
     static struct ata_chip_id new_ids[] =
@@ -5102,6 +5104,7 @@
      { ATA_VIA6420,   0x00, 7,      0x00,    ATA_SA150, "6420" },
      { ATA_VIA6421,   0x00, 6,      VIABAR,  ATA_SA150, "6421" },
      { ATA_VIA8237A,  0x00, 7,      0x00,    ATA_SA150, "8237A" },
+     { ATA_VIA8237S,  0x00, 7,      0x00,    ATA_SA150, "8237S" },
      { ATA_VIA8251,   0x00, 0,      VIAAHCI, ATA_SA300, "8251" },
      { 0, 0, 0, 0, 0, 0 }};
     char buffer[64];

==== //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#6 (text+ko) ====

@@ -23,7 +23,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.78 2007/09/10 19:16:39 simon Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.80 2007/10/04 19:17:16 sos Exp $
  */
 
 /* structure holding chipset config info */
@@ -86,6 +86,7 @@
 #define ATA_AMD766              0x74111022
 #define ATA_AMD768              0x74411022
 #define ATA_AMD8111             0x74691022
+#define ATA_AMD5536             0x209a1022
 
 #define ATA_ACER_LABS_ID        0x10b9
 #define ATA_ALI_1533            0x153310b9
@@ -357,6 +358,7 @@
 #define ATA_VIA8235             0x31771106
 #define ATA_VIA8237             0x32271106
 #define ATA_VIA8237A            0x05911106
+#define ATA_VIA8237S		0x53371106
 #define ATA_VIA8251             0x33491106
 #define ATA_VIA8361             0x31121106
 #define ATA_VIA8363             0x03051106

==== //depot/projects/vimage/src/sys/dev/bge/if_bge.c#8 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.197 2007/06/04 18:25:03 dwmalone Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.198 2007/09/30 11:05:14 marius Exp $");
 
 /*
  * Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -2181,13 +2181,14 @@
 bge_has_multiple_ports(struct bge_softc *sc)
 {
 	device_t dev = sc->bge_dev;
-	u_int b, s, f, fscan;
+	u_int b, d, f, fscan, s;
 
+	d = pci_get_domain(dev);
 	b = pci_get_bus(dev);
 	s = pci_get_slot(dev);
 	f = pci_get_function(dev);
 	for (fscan = 0; fscan <= PCI_FUNCMAX; fscan++)
-		if (fscan != f && pci_find_bsf(b, s, fscan) != NULL)
+		if (fscan != f && pci_find_dbsf(d, b, s, fscan) != NULL)
 			return (1);
 	return (0);
 }

==== //depot/projects/vimage/src/sys/dev/cardbus/cardbus.c#4 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.65 2007/05/16 23:40:08 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cardbus/cardbus.c,v 1.66 2007/09/30 11:05:14 marius Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -162,12 +162,13 @@
 {
 	device_t brdev = device_get_parent(cbdev);
 	device_t child;
+	int bus, domain, slot, func;
 	int cardattached = 0;
-	int bus, slot, func;
 	int cardbusfunchigh = 0;
 
 	cardbus_detach_card(cbdev); /* detach existing cards */
 	POWER_ENABLE_SOCKET(brdev, cbdev);
+	domain = pcib_get_domain(cbdev);
 	bus = pcib_get_bus(cbdev);
 	slot = 0;
 	/* For each function, set it up and try to attach a driver to it */
@@ -175,7 +176,7 @@
 		struct cardbus_devinfo *dinfo;
 
 		dinfo = (struct cardbus_devinfo *)
-		    pci_read_device(brdev, bus, slot, func,
+		    pci_read_device(brdev, domain, bus, slot, func,
 			sizeof(struct cardbus_devinfo));
 		if (dinfo == NULL)
 			continue;

==== //depot/projects/vimage/src/sys/dev/gem/if_gem.c#5 (text+ko) ====

@@ -28,10 +28,10 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.43 2007/06/16 23:27:59 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.44 2007/09/26 21:14:17 marius Exp $");
 
 /*
- * Driver for Sun GEM ethernet controllers.
+ * Driver for Apple GMAC, Sun ERI and Sun GEM Ethernet controllers
  */
 
 #if 0
@@ -80,7 +80,11 @@
 #include <dev/gem/if_gemreg.h>
 #include <dev/gem/if_gemvar.h>
 
+CTASSERT(powerof2(GEM_NRXDESC) && GEM_NRXDESC >= 32 && GEM_NRXDESC <= 8192);
+CTASSERT(powerof2(GEM_NTXDESC) && GEM_NTXDESC >= 32 && GEM_NTXDESC <= 8192);
+
 #define TRIES	10000
+
 /*
  * The GEM hardware support basic TCP/UDP checksum offloading. However,
  * the hardware doesn't compensate the checksum for UDP datagram which
@@ -102,14 +106,16 @@
 static void	gem_init(void *);
 static void	gem_init_locked(struct gem_softc *);
 static void	gem_init_regs(struct gem_softc *);
-static int	gem_ringsize(int sz);
+static u_int	gem_ringsize(u_int);
 static int	gem_meminit(struct gem_softc *);
 static struct mbuf *gem_defrag(struct mbuf *, int, int);
 static int	gem_load_txmbuf(struct gem_softc *, struct mbuf **);
 static void	gem_mifinit(struct gem_softc *);
 static int	gem_bitwait(struct gem_softc *, bus_addr_t, u_int32_t,
     u_int32_t);
+static void	gem_reset(struct gem_softc *);
 static int	gem_reset_rx(struct gem_softc *);
+static void	gem_reset_rxdma(struct gem_softc *sc);
 static int	gem_reset_tx(struct gem_softc *);
 static int	gem_disable_rx(struct gem_softc *);
 static int	gem_disable_tx(struct gem_softc *);
@@ -124,9 +130,6 @@
 static void	gem_rint_timeout(void *);
 #endif
 static void	gem_tint(struct gem_softc *);
-#ifdef notyet
-static void	gem_power(int, void *);
-#endif
 
 devclass_t gem_devclass;
 DRIVER_MODULE(miibus, gem, miibus_driver, miibus_devclass, 0, 0);
@@ -149,7 +152,6 @@
 	struct gem_softc *sc;
 {
 	struct ifnet *ifp;
-	struct mii_softc *child;
 	int i, error;
 	u_int32_t v;
 
@@ -164,10 +166,7 @@
 
 	/* Make sure the chip is stopped. */
 	ifp->if_softc = sc;
-	GEM_LOCK(sc);
-	gem_stop(ifp, 0);
 	gem_reset(sc);
-	GEM_UNLOCK(sc);
 
 	error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0,
 	    BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
@@ -257,11 +256,73 @@
 		sc->sc_rxsoft[i].rxs_mbuf = NULL;
 	}
 
+	/* Bad things will happen when touching this register on ERI. */
+	if (sc->sc_variant != GEM_SUN_ERI)
+		bus_write_4(sc->sc_res[0], GEM_MII_DATAPATH_MODE,
+		    GEM_MII_DATAPATH_MII);
+
 	gem_mifinit(sc);
 
-	if ((error = mii_phy_probe(sc->sc_dev, &sc->sc_miibus, gem_mediachange,
-	    gem_mediastatus)) != 0) {
-		device_printf(sc->sc_dev, "phy probe failed: %d\n", error);
+	/*
+	 * Look for an external PHY.
+	 */
+	error = ENXIO;
+	v = bus_read_4(sc->sc_res[0], GEM_MIF_CONFIG);
+	if ((v & GEM_MIF_CONFIG_MDI1) != 0) {
+		v |= GEM_MIF_CONFIG_PHY_SEL;
+		bus_write_4(sc->sc_res[0], GEM_MIF_CONFIG, v);
+		switch (sc->sc_variant) {
+		case GEM_SUN_ERI:
+			sc->sc_phyad = GEM_PHYAD_EXTERNAL;
+			break;
+		default:
+			sc->sc_phyad = -1;
+			break;
+		}
+		error = mii_phy_probe(sc->sc_dev, &sc->sc_miibus,
+		    gem_mediachange, gem_mediastatus);
+	}
+
+	/*
+	 * Fall back on an internal PHY if no external PHY was found.
+	 */
+	if (error != 0 && (v & GEM_MIF_CONFIG_MDI0) != 0) {
+		v &= ~GEM_MIF_CONFIG_PHY_SEL;
+		bus_write_4(sc->sc_res[0], GEM_MIF_CONFIG, v);
+		switch (sc->sc_variant) {
+		case GEM_SUN_ERI:
+		case GEM_APPLE_K2_GMAC:
+			sc->sc_phyad = GEM_PHYAD_INTERNAL;
+			break;
+		case GEM_APPLE_GMAC:
+			sc->sc_phyad = GEM_PHYAD_EXTERNAL;
+			break;
+		default:
+			sc->sc_phyad = -1;
+			break;
+		}
+		error = mii_phy_probe(sc->sc_dev, &sc->sc_miibus,
+		    gem_mediachange, gem_mediastatus);
+	}
+
+	/*
+	 * Try the external PCS SERDES if we didn't find any PHYs.
+	 */
+	if (error != 0 && sc->sc_variant == GEM_SUN_GEM) {
+		bus_write_4(sc->sc_res[0], GEM_MII_DATAPATH_MODE,
+		    GEM_MII_DATAPATH_SERDES);
+		bus_write_4(sc->sc_res[0], GEM_MII_SLINK_CONTROL,
+		    GEM_MII_SLINK_LOOPBACK | GEM_MII_SLINK_EN_SYNC_D);
+		bus_write_4(sc->sc_res[0], GEM_MII_CONFIG,
+		    GEM_MII_CONFIG_ENABLE);
+		sc->sc_flags |= GEM_SERDES;
+		sc->sc_phyad = GEM_PHYAD_EXTERNAL;
+		error = mii_phy_probe(sc->sc_dev, &sc->sc_miibus,
+		    gem_mediachange, gem_mediastatus);
+	}
+
+	if (error != 0) {
+		device_printf(sc->sc_dev, "PHY probe failed: %d\n", error);
 		goto fail_rxd;
 	}
 	sc->sc_mii = device_get_softc(sc->sc_miibus);
@@ -293,64 +354,10 @@
 	IFQ_SET_MAXLEN(&ifp->if_snd, GEM_TXQUEUELEN);
 	ifp->if_snd.ifq_drv_maxlen = GEM_TXQUEUELEN;
 	IFQ_SET_READY(&ifp->if_snd);
-	/*
-	 * Walk along the list of attached MII devices and
-	 * establish an `MII instance' to `phy number'
-	 * mapping. We'll use this mapping in media change
-	 * requests to determine which phy to use to program
-	 * the MIF configuration register.
-	 */
-	for (child = LIST_FIRST(&sc->sc_mii->mii_phys); child != NULL;
-	     child = LIST_NEXT(child, mii_list)) {
-		/*
-		 * Note: we support just two PHYs: the built-in
-		 * internal device and an external on the MII
-		 * connector.
-		 */
-		if (child->mii_phy > 1 || child->mii_inst > 1) {
-			device_printf(sc->sc_dev, "cannot accomodate "
-			    "MII device %s at phy %d, instance %d\n",
-			    device_get_name(child->mii_dev),
-			    child->mii_phy, child->mii_inst);
-			continue;
-		}
 
-		sc->sc_phys[child->mii_inst] = child->mii_phy;
-	}
-
-	/*
-	 * Now select and activate the PHY we will use.
-	 *
-	 * The order of preference is External (MDI1),
-	 * Internal (MDI0), Serial Link (no MII).
-	 */
-	if (sc->sc_phys[1]) {
-#ifdef GEM_DEBUG
-		printf("using external phy\n");
-#endif
-		sc->sc_mif_config |= GEM_MIF_CONFIG_PHY_SEL;
-	} else {
-#ifdef GEM_DEBUG
-		printf("using internal phy\n");
-#endif
-		sc->sc_mif_config &= ~GEM_MIF_CONFIG_PHY_SEL;
-	}
-	bus_write_4(sc->sc_res[0], GEM_MIF_CONFIG,
-	    sc->sc_mif_config);
 	/* Attach the interface. */
 	ether_ifattach(ifp, sc->sc_enaddr);
 
-#ifdef notyet
-	/*
-	 * Add a suspend hook to make sure we come back up after a
-	 * resume.
-	 */
-	sc->sc_powerhook = powerhook_establish(gem_power, sc);
-	if (sc->sc_powerhook == NULL)
-		device_printf(sc->sc_dev, "WARNING: unable to establish power "
-		    "hook\n");
-#endif
-
 	/*
 	 * Tell the upper layer(s) we support long frames/checksum offloads.
 	 */
@@ -455,7 +462,7 @@
 	 * On resume all registers have to be initialized again like
 	 * after power-on.
 	 */
-	sc->sc_inited = 0;
+	sc->sc_flags &= ~GEM_INITED;
 	if (ifp->if_flags & IFF_UP)
 		gem_init_locked(sc);
 	GEM_UNLOCK(sc);
@@ -580,7 +587,7 @@
 		return;
 	if (nsegs != 1) {
 		/* can't happen... */
-		panic("gem_cddma_callback: bad control buffer segment count");
+		panic("%s: bad control buffer segment count", __func__);
 	}
 	sc->sc_cddma = segs[0].ds_addr;
 }
@@ -638,7 +645,7 @@
 	return (0);
 }
 
-void
+static void
 gem_reset(sc)
 	struct gem_softc *sc;
 {
@@ -651,11 +658,11 @@
 
 	/* Do a full reset */
 	bus_write_4(sc->sc_res[0], GEM_RESET, GEM_RESET_RX | GEM_RESET_TX);
+	bus_barrier(sc->sc_res[0], GEM_RESET, 4, BUS_SPACE_BARRIER_WRITE);
 	if (!gem_bitwait(sc, GEM_RESET, GEM_RESET_RX | GEM_RESET_TX, 0))
 		device_printf(sc->sc_dev, "cannot reset device\n");
 }
 
-
 /*
  * gem_rxdrain:
  *
@@ -698,7 +705,7 @@
 	callout_stop(&sc->sc_tick_ch);
 #ifdef GEM_RINT_TIMEOUT
 	callout_stop(&sc->sc_rx_ch);
-#endif	
+#endif
 
 	/* XXX - Should we reset these instead? */
 	gem_disable_tx(sc);
@@ -728,13 +735,14 @@
 	 * Mark the interface down and cancel the watchdog timer.
 	 */
 	ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE);
+	sc->sc_flags &= ~GEM_LINK;
 	sc->sc_wdog_timer = 0;
 }
 
 /*
  * Reset the receiver
  */
-int
+static int
 gem_reset_rx(sc)
 	struct gem_softc *sc;
 {
@@ -745,24 +753,63 @@
 	 */
 	gem_disable_rx(sc);
 	bus_write_4(sc->sc_res[0], GEM_RX_CONFIG, 0);
-	/* Wait till it finishes */
-	if (!gem_bitwait(sc, GEM_RX_CONFIG, 1, 0))
-		device_printf(sc->sc_dev, "cannot disable read dma\n");
+	bus_barrier(sc->sc_res[0], GEM_RX_CONFIG, 4, BUS_SPACE_BARRIER_WRITE);
+	if (!gem_bitwait(sc, GEM_RX_CONFIG, GEM_RX_CONFIG_RXDMA_EN, 0))
+		device_printf(sc->sc_dev, "cannot disable RX DMA\n");
 
-	/* Wait 5ms extra. */
-	DELAY(5000);
-
 	/* Finally, reset the ERX */
 	bus_write_4(sc->sc_res[0], GEM_RESET, GEM_RESET_RX);
-	/* Wait till it finishes */

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 12:59:11 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 039CD16A421; Fri,  5 Oct 2007 12:59:11 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id AA81716A41A
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 12:59:10 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 8DF9013C480
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 12:59:10 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l95CxAJA006375
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 12:59:10 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l95CxAAh006372
	for perforce@freebsd.org; Fri, 5 Oct 2007 12:59:10 GMT
	(envelope-from zec@FreeBSD.org)
Date: Fri, 5 Oct 2007 12:59:10 GMT
Message-Id: <200710051259.l95CxAAh006372@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127226 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 12:59:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=127226

Change 127226 by zec@zec_tpx32 on 2007/10/05 12:58:54

	When a process is exiting there is a short window while the
	proc is still schedulable but it doesn't have an ucred
	associated with it any more.  Hence, inside the scheduler
	if p->p_ucred is not available, we supply a dummy loadavg
	value for purposes of priority recalculation, given that the 
	process should be gone anyhow in a few microseconds, so
	inaccurate priority calculation shouldn't be a problem in
	this case.
	
	In short, with this change maintaining per-vprocg load
	average accounting should finally work OK, at least with
	SCHED_4BSD.

Affected files ...

.. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#12 edit

Differences ...

==== //depot/projects/vimage/src/sys/kern/sched_4bsd.c#12 (text+ko) ====

@@ -389,24 +389,25 @@
 static void
 schedcpu(void)
 {
-#ifndef VIMAGE
-	register fixpt_t loadfac = loadfactor(averunnable.ldavg[0]);
-#endif
+	register fixpt_t loadfac;
 	struct thread *td;
 	struct proc *p;
 	struct td_sched *ts;
 	int awake, realstathz;
 
+#ifndef VIMAGE
+	loadfac = loadfactor(averunnable.ldavg[0]);
+#endif
 	realstathz = stathz ? stathz : hz;
 	sx_slock(&allproc_lock);
 	FOREACH_PROC_IN_SYSTEM(p) {
 		PROC_SLOCK(p);
 #ifdef VIMAGE
-		KASSERT((p->p_ucred != NULL), ("p_ucred"));
-		KASSERT((p->p_ucred->cr_vimage != NULL), ("cr_vimage"));
-		KASSERT((p->p_ucred->cr_vimage->v_procg != NULL), ("v_procg"));
-		INIT_VPROCG(p->p_ucred->cr_vimage->v_procg);
-		fixpt_t loadfac = loadfactor(V_averunnable.ldavg[0]);
+		if (p->p_ucred != NULL) {
+			INIT_VPROCG(p->p_ucred->cr_vimage->v_procg);
+			loadfac = loadfactor(V_averunnable.ldavg[0]);
+		} else
+			loadfac = 0;
 #endif
 		FOREACH_THREAD_IN_PROC(p, td) { 
 			awake = 0;

From owner-p4-projects@FreeBSD.ORG  Fri Oct  5 13:02:20 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DE3DB16A46B; Fri,  5 Oct 2007 13:02:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8249E16A41B
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 13:02:19 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 372E213C4BC
	for <perforce@FreeBSD.org>; Fri,  5 Oct 2007 13:02:19 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l95D2Dsx006753
	for <perforce@FreeBSD.org>; Fri, 5 Oct 2007 13:02:13 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l95D2DxD006750
	for perforce@freebsd.org; Fri, 5 Oct 2007 13:02:13 GMT
	(envelope-from zec@FreeBSD.org)
Date: Fri, 5 Oct 2007 13:02:13 GMT
Message-Id: <200710051302.l95D2DxD006750@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127227 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 05 Oct 2007 13:02:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=127227

Change 127227 by zec@zec_tpx32 on 2007/10/05 13:02:12

	Fix vprocg iteration macros so that they are also available
	in nooptions INVARIANTS kernel configs.

Affected files ...

.. //depot/projects/vimage/src/sys/sys/vimage.h#40 edit

Differences ...

==== //depot/projects/vimage/src/sys/sys/vimage.h#40 (text+ko) ====

@@ -231,13 +231,6 @@
 	}								\
         VNET_LIST_UNREF();
 
-#define VPROCG_ITERLOOP_BEGIN()						\
-	struct vprocg *vprocg_iter;					\
-	LIST_FOREACH(vprocg_iter, &vprocg_head, vprocg_le) {		\
-
-#define VPROCG_ITERLOOP_END()						\
-	}								\
-
 #else /* !VNET_DEBUG */
 
 #define VNET_ASSERT(condition)
@@ -272,6 +265,13 @@
 
 #define INIT_VPROCG(arg)	struct vprocg *vprocg = (arg);
 
+#define VPROCG_ITERLOOP_BEGIN()						\
+	struct vprocg *vprocg_iter;					\
+	LIST_FOREACH(vprocg_iter, &vprocg_head, vprocg_le) {		\
+
+#define VPROCG_ITERLOOP_END()						\
+	}								\
+
 #else /* !VIMAGE */
 
 /* Non-VIMAGE null-macros */

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 09:42:52 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id EC65816A419; Sat,  6 Oct 2007 09:42:51 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 73A4A16A417
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 09:42:51 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 6BFCF13C45B
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 09:42:51 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l969gpbP052303
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 09:42:51 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l969gpac052300
	for perforce@freebsd.org; Sat, 6 Oct 2007 09:42:51 GMT
	(envelope-from zec@FreeBSD.org)
Date: Sat, 6 Oct 2007 09:42:51 GMT
Message-Id: <200710060942.l969gpac052300@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127243 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 09:42:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=127243

Change 127243 by zec@zec_tca51 on 2007/10/06 09:42:42

	Fix options VIMAGE + options IPSEC build, which probably
	got broken by yesterday's IFC.

Affected files ...

.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#23 edit

Differences ...

==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#23 (text+ko) ====

@@ -497,12 +497,12 @@
 #ifdef IPSEC
 #ifdef INET6
 	if (isipv6 && ipsec6_in_reject(m, inp)) {
-		ipsec6stat.in_polvio++;
+		V_ipsec6stat.in_polvio++;
 		goto dropunlock;
 	} else
 #endif /* INET6 */
 	if (ipsec4_in_reject(m, inp) != 0) {
-		ipsec4stat.in_polvio++;
+		V_ipsec4stat.in_polvio++;
 		goto dropunlock;
 	}
 #endif /* IPSEC */

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 10:38:55 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9689D16A419; Sat,  6 Oct 2007 10:38:55 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 492A516A473
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 10:38:55 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 3D9E713C46E
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 10:38:55 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96ActsZ056391
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 10:38:55 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96Act8K056388
	for perforce@freebsd.org; Sat, 6 Oct 2007 10:38:55 GMT
	(envelope-from fli@FreeBSD.org)
Date: Sat, 6 Oct 2007 10:38:55 GMT
Message-Id: <200710061038.l96Act8K056388@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127244 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 10:38:55 -0000

http://perforce.freebsd.org/chv.cgi?CH=127244

Change 127244 by fli@fli_nexus on 2007/10/06 10:38:36

	Stupid "typo".

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.c#7 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/record.c#7 (text+ko) ====

@@ -754,7 +754,7 @@
 			return (NULL);
 	}
 
-	if ((flags & REC_CTANY) && rc->rc_class == mdns_c_any) {
+	if ((flags & REC_CTANY) && class == mdns_c_any) {
 		rc = record_class_first(r);
 		if (rc != NULL)
 			rc->rc_flags |= REC_CTANY;
@@ -812,7 +812,7 @@
 			return (NULL);
 	}
 
-	if ((flags & REC_CTANY) && rt->rt_type == mdns_t_any) {
+	if ((flags & REC_CTANY) && type == mdns_t_any) {
 		rt = record_type_first(rc);
 		if (rt != NULL)
 			rt->rt_flags |= REC_CTANY;

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 16:55:00 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 593DB16A419; Sat,  6 Oct 2007 16:55:00 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DA61C16A41B
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 16:54:59 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AAD7513C457
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 16:54:59 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96Gsx2H005186
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 16:54:59 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96GsxG5005183
	for perforce@freebsd.org; Sat, 6 Oct 2007 16:54:59 GMT
	(envelope-from fli@FreeBSD.org)
Date: Sat, 6 Oct 2007 16:54:59 GMT
Message-Id: <200710061654.l96GsxG5005183@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127248 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 16:55:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=127248

Change 127248 by fli@fli_nexus on 2007/10/06 16:54:20

	Use an unsigned int to hold interface index instead of an int.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdns.h#9 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdns.h#9 (text+ko) ====

@@ -45,7 +45,7 @@
 	MAGIC(md_magic);
 	char md_ifnam[IFNAMSIZ + 1];
 	DEF_RW(md_lock);
-	int md_ifindex;
+	unsigned int md_ifindex;
 	int md_flags;
 #define MDNS_UDP4 0x0001	/* udp inet4 socket open */
 #define MDNS_TCP4 0x0002	/* tcp inet4 socket open */

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 17:03:09 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id BCA6916A41B; Sat,  6 Oct 2007 17:03:08 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7625E16A418
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:03:08 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5E5E213C448
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:03:08 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96H38xF006918
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 17:03:08 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96H38Ng006915
	for perforce@freebsd.org; Sat, 6 Oct 2007 17:03:08 GMT
	(envelope-from fli@FreeBSD.org)
Date: Sat, 6 Oct 2007 17:03:08 GMT
Message-Id: <200710061703.l96H38Ng006915@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127249 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 17:03:09 -0000

http://perforce.freebsd.org/chv.cgi?CH=127249

Change 127249 by fli@fli_nexus on 2007/10/06 17:02:43

	- Add missing IPV6_MULTICAST_LOOP socket option.
	- Fix broken ipv6 initialization. 
	- Use unsigned int to hold interface index.
	- Some error conditions didn't release the read-lock properly.
	- Properly loop through all ancillary data items during receive
	  instead of asuming that the item we want is the first.
	- Add a few new debugging printouts and nuke some useless code.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#8 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#8 (text+ko) ====

@@ -70,7 +70,8 @@
 {
 	struct ifreq req;
 	struct ifaddrs *ifap, *ifa;
-	int error, idx, i, sock;
+	int error, i, sock;
+	unsigned int idx;
 	size_t len;
 
 	bzero(md, sizeof(struct mdns));
@@ -313,6 +314,12 @@
 		    sizeof(so));
 		if (error != 0)
 			goto out;
+		/* Ignore our own multicast packets */
+		so = 0;
+		error = setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_LOOP, &so,
+		    sizeof(so));
+		if (error != 0)
+			goto out;
 		/* Make sure we transmit on the correct interface */
 		so = md->md_ifindex;
 		error = setsockopt(sock, IPPROTO_IPV6, IPV6_MULTICAST_IF, &so,
@@ -330,8 +337,8 @@
 		if (error != 0)
 			goto out;
 
-		bzero(&md->md_sin6, sizeof(struct sockaddr_in));
-		inet_pton(PF_INET6, MDNS_MCAST_INET6, &sin6.sin6_addr);
+		bzero(&md->md_sin6, sizeof(struct sockaddr_in6));
+		inet_pton(PF_INET6, MDNS_MCAST_INET6, &md->md_sin6.sin6_addr);
 		md->md_sin6.sin6_family = AF_INET6;
 		md->md_sin6.sin6_port = htons(MDNS_MCAST_PORT);
 
@@ -692,9 +699,10 @@
 		goto out;
 	}
 
+	dprintf(DEBUG_STACK, "Sending packet chain pc=%p, fam=%d", pc, family);
 	error = write_pkgchain(sock, pc, sa, salen);
+out:
 	RW_UNLOCK(md, md_lock);
-out:
 	return (error);
 }
 
@@ -729,10 +737,13 @@
 		goto out;
 	}
 	
+	dprintf(DEBUG_STACK, "Sending (unicast) packet chain pc=%p, fam=%d",
+	    pc, sa->sa_family);
 	error = write_pkgchain(sock, pc, sa, salen);
 	RW_UNLOCK(md, md_lock);
 	return (error);
 out:
+	RW_UNLOCK(md, md_lock);
 	return (-1);
 }
 
@@ -748,7 +759,7 @@
 mdns_recv(struct mdns *md, struct mdns_pkgchain *pc, int family,
 	struct sockaddr *from, socklen_t *fromlen)
 {
-	int sock;
+	int sock, valid;
 	ssize_t ret;
 	struct mdns_packet *pkg;
 	struct mdns_buf *buf;
@@ -813,21 +824,34 @@
 	dprintf(DEBUG_STACK, "Buffer filled %d bytes (size %d)",
 	    MDNS_BUFLEN(buf), MDNS_BUFSZ(buf));
 
-	cmptr = CMSG_FIRSTHDR(&msg);
-	if (cmptr->cmsg_level == IPPROTO_IP) {
-		if (cmptr->cmsg_type == IP_RECVIF) {
+	valid = 0;
+	for (cmptr = CMSG_FIRSTHDR(&msg); cmptr != NULL;
+	    cmptr = CMSG_NXTHDR(&msg, cmptr)) {
+		if (cmptr->cmsg_level == IPPROTO_IP &&
+		    cmptr->cmsg_type == IP_RECVIF) {
 			sdl = (struct sockaddr_dl *) CMSG_DATA(cmptr);
-			if (sdl->sdl_index != md->md_ifindex)
-				goto error;
+			if (sdl->sdl_index == md->md_ifindex) {
+				valid = 1;
+				break;
+			}
+		}
+#ifdef INET6
+		else if (cmptr->cmsg_level == IPPROTO_IPV6 &&
+		    cmptr->cmsg_type == IPV6_PKTINFO) {
+			ipi6 = (struct in6_pktinfo *) CMSG_DATA(cmptr);
+			if (ipi6->ipi6_ifindex == md->md_ifindex) {
+				valid = 1;
+				break;
+			}
 		}
+#endif
 	}
-#ifdef INET6
-	else if (cmptr->cmsg_level == IPPROTO_IPV6) {
-		ipi6 = (struct in6_pktinfo *) CMSG_DATA(cmptr);
-		if (ipi6->ipi6_ifindex != (unsigned int)md->md_ifindex)
-			goto error;
+
+	if (!valid) {
+		dprintf(DEBUG_STACK,
+		    "Unable to determine incoming interface (packet ignored)");
+		goto error;
 	}
-#endif
 
 	RW_UNLOCK(md, md_lock);
 	return (pkg->p_len);
@@ -989,15 +1013,10 @@
  *   0 on success, non-zero on failure
  */
 static int
-mcast_memberctl(int sock, int ifidx, int family, int what)
+mcast_memberctl(int sock, unsigned int ifidx, int family, int what)
 {
 	int error;
 
-	if (ifidx < 0) {
-		errno = EINVAL;
-		return (-1);
-	}
-
 	switch (family) {
 	case PF_INET: {
 		struct ip_mreq mreq;

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 17:05:11 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1D5C816A468; Sat,  6 Oct 2007 17:05:11 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id CD87016A420
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:05:10 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id B619E13C45B
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:05:10 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96H5Acu006994
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 17:05:10 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96H5A6c006991
	for perforce@freebsd.org; Sat, 6 Oct 2007 17:05:10 GMT
	(envelope-from fli@FreeBSD.org)
Date: Sat, 6 Oct 2007 17:05:10 GMT
Message-Id: <200710061705.l96H5A6c006991@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127250 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 17:05:11 -0000

http://perforce.freebsd.org/chv.cgi?CH=127250

Change 127250 by fli@fli_nexus on 2007/10/06 17:04:48

	Ehm..a sockaddr_in6 is larger than a sockaddr, fix.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/output.c#3 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/output.h#3 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/output.c#3 (text+ko) ====

@@ -131,7 +131,7 @@
 	}
 
 	if (peer != NULL) {
-		memcpy(&oqe->oqe_peer, peer, peerlen);
+		memcpy(&oqe->oqe_peer.sa, peer, peerlen);
 		oqe->oqe_peerlen = peerlen;
 	}
 	else
@@ -203,7 +203,7 @@
 				    oqe->oqe_fam);
 			else
 				mdns_send_unicast(&mif->mif_stack, &oqe->oqe_pc,
-				    &oqe->oqe_peer, oqe->oqe_peerlen);
+				    &oqe->oqe_peer.sa, oqe->oqe_peerlen);
 
 			mdns_pkgchain_free(&oqe->oqe_pc);
 			obj_free(OBJ_OQE, oqe);

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/output.h#3 (text+ko) ====

@@ -39,8 +39,14 @@
 	MAGIC(oqe_magic);
 	TAILQ_ENTRY(oq_entry) oqe_next;
 	int oqe_fam;
-	struct sockaddr oqe_peer;
 	socklen_t oqe_peerlen;
+	union {
+		struct sockaddr sa;
+		struct sockaddr_in in;
+#ifdef INET6
+		struct sockaddr_in6 in6;
+#endif
+	} oqe_peer;
 	struct mdns_pkgchain oqe_pc;
 };
 

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 17:07:14 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1555D16A41B; Sat,  6 Oct 2007 17:07:14 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BB29916A418
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:07:13 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A2E9013C45B
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:07:13 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96H7C4D007076
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 17:07:12 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96H7C1a007073
	for perforce@freebsd.org; Sat, 6 Oct 2007 17:07:12 GMT
	(envelope-from fli@FreeBSD.org)
Date: Sat, 6 Oct 2007 17:07:12 GMT
Message-Id: <200710061707.l96H7C1a007073@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127251 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 17:07:14 -0000

http://perforce.freebsd.org/chv.cgi?CH=127251

Change 127251 by fli@fli_nexus on 2007/10/06 17:06:47

	- Probing/annonucing was broken for ipv6.
	- A few error conditions didn't release the read-lock properly.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.c#9 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/dbrec.c#9 (text+ko) ====

@@ -462,11 +462,13 @@
 
 	tmp = realloc(ident, sizeof(char *) * ++i);
 	if (tmp == NULL)
-		goto dbr_ident_list_fail;
+		goto dbr_ident_list_fail2;
 	ident[i - 1] = NULL;
 
 	return (ident);
 dbr_ident_list_fail:
+	RW_UNLOCK(dbr, dbr_lock);
+dbr_ident_list_fail2:
 	for (j = 0; j < i; j++)
 		free(ident[j]);
 	if (ident != NULL)
@@ -1782,6 +1784,7 @@
 	RW_RLOCK(dbr, dbr_lock);
 	if (!(dr->dr_flags & DR_OK)) {
 		dprintf(DEBUG_DBR, "Record is not ok, not defending");
+		RW_UNLOCK(dbr, dbr_lock);
 		return;
 	}
 
@@ -2137,7 +2140,7 @@
 	struct dbr *dbr;
 	struct md_if *mif;
 	int count = 0;
-	struct mdns_pkgchain pc;
+	struct mdns_pkgchain pc, pc6;
 
 	pac = arg.ptr;
 	MDNS_INIT_ASSERT(pac, pac_magic);
@@ -2181,6 +2184,10 @@
 
 	mdns_pkgchain_init(&mif->mif_stack, &pc, MDNS_PC_NONE);
 	mdns_pkg_sethdr(&pc, 0, MDNS_HEAD_QUERY | MDNS_HEAD_AA);
+#ifdef INET6
+	mdns_pkgchain_init(&mif->mif_stack, &pc6, MDNS_PC_NONE);
+	mdns_pkg_sethdr(&pc6, 0, MDNS_HEAD_QUERY | MDNS_HEAD_AA);
+#endif
 
 	/*
 	 * Add all valid records to the packet chain
@@ -2188,6 +2195,9 @@
 	TAILQ_FOREACH_SAFE(dr, &pac->pac_head, dr_pac_next, dr2) {
 		MDNS_INIT_ASSERT(dr, dr_magic);
 		probe_add_rec(&pc, dr, pac->pac_step);
+#ifdef INET6
+		probe_add_rec(&pc6, dr, pac->pac_step);
+#endif
 		count++;
 	}
 
@@ -2195,10 +2205,13 @@
 	if (count) {
 		oq_enqueue(&mif->mif_oq, &pc, AF_INET, NULL, 0);
 #ifdef INET6
-		oq_enqueue(&mif->mif_oq, &pc, AF_INET6, NULL, 0);
+		oq_enqueue(&mif->mif_oq, &pc6, AF_INET6, NULL, 0);
 #endif
 	}
 	mdns_pkgchain_free(&pc);
+#ifdef INET6
+	mdns_pkgchain_free(&pc6);
+#endif
 
 	if (pac->pac_step++ < 3) {
 		pac->pac_tmr =
@@ -2264,9 +2277,9 @@
 	struct md_if *mif;
 	struct record *r;
 	struct record_res *rr;
-	struct mdns_rrset *rs;
+	struct mdns_rrset *rs, *rs2;
 	int delay_time, count = 0;
-	struct mdns_pkgchain pc;
+	struct mdns_pkgchain pc, pc6;
 
 	pac = arg.ptr;
 	MDNS_INIT_ASSERT(pac, pac_magic);
@@ -2289,6 +2302,10 @@
 
 	mdns_pkgchain_init(&mif->mif_stack, &pc, MDNS_PC_NONE);
 	mdns_pkg_sethdr(&pc, 0, MDNS_HEAD_RESP | MDNS_HEAD_AA);
+#ifdef INET6
+	mdns_pkgchain_init(&mif->mif_stack, &pc6, MDNS_PC_NONE);
+	mdns_pkg_sethdr(&pc6, 0, MDNS_HEAD_RESP | MDNS_HEAD_AA);
+#endif
 
 	RW_RLOCK(dbr, dbr_lock);
 
@@ -2313,6 +2330,14 @@
 			rs->r_datalen = rr->rr_len;
 			rs->r_data = rr->rr_data;
 			mdns_pkg_addanswer(&pc, rs, 0);
+
+#ifdef INET6
+			rs2 = mdns_pkg_getrrset();
+			if (rs2 == NULL)
+				break;
+			memcpy(rs2, rs, sizeof(struct mdns_rrset));
+			mdns_pkg_addanswer(&pc6, rs2, 0);
+#endif
 			count++;
 		}
 	}
@@ -2323,10 +2348,13 @@
 	if (count) {
 		oq_enqueue(&mif->mif_oq, &pc, AF_INET, NULL, 0);
 #ifdef INET6
-		oq_enqueue(&mif->mif_oq, &pc, AF_INET6, NULL, 0);
+		oq_enqueue(&mif->mif_oq, &pc6, AF_INET6, NULL, 0);
 #endif
 	}
 	mdns_pkgchain_free(&pc);
+#ifdef INET6
+	mdns_pkgchain_free(&pc6);
+#endif
 
 	if (pac->pac_step < 7) {
 		/* Double the delay time in each step */

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 17:10:18 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 1917D16A420; Sat,  6 Oct 2007 17:10:18 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9F18F16A419
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:10:17 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 87E8E13C457
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:10:17 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96HAHxQ007250
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 17:10:17 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96HAH3N007247
	for perforce@freebsd.org; Sat, 6 Oct 2007 17:10:17 GMT
	(envelope-from fli@FreeBSD.org)
Date: Sat, 6 Oct 2007 17:10:17 GMT
Message-Id: <200710061710.l96HAH3N007247@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127252 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 17:10:18 -0000

http://perforce.freebsd.org/chv.cgi?CH=127252

Change 127252 by fli@fli_nexus on 2007/10/06 17:09:15

	Only do the query using the address family that the consumer
	specified instead of blindly doing it using both ipv4 and ipv6.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/queries.c#3 edit
.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/queries.h#3 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/queries.c#3 (text+ko) ====

@@ -370,22 +370,26 @@
 			return;
 	}
 
-	qs = mdns_pkg_getqset();
-	if (qs == NULL)
-		return;
-	mdns_qset_name_dup(qs, r->r_name);
-	qs->q_type = rt->rt_type;
-	qs->q_class = rc->rc_class;
-	aq_enqueue(&q->q_aq4, qs, 20, 500);
+	if (qt->qt_flags & QT_INET4) {
+		qs = mdns_pkg_getqset();
+		if (qs == NULL)
+			return;
+		mdns_qset_name_dup(qs, r->r_name);
+		qs->q_type = rt->rt_type;
+		qs->q_class = rc->rc_class;
+		aq_enqueue(&q->q_aq4, qs, 20, 500);
+	}
 
 #ifdef INET6
-	qs = mdns_pkg_getqset();
-	if (qs == NULL)
-		return;
-	mdns_qset_name_dup(qs, r->r_name);
-	qs->q_type = rt->rt_type;
-	qs->q_class = rc->rc_class;
-	aq_enqueue(&q->q_aq6, qs, 20, 500);
+	if (qt->qt_flags & QT_INET6) {
+		qs = mdns_pkg_getqset();
+		if (qs == NULL)
+			return;
+		mdns_qset_name_dup(qs, r->r_name);
+		qs->q_type = rt->rt_type;
+		qs->q_class = rc->rc_class;
+		aq_enqueue(&q->q_aq6, qs, 20, 500);
+	}
 #endif
 
 	qt->qt_flags |= QT_SENT;
@@ -561,6 +565,15 @@
 	qc->qc_fam = family;
 	TAILQ_INSERT_TAIL(&qt->qt_cons_list, qc, qc_next);
 
+	if (family == AF_INET)
+		qt->qt_flags |= QT_INET4;
+#ifdef INET6
+	else if (family == AF_INET6)
+		qt->qt_flags |= QT_INET6;
+#endif
+	else if (family == AF_UNSPEC)
+		qt->qt_flags |= (QT_INET4 | QT_INET6);
+
 	send_query(q, qt);
 
 	if (qc->qc_timeout != 0)

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/queries.h#3 (text+ko) ====

@@ -80,6 +80,8 @@
 #define QT_INRETQ	0x01 /* scheduled for re-transmission */
 #define QT_SENT		0x02 /* query sent */
 #define QT_RESP		0x04 /* response received before timeout */
+#define QT_INET4	0x08 /* do inet4 query */
+#define QT_INET6	0x10 /* do inet6 query */
 	TAILQ_ENTRY(query_type) qt_ret_next; /* re-transmit delta list member */
 	int qt_retrel;	/* relative re-transmit value (book keeping only) */
 	int qt_retabs;	/* absolute re-transmission value */

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 17:12:20 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 74BAF16A419; Sat,  6 Oct 2007 17:12:20 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1780716A41B
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:12:20 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F3FC013C44B
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:12:19 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96HCJ0P007505
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 17:12:19 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96HCJZw007502
	for perforce@freebsd.org; Sat, 6 Oct 2007 17:12:19 GMT
	(envelope-from fli@FreeBSD.org)
Date: Sat, 6 Oct 2007 17:12:19 GMT
Message-Id: <200710061712.l96HCJZw007502@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127253 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 17:12:20 -0000

http://perforce.freebsd.org/chv.cgi?CH=127253

Change 127253 by fli@fli_nexus on 2007/10/06 17:12:19

	- Add missing ntohs() when reading port.
	- Remove a duplicated line.
	- Add a missing dbr_find_end()
	- Wrong variable was set to 0 (minimum delay calculation)

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/input.c#3 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/input.c#3 (text+ko) ====

@@ -149,7 +149,7 @@
 	else if (hdr->h_cquestion > 1)
 		min2 = (random() % 101) + 20;
 	else
-		min = 0;
+		min2 = 0;
 
 	/*
 	 * Process the question section
@@ -183,6 +183,7 @@
 			dprintf(DEBUG_SEND, "Record %s found in "
 			    "database, but is not marked ok (%x)",
 			    qs.q_name, dr->dr_flags);
+			dbr_find_end(&mif->mif_dbr);
 			continue;
 		}
 
@@ -208,7 +209,6 @@
 		 * Loop through matching (class, type) pairs from our
 		 * database and construct responses.
 		 */
-		ds = dbr_find(&mif->mif_dbr, qs.q_name, qs.q_class, qs.q_type);
 		while (ds != NULL) {
 			if (hdr->h_canswer > 0) {
 				cr = cache_find(&ac, qs.q_name,
@@ -357,23 +357,20 @@
 #ifdef DEBUG
 	char addr[SOCK_MAXADDRLEN+1];
 #endif
-	struct aqueue *aq;
 
 	switch (from->sa_family) {
 	case AF_INET:
 		sin = (struct sockaddr_in *)from;
-		port = sin->sin_port;
+		port = ntohs(sin->sin_port);
 		sinaddr = &((struct sockaddr_in *)from)->sin_addr;
 		sinaddr_len = sizeof(struct in_addr);
-		aq = &mif->mif_aq4;
 		break;
 #ifdef INET6
 	case AF_INET6:
 		sin6 = (struct sockaddr_in6 *)from;
-		port = sin6->sin6_port;
+		port = ntohs(sin6->sin6_port);
 		sinaddr = &((struct sockaddr_in6 *)from)->sin6_addr;
 		sinaddr_len = sizeof(struct in6_addr);
-		aq = &mif->mif_aq6;
 		break;
 #endif /* INET6 */
 	}

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 17:16:25 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6798316A418; Sat,  6 Oct 2007 17:16:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 147F216A421
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:16:25 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id EFC2E13C4B5
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:16:24 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96HGOoo007629
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 17:16:24 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96HGOXQ007626
	for perforce@freebsd.org; Sat, 6 Oct 2007 17:16:24 GMT
	(envelope-from fli@FreeBSD.org)
Date: Sat, 6 Oct 2007 17:16:24 GMT
Message-Id: <200710061716.l96HGOXQ007626@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127254 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 17:16:25 -0000

http://perforce.freebsd.org/chv.cgi?CH=127254

Change 127254 by fli@fli_nexus on 2007/10/06 17:15:35

	Fix sockaddr length initialization.

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#9 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/mdnsd.c#9 (text+ko) ====

@@ -255,12 +255,17 @@
 	socklen_t salen;
 
 	fd = ev->evio_fd;
-	salen = sizeof(struct sockaddr);
 	getsockname(fd, &sa, &salen);
 	switch (sa.sa_family) {
-	case PF_INET: saptr = (struct sockaddr *)&sin; break;
+	case PF_INET:
+		saptr = (struct sockaddr *)&sin;
+		salen = sizeof(struct sockaddr_in);
+		break;
 #ifdef INET6
-	case PF_INET6: saptr = (struct sockaddr *)&sin6; break;
+	case PF_INET6:
+		saptr = (struct sockaddr *)&sin6;
+		salen = sizeof(struct sockaddr_in6);
+		break;
 #endif
 	}
 

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 17:22:32 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0D1CB16A41B; Sat,  6 Oct 2007 17:22:32 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B895F16A418
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:22:31 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A0E6113C455
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:22:31 +0000 (UTC)
	(envelope-from fli@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96HMVlr008156
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 17:22:31 GMT
	(envelope-from fli@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96HMVLt008153
	for perforce@freebsd.org; Sat, 6 Oct 2007 17:22:31 GMT
	(envelope-from fli@FreeBSD.org)
Date: Sat, 6 Oct 2007 17:22:31 GMT
Message-Id: <200710061722.l96HMVLt008153@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	fli@FreeBSD.org using -f
From: Fredrik Lindberg <fli@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127255 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 17:22:32 -0000

http://perforce.freebsd.org/chv.cgi?CH=127255

Change 127255 by fli@fli_genesis on 2007/10/06 17:22:19

	Forgot to update mcast_memberctl() prototype. 

Affected files ...

.. //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#9 edit

Differences ...

==== //depot/projects/soc2007/fli-mdns_sd/mdnsd/stack_mdns.c#9 (text+ko) ====

@@ -55,7 +55,7 @@
 static int mdns_tcp_open(struct mdns *, int);
 static int mdns_tcp_close(struct mdns *, int);
 
-static int mcast_memberctl(int, int, int, int);
+static int mcast_memberctl(int, unsigned int, int, int);
 #define mcast_join(sock, ifidx, fam) mcast_memberctl(sock, ifidx, fam, 1)
 #define mcast_leave(sock, ifidx, fam) mcast_memberctl(sock, ifidx, fam, 0)
 

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 17:27:42 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C687016A420; Sat,  6 Oct 2007 17:27:41 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7048116A41A
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:27:41 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 57A7D13C447
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 17:27:41 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96HRfFO008304
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 17:27:41 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96HReWV008301
	for perforce@freebsd.org; Sat, 6 Oct 2007 17:27:40 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 6 Oct 2007 17:27:40 GMT
Message-Id: <200710061727.l96HReWV008301@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127256 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 17:27:42 -0000

http://perforce.freebsd.org/chv.cgi?CH=127256

Change 127256 by pgj@disznohal on 2007/10/06 17:27:28

	Add initial Hungarian translation of Chapter 12: The FreeBSD Booting
	Process.

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/boot/chapter.sgml#2 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/boot/chapter.sgml#2 (text+ko) ====

@@ -3,85 +3,139 @@
 
      $FreeBSD: doc/en_US.ISO8859-1/books/handbook/boot/chapter.sgml,v 1.65 2006/05/30 23:08:23 trhodes Exp $
 -->
+<!--
+     The FreeBSD Hungarian Documentation Project
+     Translated by: PALI, Gabor <pgj@FreeBSD.org>
+     Original Revision: 1.65                      -->
 
-<chapter id="boot">
-  <title>The FreeBSD Booting Process</title>
+<chapter id="boot" lang="hu">
+  <title>A &os; rendszerind&iacute;t&aacute;si folyamata</title>
 
   <sect1 id="boot-synopsis">
-    <title>Synopsis</title>
-    <indexterm><primary>booting</primary></indexterm>
-    <indexterm><primary>bootstrap</primary></indexterm>
+    <title>&Aacute;ttekint&eacute;s</title>
+    <indexterm><primary>rendszerind&iacute;t&aacute;s</primary></indexterm>
+    <indexterm><primary>rendszert&ouml;lt&#245;</primary></indexterm>
 
-    <para>The process of starting a computer and loading the operating system
-      is referred to as <quote>the bootstrap process</quote>, or simply
-      <quote>booting</quote>.  FreeBSD's boot process provides a great deal of
-      flexibility in customizing what happens when you start the system,
-      allowing you to select from different operating systems installed on the
-      same computer, or even different versions of the same operating system
-      or installed kernel.</para>
+    <para>A sz&aacute;m&iacute;t&oacute;g&eacute;p
+      indul&aacute;s&aacute;t &eacute;s a rajta tal&aacute;lhat&oacute;
+      oper&aacute;ci&oacute;s rendszer
+      bet&ouml;lt&#245;d&eacute;s&eacute;t
+      <quote>rendszert&ouml;lt&eacute;si folyamatnak</quote>
+      nevezz&uuml;k, vagy egyszer&#251;en csak
+      <quote>bootol&aacute;snak</quote>.  A &os;
+      rendszerind&iacute;t&aacute;si folyamata
+      nagym&eacute;rt&eacute;k&#251; rugalmass&aacute;got
+      k&iacute;n&aacute;l a rendszer indul&aacute;s&aacute;t
+      k&ouml;vet&#245; esem&eacute;nyek vez&eacute;rl&eacute;s&eacute;t
+      illet&#245;en, legyen az a
+      sz&aacute;m&iacute;t&oacute;g&eacute;pre telep&iacute;tett
+      k&uuml;l&ouml;nf&eacute;le oper&aacute;ci&oacute;s rendszerek
+      egyik&eacute;nek kiv&aacute;laszt&aacute;sa, vagy pedig ugyazon
+      oper&aacute;ci&oacute;s rendszer valamelyik
+      v&aacute;ltozat&aacute;nak vagy rendszermagj&aacute;nak
+      kiv&aacute;laszt&aacute;sa.</para>
 
-    <para>This chapter details the configuration options you can set and how
-      to customize the FreeBSD boot process.  This includes everything that
-      happens until the FreeBSD kernel has started, probed for devices, and
-      started &man.init.8;.  If you are not quite sure when this happens, it
-      occurs when the text color changes from bright white to grey.</para>
+    <para>Ez a fejezet r&eacute;szleteiben bemutatja a
+      rendszerind&iacute;t&aacute;shoz kapcsol&oacute;d&oacute;
+      konfigur&aacute;ci&oacute;s opci&oacute;kat, ill.  a &os;
+      bootol&aacute;s&aacute;nak
+      testreszabhat&oacute;s&aacute;g&aacute;t.  Ebbe minden
+      bele&eacute;rtend&#245;, ami a &os; rendszermag beindul&aacute;sa
+      &eacute;s az eszk&ouml;z&ouml;k keres&eacute;se sor&aacute;n
+      t&ouml;rt&eacute;nik, majd az &man.init.8;
+      elind&iacute;t&aacute;s&aacute;val z&aacute;rul.  Ha nem vagyunk
+      teljesen biztosak benne, ez pontosan mikor is k&ouml;vetkezik be,
+      figyelj&uuml;k, amikor a sz&ouml;veg sz&iacute;ne
+      feh&eacute;rr&#245;l sz&uuml;rk&eacute;re v&aacute;lt.</para>
 
-    <para>After reading this chapter, you will know:</para>
+    <para>A fejezet elolvas&aacute;sa sor&aacute;n
+      megismerj&uuml;k:</para>
 
     <itemizedlist>
       <listitem>
-	<para>What the components of the FreeBSD bootstrap system are, and how
-	  they interact.</para>
-      </listitem>
+	<para>Milyen elemekb&#245;l &aacute;ll a &os;
+	  rendszert&ouml;lt&#245; alrendszere, &eacute;s ezek
+	  mik&eacute;nt kapcsol&oacute;dnak egym&aacute;shoz.</para>
+     </listitem>
 
       <listitem>
-	<para>The options you can give to the components in the FreeBSD
-	  bootstrap to control the boot process.</para>
-      </listitem>
-      
+	<para>Melyek azok a &os; rendszert&ouml;lt&eacute;s&eacute;ben
+	  r&eacute;sztvev&#245; elemeknek &aacute;tadhat&oacute;
+	  opci&oacute;k, amikkel vez&eacute;relhet&#245; a
+	  bootol&aacute;s folyamata.</para>
+     </listitem>
+
       <listitem>
-        <para>The basics of &man.device.hints.5;.</para>
+        <para>A &man.device.hints.5; alapjait.</para>
       </listitem>
     </itemizedlist>
 
     <note>
-      <title>x86 Only</title>
+      <title>Csak x86</title>
+
+      <para>Ez a fejezet kiz&aacute;r&oacute;lag csak az &intel; x86
+	t&iacute;pus&uacute; architekt&uacute;r&aacute;j&aacute;n
+	fut&oacute; &os; rendszerind&iacute;t&aacute;si
+	folyamat&aacute;t mutatja be.</para>
 
-      <para>This chapter only describes the boot process for FreeBSD running
-	on Intel x86 systems.</para>
-    </note>
+   </note>
   </sect1>
 
   <sect1 id="boot-introduction">
-    <title>The Booting Problem</title>
+    <title>A rendszerind&iacute;t&aacute;s
+      probl&eacute;m&aacute;ja</title>
 
-    <para>Turning on a computer and starting the operating system poses an
-      interesting dilemma.  By definition, the computer does not know how to
-      do anything until the operating system is started.  This includes
-      running programs from the disk.  So if the computer can not run a
-      program from the disk without the operating system, and the operating
-      system programs are on the disk, how is the operating system
-      started?</para>
+    <para>Az oper&aacute;ci&oacute;s rendszer elind&iacute;t&aacute;sa a
+      sz&aacute;m&iacute;t&oacute;g&eacute;p bekapcsol&aacute;sa
+      ut&aacute;n egy felett&eacute;bb &eacute;rdekes
+      probl&eacute;m&aacute;t vet fel.  Defin&iacute;ci&oacute; szerint
+      a sz&aacute;m&iacute;t&oacute;g&eacute;p ugyanis egy
+      l&eacute;p&eacute;st sem tud megtenni az oper&aacute;ci&oacute;s
+      rendszer elindul&aacute;sa n&eacute;lk&uuml;l.
+      P&eacute;ld&aacute;ul nem programokat futtatni a lemezr&#245;l.
+      &Iacute;gy azt&aacute;n, ha a
+      sz&aacute;m&iacute;t&oacute;g&eacute;p&uuml;nk nem programokat
+      futtatni a lemezr&#245;l az oper&aacute;ci&oacute;s rendszer
+      seg&iacute;ts&eacute;ge n&eacute;lk&uuml;l, viszont az
+      oper&aacute;ci&oacute;s rendszer programjai a lemezen vannak,
+      m&eacute;gis hogyan k&eacute;pes elindulni maga az
+      oper&aacute;ci&oacute;s rendszer?</para>
 
-    <para>This problem parallels one in the book <citetitle>The Adventures of
-      Baron Munchausen</citetitle>.  A character had fallen part way down a
-      manhole, and pulled himself out by grabbing his bootstraps, and
-      lifting.  In the early days of computing the term
-      <firstterm>bootstrap</firstterm> was applied to the mechanism used to
-      load the operating system, which has become shortened to
-      <quote>booting</quote>.</para>
+    <para>Maga a probl&eacute;ma a <citetitle>M&uuml;nchausen
+      b&aacute;r&oacute; kalandjai</citetitle> c.  k&ouml;nyvben
+      le&iacute;rtakhoz hasonl&oacute;.  A t&ouml;rt&eacute;net szerint
+      ugyanis a f&#245;szerepl&#245; egy mocs&aacute;rban ragad
+      der&eacute;k lov&aacute;val, azonban siker&uuml;lt kih&uacute;znia
+      mag&aacute;t bel&#245;le a saj&aacute;t haj&aacute;n&aacute;l
+      fogva.  Ez a mot&iacute;vum v&aacute;lt a
+      sz&aacute;m&iacute;t&oacute;g&eacute;pek h&#245;skor&aacute;ban a
+      <firstterm>rendszert&ouml;lt&eacute;s</firstterm>
+      alapj&aacute;v&aacute;, vagyis ahogyan
+      bet&ouml;lt&ouml;tt&eacute;k az oper&aacute;ci&oacute;s
+      rendszereket.  <emphasis>(Ford.: ezt az angolban bootstrappingnek
+      h&iacute;vj&aacute;k, mivel a t&ouml;rt&eacute;net angol
+      v&aacute;ltozata szerint a csizm&aacute;j&aacute;n (boot)
+      emelkedett ki.  Ebb&#245;l alakult ki k&eacute;s&#245;bb az
+      elterjedt bootol&aacute;s sz&oacute; is.)</emphasis></para>
 
-    <indexterm><primary>BIOS</primary></indexterm>
+      <indexterm><primary>BIOS</primary></indexterm>
 
-    <indexterm><primary>Basic Input/Output System</primary><see>BIOS</see></indexterm>
+    <indexterm><primary>Alapvet&#245; be- &eacute;s kimeneti
+      rendszer</primary><see>BIOS</see></indexterm>
 
-    <para>On x86 hardware the Basic Input/Output System (BIOS) is responsible
-      for loading the operating system.  To do this, the BIOS looks on the
-      hard disk for the Master Boot Record (MBR), which must be located on a
-      specific place on the disk.  The BIOS has enough knowledge to load and
-      run the MBR, and assumes that the MBR can then carry out the rest of the
-      tasks involved in loading the operating system,
-      possibly with the help of the BIOS.</para>
+    <para>Az x86-os konfigur&aacute;ci&oacute;kon az alapvet&#245; be-
+      &eacute;s kimeneti rendszer (Basic Input/Output System, BIOS)
+      felel&#245;s az oper&aacute;ci&oacute;s rendszer
+      bet&ouml;lt&eacute;s&eacute;&eacute;rt.  Ehhez a BIOS
+      el&#245;sz&ouml;r megkeresi a merevlemezen, egy speci&aacute;lis
+      helyen tal&aacute;lhat&oacute; Master Boot Record-ot (MBR).  A
+      BIOS elegend&#245; tud&aacute;ssal rendelkezik az MBR
+      beolvas&aacute;s&aacute;hoz &eacute;s
+      lefuttat&aacute;s&aacute;hoz, &eacute;s felt&eacute;telezi, hogy
+      az MBR majd elv&eacute;gzi az oper&aacute;ci&oacute;s rendszer
+      bet&ouml;lt&eacute;s&eacute;hez sz&uuml;ks&eacute;ges
+      tov&aacute;bbi feladatokat, helyenk&eacute;nt a BIOS
+      k&ouml;zrem&#251;k&ouml;d&eacute;s&eacute;vel.</para>
 
     <indexterm><primary>Master Boot Record (MBR)</primary></indexterm>
 
@@ -89,79 +143,127 @@
 
     <indexterm><primary>Boot Loader</primary></indexterm>
 
-    <para>The code within the MBR is usually referred to as a <emphasis>boot
-      manager</emphasis>, especially when it interacts with the user.  In this case
-      the boot manager usually has more code in the first
-      <emphasis>track</emphasis> of the disk or within some OS's file system.  (A
-      boot manager is sometimes also called a <emphasis>boot loader</emphasis>,
-      but FreeBSD uses that term for a later stage of booting.) Popular boot
-      managers include <application>boot0</application> (a.k.a. <application>Boot
-      Easy</application>, the standard &os; boot manager),
-      <application>Grub</application>, <application>GAG</application>, and
-      <application>LILO</application>.
-      (Only <application>boot0</application> fits within the MBR.)</para>
+    <para>Az MBR-ben tal&aacute;lhat&oacute; programk&oacute;dot
+      h&iacute;vj&aacute;k &aacute;ltal&aacute;ban <emphasis>boot
+      manager</emphasis>nek, kiv&aacute;ltk&eacute;pp abban az esetben,
+      amikor az a felhaszn&aacute;l&oacute;val is kommunik&aacute;l.
+      Ilyenkor a boot manager t&ouml;bbnyire tov&aacute;bbi k&oacute;dot
+      tartalmaz a lemez els&#245;
+      <emphasis>s&aacute;v</emphasis>j&aacute;n vagy az egyik
+      &aacute;llom&aacute;nyrendszerben.  (A boot managereket
+      n&eacute;ha <emphasis>boot loader</emphasis>nek is nevezz&uuml;k,
+      de a &os;-s terminol&oacute;gia ezt a kifejez&eacute;st a
+      rendszerind&iacute;t&aacute;s egy k&eacute;s&#245;bbi
+      fokozat&aacute;ra haszn&aacute;lja.) N&eacute;pszer&#251;bb boot
+      managerek: <application>boot0</application> (avagy
+      <application>Boot Easy</application>, a &os; alapvet&#245; boot
+      managere), <application>GRUB</application>,
+      <application>GAG</application> &eacute;s a
+      <application>LILO</application>.  (Ezek k&ouml;z&uuml;l
+      egyed&uuml;l csak a <application>boot0</application> f&eacute;r el
+      az MBR-ben.)</para>
 
-    <para>If you have only one operating system installed on your disks then
-      a standard PC MBR will suffice.  This MBR searches for the first bootable
-      (a.k.a. active) slice on the disk, and then runs the code on that slice to
-      load the remainder of the operating system.  The MBR installed by
-      &man.fdisk.8;, by default, is such an MBR.  It is based on
-      <filename>/boot/mbr</filename>.</para>
+    <para>Amennyiben merevlemezeinken csup&aacute;n egyetlen
+      oper&aacute;ci&oacute;s rendszer foglal helyet, akkor egy
+      szabv&aacute;nyos MBR t&ouml;k&eacute;letes megfelel&#245;.  Ez az
+      MBR megkeresi az els&#245; ind&iacute;that&oacute; (m&aacute;s
+      n&eacute;ven akt&iacute;v) slice-ot a lemezen, majd lefuttatja a
+      benne tal&aacute;lhat&oacute; ind&iacute;t&oacute;k&oacute;dot az
+      oper&aacute;ci&oacute;s rendszer t&ouml;bbi r&eacute;sz&eacute;nek
+      fel&eacute;leszt&eacute;s&eacute;hez.  Az &man.fdisk.8;
+      &aacute;ltal alap&eacute;rtelmez&eacute;s szerint
+      telep&iacute;tett MBR pontosan ilyen.  Ennek alapja a
+      <filename>/boot/mbr</filename> &aacute;llom&aacute;ny.</para>
 
-    <para>If you have installed multiple operating systems on your disks then
-      you can install a different boot manager, one that can display a list of
-      different operating systems, and allows you to choose the one to boot
-      from.  Two of these are discussed in the next subsection.</para>
+    <para>Ha viszont t&ouml;bb oper&aacute;ci&oacute;s rendszert is
+      telep&iacute;tett&uuml;nk a lemezeinkre, akkor egy ett&#245;l
+      elt&eacute;r&#245; boot managert &eacute;rdemes
+      haszn&aacute;lnunk, olyat, amely k&eacute;pes felsorolni a
+      rendelkez&eacute;sre &aacute;ll&oacute; oper&aacute;ci&oacute;s
+      rendszereket, lehet&#245;v&eacute; t&eacute;ve, hogy
+      v&aacute;lasztani lehessen az ind&iacute;t&aacute;suk
+      k&ouml;z&ouml;tt.  Ezek k&ouml;z&uuml;l kett&#245;r&#245;l esik
+      sz&oacute; a k&ouml;vetkez&#245; alfejezetekben.</para>
 
-    <para>The remainder of the FreeBSD bootstrap system is divided into three
-      stages.  The first stage is run by the MBR, which knows just enough to
-      get the computer into a specific state and run the second stage.  The
-      second stage can do a little bit more, before running the third stage.
-      The third stage finishes the task of loading the operating system.  The
-      work is split into these three stages because the PC standards put
-      limits on the size of the programs that can be run at stages one and
-      two.  Chaining the tasks together allows FreeBSD to provide a more
-      flexible loader.</para>
+    <para>A &os; rendszert&ouml;lt&#245; alrendszer&eacute;nek
+      fennmarad&oacute; r&eacute;sze h&aacute;rom fokozatra
+      bonthat&oacute;.  Az els&#245; fokozatot az MBR ind&iacute;tja el,
+      amely pontosan eleget tud ahhoz, hogy a
+      sz&aacute;m&iacute;t&oacute;g&eacute;pet egy el&#245;re megadott
+      &aacute;llapotba hozza &eacute;s lefutassa rajta a m&aacute;sodik
+      fokozatot.  A m&aacute;sodik fokozat enn&eacute;l m&aacute;r egy
+      kicsivel t&ouml;bbre k&eacute;pes, majd ezt k&ouml;veti a harmadik
+      fokozat.  Ez a fokozat z&aacute;rja le v&eacute;g&uuml;l az
+      oper&aacute;ci&oacute;s rendszer bet&ouml;lt&eacute;s&eacute;nek
+      feladat&aacute;t.  A munka teh&aacute;t ezen h&aacute;rom fokozat
+      k&ouml;z&ouml;tt oszlik meg, mivel a PC-szabv&aacute;nyok komoly
+      korl&aacute;toz&aacute;sokat tesznek az els&#245; ill.
+      m&aacute;sodik fokozatban futtathat&oacute; programok
+      m&eacute;ret&eacute;re.  A feladatok ilyen m&oacute;don
+      t&ouml;rt&eacute;n&#245; &ouml;sszef&#251;z&eacute;se azonban a
+      &os; sz&aacute;m&aacute;ra egy sokkalta rugalmasabb
+      bet&ouml;lt&#245;t eredm&eacute;nyez.</para>
 
-    <indexterm><primary>kernel</primary></indexterm>
+    <indexterm><primary>rendszermag</primary></indexterm>
     <indexterm><primary><command>init</command></primary></indexterm>
 
-    <para>The kernel is then started and it begins to probe for devices
-      and initialize them for use.  Once the kernel boot
-      process is finished, the kernel passes control to the user process
-      &man.init.8;, which then makes sure the disks are in a usable state.
-      &man.init.8; then starts the user-level resource configuration which
-      mounts file systems, sets up network cards to communicate on the
-      network, and generally starts all the processes that usually
-      are run on a FreeBSD system at startup.</para>
-  </sect1>
+    <para>Ezut&aacute;n beindul a rendszermag (m&aacute;s n&eacute;ven
+      kernel), &eacute;s nekil&aacute;t a
+      sz&aacute;m&iacute;t&oacute;g&eacute;pben rendelkez&eacute;sre
+      &aacute;ll&oacute; hardvereszk&ouml;z&ouml;k
+      keres&eacute;s&eacute;nek, majd el&#245;k&eacute;sz&iacute;ti
+      &#245;ket a haszn&aacute;latra.  Ahogy a rendszermag
+      beind&iacute;t&aacute;s&aacute;nak folyamata v&eacute;get
+      &eacute;rt, az &aacute;tadja a vez&eacute;rl&eacute;st az
+      &man.init.8; nev&#251; felhaszn&aacute;l&oacute;i programnak,
+      amely megbizonyosodik a lemezek
+      haszn&aacute;lhat&oacute;s&aacute;g&aacute;r&oacute;l.  Az
+      &man.init.8; ezt k&ouml;vet&#245;en megkezdi az
+      er&#245;forr&aacute;sok felhaszn&aacute;l&oacute;i szint&#251;
+      bekonfigur&aacute;l&aacute;s&aacute;t: csatlakoztatja az
+      &aacute;llom&aacute;nyrendszereket, be&aacute;ll&iacute;tja a
+      h&aacute;l&oacute;zati k&aacute;rty&aacute;(ka)t, &eacute;s
+      elind&iacute;tja mindazon programokat, amelyeknek egy &os;
+      rendszer indul&aacute;sakor futnia kell.</para>
+
+ </sect1>
 
   <sect1 id="boot-blocks">
-    <title>The Boot Manager and Boot Stages</title>
+    <title>A boot manager &eacute;s az indul&aacute;s fokozatai</title>
 
     <indexterm><primary>Boot Manager</primary></indexterm>
 
     <sect2 id="boot-boot0">
-      <title>The Boot Manager</title>
+      <title>A boot manager</title>
       <indexterm><primary>Master Boot Record (MBR)</primary></indexterm>
 
-      <para>The code in the MBR or boot manager is sometimes referred to as
-        <emphasis>stage zero</emphasis> of the boot process.  This subsection
-        discusses two of the boot managers previously mentioned:
-        <application>boot0</application> and <application>LILO</application>.</para>
+      <para>Az MBR-ben tal&aacute;lhat&oacute; programk&oacute;dot,
+	avagy boot managert, sokszor csak a rendszerind&iacute;t&aacute;s
+	<emphasis>nulladik fokozat</emphasis>ak&eacute;nt emlegetik.  Ez
+	az alfejezet a kor&aacute;bban eml&iacute;tett k&eacute;t boot
+	managert t&aacute;rgyalja: a <application>boot0</application>-t
+	&eacute;s a <application>LILO</application>-t.</para>
 
-      <formalpara><title>The <application>boot0</application> Boot Manager:</title>
-        <para>The MBR installed by FreeBSD's installer or &man.boot0cfg.8;, by
-          default, is based on <filename>/boot/boot0</filename>.
-          (The <application>boot0</application> program is very simple, since the
-          program in the <abbrev>MBR</abbrev> can only be 446 bytes long because of the slice
-          table and <literal>0x55AA</literal> identifier at the end of the MBR.)
-          If you have installed <application>boot0</application> and
-          multiple operating systems on your hard disks, then you will see a
-          display similar to this one at boot time:</para></formalpara>
+      <formalpara><title>A <application>boot0</application> boot manager:</title>
+	<para>A &os; telep&iacute;t&#245;je vagy a &man.boot0cfg.8;
+	  &aacute;ltal kialak&iacute;tott MBR alap&eacute;rtelmezett
+	  &aacute;llapotban a <filename>/boot/boot0</filename>
+	  &aacute;llom&aacute;nyon alapszik.  (A
+	  <application>boot0</application> program nagyon egyszer&#251;,
+	  hiszen az <abbrev>MBR</abbrev>-ben elhelyezhet&#245;
+	  k&oacute;d csak 446 byte hossz&uacute;s&aacute;g&uacute;
+	  lehet, mert a v&eacute;g&eacute;ben m&eacute;g el kell
+	  f&eacute;rnie a slice-t&aacute;bl&aacute;nak &eacute;s az
+	  <literal>0x55AA</literal> azonos&iacute;t&oacute;nak.) Ha
+	  telep&iacute;tett&uuml;k a <application>boot0</application>-t
+	  &eacute;s lemezeinken t&ouml;bb oper&aacute;ci&oacute;s
+	  rendszer is megtal&aacute;lhat&oacute;, akkor a
+	  rendszerind&iacute;t&aacute;s sor&aacute;n egy hasonl&oacute;
+	  k&eacute;pet kell l&aacute;tnunk:</para>
+      </formalpara>
 
       <example id="boot-boot0-example">
-	<title><filename>boot0</filename> Screenshot</title>
+	<title>A <filename>boot0</filename> munk&aacute;ban</title>
 
 	<screen>F1 DOS
 F2 FreeBSD
@@ -172,178 +274,261 @@
 Default: F2</screen>
       </example>
 
-      <para>Other operating systems, in particular &windows;, have been known
-	to overwrite an existing MBR with their own.  If this happens to you,
-	or you want to replace your existing MBR with the FreeBSD MBR then use
-	the following command:</para>
+      <para>M&aacute;s oper&aacute;ci&oacute;s rendszerek,
+	k&uuml;l&ouml;n&ouml;sen a &windows;,
+	telep&iacute;t&eacute;s&uuml;k sor&aacute;n
+	fel&uuml;l&iacute;rj&aacute;k a m&aacute;r meglev&#245; MBR-t a
+	saj&aacute;tjukkal.  Ha ez t&ouml;rt&eacute;nne, vagy
+	egyszer&#251;en csak szeretn&eacute;nk a meglev&#245; MBR-t
+	lecser&eacute;lni a &os; MBR-j&eacute;vel, adjuk ki a
+	k&ouml;vetkez&#245; parancsot:</para>
+
+      <screen>&prompt.root; <userinput>fdisk -B -b /boot/boot0 <replaceable>eszköznév</replaceable></userinput></screen>
 
-      <screen>&prompt.root; <userinput>fdisk -B -b /boot/boot0 <replaceable>device</replaceable></userinput></screen>
+      <para>ahol az <replaceable>eszk&ouml;zn&eacute;v</replaceable>
+	annak az eszk&ouml;znek a neve, ahonnan a rendszert
+	ind&iacute;tani szeretn&eacute;nk, teh&aacute;t pl.
+	<devicename>ad0</devicename> az els&#245; IDE-lemez
+	eset&eacute;n, vagy <devicename>ad2</devicename> a
+	m&aacute;sodik IDE-vez&eacute;rl&#245;n tal&aacute;lhat&oacute;
+	els&#245; IDE-lemez eset&eacute;n, ill.
+	<devicename>da0</devicename> az els&#245; SCSI-lemez
+	eset&eacute;n &eacute;s &iacute;gy tov&aacute;bb.  Vagy ha
+	testre akarjuk szabni az MBR-t, haszn&aacute;ljuk a
+	&man.boot0cfg.8;-t.</para>
 
-      <para>where <replaceable>device</replaceable> is the device that you
-	boot from, such as <devicename>ad0</devicename> for the first IDE
-	disk, <devicename>ad2</devicename> for the first IDE disk on a second
-	IDE controller, <devicename>da0</devicename> for the first SCSI disk,
-	and so on.  Or, if you want a custom configuration of the MBR,
-	use &man.boot0cfg.8;.</para>
+      <formalpara><title>A LILO boot manager:</title>
 
-      <formalpara><title>The LILO Boot Manager:</title>
+	<para>Ezen boot manager telep&iacute;t&eacute;s&eacute;hez
+	  &eacute;s be&aacute;ll&iacute;t&aacute;s&aacute;hoz,
+	  els&#245;k&eacute;nt ind&iacute;tsuk el a &linux;-ot &eacute;s
+	  vegy&uuml;k hozz&aacute; az al&aacute;bbi sort a
+	  rendszer&uuml;nkben tal&aacute;lhat&oacute;
+	  <filename>/etc/lilo.conf</filename>
+	  konfigur&aacute;ci&oacute;s &aacute;llom&aacute;nyhoz:</para>
 
-	<para>To install this boot manager so it will also boot FreeBSD, first
-	  start Linux and add the following to your existing
-	  <filename>/etc/lilo.conf</filename> configuration file:</para></formalpara>
+      </formalpara>
 
       <programlisting>other=/dev/hdXY
 table=/dev/hdX
 loader=/boot/chain.b
 label=FreeBSD</programlisting>
 
-      <para>In the above, specify FreeBSD's primary partition and drive using
-	Linux specifiers, replacing <replaceable>X</replaceable> with the Linux
-	drive letter and <replaceable>Y</replaceable> with the Linux primary
-	partition number.  If you are using a <acronym>SCSI</acronym> drive, you
-	will need to change <replaceable>/dev/hd</replaceable> to read something
-	similar to <replaceable>/dev/sd</replaceable>.  The
-	<option>loader=/boot/chain.b</option> line can be omitted if you have
-	both operating systems on the same drive.  Now run
-	<command>/sbin/lilo&nbsp;-v</command> to commit your new changes to the
-	system; this should be verified by checking its screen messages.</para>
+      <para>A fenti sablont kieg&eacute;sz&iacute;tve, a &linux;-os
+	konvenci&oacute;k szerint adjuk meg a &os; els&#245;dleges
+	part&iacute;ci&oacute;j&aacute;t &eacute;s
+	meghajt&oacute;j&aacute;t &uacute;gy, hogy a
+	<replaceable>X</replaceable>-et &aacute;t&iacute;rjuk a
+	&linux;-os meghajt&oacute; bet&#251;jel&eacute;re &eacute;s az
+	<replaceable>Y</replaceable>-t &aacute;t&iacute;rjuk a &linux;
+	els&#245;dleges part&iacute;ci&oacute;j&aacute;nak
+	sz&aacute;m&aacute;ra.  Ha
+	<acronym>SCSI</acronym>-meghajt&oacute;t haszn&aacute;lunk, a
+	<replaceable>/dev/hd</replaceable> r&eacute;szt is &aacute;t
+	kell &iacute;rnunk az im&eacute;ntiekkel mellett
+	<replaceable>/dev/sd</replaceable>-re.  A
+	<option>loader=/boot/chain.b</option> sor elhagyhat&oacute;
+	abban az esetben, ha mind a k&eacute;t oper&aacute;ci&oacute;s
+	rendszer ugyanazon a meghajt&oacute;n tal&aacute;lhat&oacute;.
+	Ha befejezt&uuml;k a m&oacute;dos&iacute;t&aacute;st, futtassuk
+	le a <command>/sbin/lilo&nbsp;-v</command> parancsot a
+	v&aacute;ltoztat&aacute;saink &eacute;letbe
+	l&eacute;ptet&eacute;s&eacute;hez.  Ezt
+	ellen&#245;rizhetj&uuml;k is a k&eacute;perny&#245;n
+	megjelen&#245; &uuml;zenetek alapj&aacute;n.</para>
+
     </sect2>
-  
+
     <sect2 id="boot-boot1">
-      <title>Stage One, <filename>/boot/boot1</filename>, and Stage Two,
-	<filename>/boot/boot2</filename></title>
-      
-      <para>Conceptually the first and second stages are part of the same
-	program, on the same area of the disk.  Because of space constraints
-	they have been split into two, but you would always install them
-	together.  They are copied from the combined file
-	<filename>/boot/boot</filename> by the installer or
-	<application>bsdlabel</application> (see below).</para>
+      <title>Az els&#245; fokozat (<filename>/boot/boot1</filename>)
+	&eacute;s a m&aacute;sodik fokozat
+	(<filename>/boot/boot2</filename>)</title>
+
+      <para>Az els&#245; &eacute;s a m&aacute;sodik fokozat fogalmilag
+	ugyannak a programnak a r&eacute;sze, a lemezen ugyanott
+	helyezkedik el.  A t&aacute;rbeli megszor&iacute;t&aacute;sok
+	miatt ugyan el kellett v&aacute;lasztani &#245;ket
+	egym&aacute;st&oacute;l, de a telep&iacute;t&eacute;s&uuml;k
+	mindig egy helyre t&ouml;rt&eacute;nik.  A telep&iacute;t&#245;
+	vagy a <application>bsdlabel</application> (ld.  lentebb)
+	haszn&aacute;lata sor&aacute;n a <filename>/boot/boot</filename>
+	nev&#251; kombin&aacute;lt &aacute;llom&aacute;nyb&oacute;l
+	m&aacute;sol&oacute;dnak ki.</para>
+
+      <para>Az &aacute;llom&aacute;nyrendszereken k&iacute;v&uuml;l
+	tal&aacute;lhat&oacute;ak, az akt&iacute;v slice els&#245;
+	s&aacute;vj&aacute;ban, annak els&#245;
+	szektor&aacute;t&oacute;l kezd&#245;d&#245;en.  Ez az a hely,
+	ahol a <link linkend="boot-boot0">boot0</link> ill.  a
+	t&ouml;bbi boot manager is keresi a
+	rendszerind&iacute;t&aacute;s folytat&aacute;s&aacute;ra
+	alkalmas programot.  A felhaszn&aacute;lt szektorok sz&aacute;ma
+	k&ouml;nnyed&eacute;n kider&iacute;thet&#245; a
+	<filename>/boot/boot</filename>
+	m&eacute;ret&eacute;b&#245;l.</para>
 
-      <para>They are located outside file systems, in the first track of
-	the boot slice, starting with the first sector.  This is where <link
-	linkend="boot-boot0">boot0</link>, or any other boot manager,
-	expects to find a program to run which will
-	continue the boot process.  The number of sectors used is easily
-	determined from the size of <filename>/boot/boot</filename>.</para>
+      <para>Legfeljebb 512 byte-os m&eacute;ret&eacute;n&eacute;l fogva
+	a <filename>boot1</filename> &aacute;llom&aacute;ny nagyon
+	egyszer&#251; fel&eacute;p&iacute;t&eacute;s&#251;, &eacute;s
+	&eacute;ppen csak annyit tud a slice-ra vonatkoz&oacute;
+	inform&aacute;ci&oacute;kat t&aacute;rol&oacute; &os;
+	<firstterm>bsdlabel</firstterm>-r&#245;l, hogy megtal&aacute;lja
+	a <filename>boot2</filename>-t &eacute;s
+	elind&iacute;tsa.</para>
 
-      <para><filename>boot1</filename> is very simple, since it
-	can only be 512 bytes
-	in size, and knows just enough about the FreeBSD
-	<firstterm>bsdlabel</firstterm>, which stores information
-	about the slice, to find and execute <filename>boot2</filename>.</para>
-      
-      <para><filename>boot2</filename> is slightly more sophisticated, and understands
-	the FreeBSD file system enough to find files on it, and can
-	provide a simple interface to choose the kernel or loader to
-	run.</para>
+      <para>A <filename>boot2</filename> m&aacute;r egy kicsivel
+	&uuml;gyesebb, &eacute;s ismeri el&eacute;gg&eacute; a &os;
+	&aacute;llom&aacute;nyrendszer&eacute;t ahhoz, hogy
+	megtal&aacute;ljon rajta &aacute;llom&aacute;nyokat, valamint
+	k&eacute;pes egy egyszer&#251; fel&uuml;letet ny&uacute;jtani a
+	rendszermag vagy a bet&ouml;lt&#245;
+	megv&aacute;laszt&aacute;s&aacute;hoz.</para>
 
-      <para>Since the <link linkend="boot-loader">loader</link> is
-	much more sophisticated, and provides a nice easy-to-use
-	boot configuration, <filename>boot2</filename> usually runs
-	it, but previously it
-	was tasked to run the kernel directly.</para>
+      <para>Mivel a <link linkend="boot-loader">bet&ouml;lt&#245;</link>
+	pedig m&aacute;r enn&eacute;l is okosabb, &eacute;s egy
+	k&ouml;nnyen haszn&aacute;lhat&oacute;
+	rendszerind&iacute;t&aacute;si konfigur&aacute;ci&oacute;t tud a
+	felhaszn&aacute;l&oacute; sz&aacute;m&aacute;ra ny&uacute;jtani,
+	ez&eacute;rt a <filename>boot2</filename>
+	&aacute;ltal&aacute;ban ezt ind&iacute;tja el, de el&#245;tte
+	k&ouml;zvetlen&uuml;l a rendszermag futtat&aacute;s&aacute;t
+	v&eacute;gzi el.</para>
 
       <example id="boot-boot2-example">
-	<title><filename>boot2</filename> Screenshot</title>
+	<title>A <filename>boot2</filename> m&#251;k&ouml;d&eacute;s
+	  k&ouml;zben</title>
 
 	<screen>&gt;&gt; FreeBSD/i386 BOOT
 Default: 0:ad(0,a)/boot/loader
 boot:</screen>
       </example>
 
-      <para>If you ever need to replace the installed
-	<filename>boot1</filename> and <filename>boot2</filename> use
-	&man.bsdlabel.8;:</para>
-      
-      <screen>&prompt.root; <userinput>bsdlabel -B <replaceable>diskslice</replaceable></userinput></screen>
+      <para>Ha le kellene v&aacute;ltani a kor&aacute;bban
+	telep&iacute;tett <filename>boot1</filename> &eacute;s
+	<filename>boot2</filename> fokozatokat, haszn&aacute;ljuk a
+	&man.bsdlabel.8;-t:</para>
+
+      <screen>&prompt.root; <userinput>bsdlabel -B <replaceable>lemezslice</replaceable></userinput></screen>
 
-      <para>where <replaceable>diskslice</replaceable> is the disk and slice
-	you boot from, such as <devicename>ad0s1</devicename> for the first
-	slice on the first IDE disk.</para>
+      <para>ahol a <replaceable>lemezslice</replaceable> annak a
+	lemeznek &eacute;s slice-nak a kombin&aacute;ci&oacute;ja,
+	ahonnan ind&iacute;tjuk a rendszer&uuml;nket, pl.  az els&#245;
+	IDE-lemez els&#245; slice-a eset&eacute;n ez az
+	<devicename>ad0s1</devicename>.</para>
 
       <warning>
-	<title>Dangerously Dedicated Mode</title>
+	<title>A vesz&eacute;lyesen dedik&aacute;lt m&oacute;d</title>
 
-	<para>If you use just the disk name, such as
-	  <devicename>ad0</devicename>, in the &man.bsdlabel.8; command you
-	  will create a dangerously dedicated disk, without slices.  This is
-	  almost certainly not what you want to do, so make sure you double
-	  check the &man.bsdlabel.8; command before you press
-	  <keycap>Return</keycap>.</para>
+	<para>Amikor a &man.bsdlabel.8; megh&iacute;v&aacute;sakor csak
+	  a lemez nev&eacute;t haszn&aacute;ljuk, pl.
+	  <devicename>ad0</devicename>-t, a parancs egy
+	  vesz&eacute;lyesen dedik&aacute;lt lemezt hoz l&eacute;tre,
+	  slice-ok n&eacute;lk&uuml;l!  Szinte biztos, hogy nem ez az,
+	  amire sz&uuml;ks&eacute;g&uuml;nk lenne, ez&eacute;rt mindig
+	  ellen&#245;rizz&uuml;k kiad&aacute;sa el&#245;tt a
+	  &man.bsdlabel.8; parancsot!</para>
       </warning>
     </sect2>
 
   <sect2 id="boot-loader">
-    <title>Stage Three, <filename>/boot/loader</filename></title>
+    <title>A harmadik fokozat
+      (<filename>/boot/loader</filename>)</title>
 
     <indexterm><primary>boot-loader</primary></indexterm>
-    <para>The loader is the final stage of the three-stage
-      bootstrap, and is located on the file system, usually as
-      <filename>/boot/loader</filename>.</para>
-      
-    <para>The loader is intended as a user-friendly method for
-      configuration, using an easy-to-use built-in command set,
-      backed up by a more powerful interpreter, with a more complex
-      command set.</para> 
+    <para>A bet&ouml;lt&#245; a h&aacute;rom fokozat&uacute;
+      rendszert&ouml;lt&eacute;s utols&oacute; &aacute;llom&aacute;sa.  Az
+      &aacute;llom&aacute;nyrendszerben
+      <filename>/boot/loader</filename> n&eacute;ven tal&aacute;lhatjuk
+      meg.</para>
+
+    <para>A rendszert&ouml;lt&#245;t az egyszer&#251;
+      konfigur&aacute;lhat&oacute;s&aacute;got t&aacute;mogat&oacute;,
+      felhaszn&aacute;l&oacute;bar&aacute;t eszk&ouml;znek
+      tervezt&eacute;k, &eacute;s k&ouml;nnyen megtanulhat&oacute;,
+      be&eacute;p&iacute;tett parancsokat haszn&aacute;l, melyek
+      m&ouml;g&ouml;tt egy &ouml;sszetettebb parancsokat ismer&#245;,
+      er&#245;sebb &eacute;rtelmez&#245; &aacute;ll.</para>
 
     <sect3 id="boot-loader-flow">
-      <title>Loader Program Flow</title>
-      
-      <para>During initialization, the loader will probe for a
-	console and for disks, and figure out what disk it is
-	booting from.  It will set variables accordingly, and an
-	interpreter is started where user commands can be passed from
-	a script or interactively.</para>
-      <indexterm><primary>loader</primary></indexterm>
-      <indexterm><primary>loader configuration</primary></indexterm>
+      <title>A rendszert&ouml;lt&#245; m&#251;k&ouml;d&eacute;se</title>
+
+      <para>Az inicializ&aacute;l&aacute;s sor&aacute;n a
+	rendszert&ouml;lt&#245; megpr&oacute;b&aacute;lja megkeresni a
+	konzolt &eacute;s a lemezek k&ouml;z&uuml;l igyekszik
+	megtal&aacute;lni azt, amelyr&#245;l elindult a rendszer.  A
+	keres&eacute;sek eredm&eacute;ny&eacute;nek megfelel&#245;en
+	be&aacute;ll&iacute;tja a v&aacute;ltoz&oacute;kat, majd elindul
+	egy &eacute;rtelmez&#245;, ahol vagy szkriptb&#245;l olvasva
+	vagy pedig interakt&iacute;van feldolgoz&aacute;sra
+	ker&uuml;lnek a parancsok.</para>
+      <indexterm><primary>rendszert&ouml;lt&#245;</primary></indexterm>
+      <indexterm><primary>a rendszert&ouml;lt&#245;
+	konfigur&aacute;ci&oacute;ja</primary></indexterm>
 
-      <para>The loader will then read
-	<filename>/boot/loader.rc</filename>, which by default reads
-	in <filename>/boot/defaults/loader.conf</filename> which
-	sets reasonable defaults for variables and reads
-	<filename>/boot/loader.conf</filename> for local changes to
-	those variables.  <filename>loader.rc</filename> then acts
-	on these variables, loading whichever modules and kernel are
-	selected.</para>
+      <para>A rendszert&ouml;lt&#245; ezt k&ouml;vet&#245;en beolvassa a
+	<filename>/boot/loader.rc</filename> &aacute;llom&aacute;nyt,
+	ami pedig alap&eacute;rtelmez&eacute;s szerint feldolgozza a
+	<filename>/boot/defaults/loader.conf</filename>
+	&aacute;llom&aacute;nyt, ahol a v&aacute;ltoz&oacute;k
+	&eacute;rtelmes kezd&#245;&eacute;rt&eacute;ket kapnak, valamint
+	feldolgozza m&eacute;g a <filename>/boot/loader.conf</filename>
+	&aacute;llom&aacute;nyt is, ahol a v&aacute;ltoz&oacute;k
+	&eacute;rt&eacute;keit v&aacute;ltoztathatjuk meg.
+	Miut&aacute;n ez lezajlott, a <filename>loader.rc</filename> a
+	v&aacute;ltoz&oacute;k &eacute;rt&eacute;keinek megfelel&#245;en
+	cselekszik, bet&ouml;ltve az ily m&oacute;don
+	kiv&aacute;lasztott rendszermagot &eacute;s a hozz&aacute;
+	v&aacute;lasztott modulokat.</para>
 
-      <para>Finally, by default, the loader issues a 10 second wait
-	for key presses, and boots the kernel if it is not interrupted.
-	If interrupted, the user is presented with a prompt which
-	understands the easy-to-use command set, where the user may
-	adjust variables, unload all modules, load modules, and then
-	finally boot or reboot.</para>
+      <para>V&eacute;gezet&uuml;l, a rendszert&ouml;lt&#245; beiktat
+	egy, alap&eacute;rtelmez&eacute;s szerint 10 m&aacute;sodperces,
+	v&aacute;rakoz&aacute;st, majd elind&iacute;tja a rendszermagot,
+	ha azt meg nem szak&iacute;tjuk egy billenty&#251;
+	lenyom&aacute;s&aacute;val.  Ha megszak&iacute;tjuk ezt a
+	v&aacute;rakoz&aacute;st, a rendszert&ouml;lt&#245; egy
+	parancssort ad, amin kereszt&uuml;l egyszer&#251; parancsokat
+	adhatunk ki neki: &aacute;ll&iacute;thatjuk a
+	v&aacute;ltoz&oacute;k &eacute;rt&eacute;keit, kidobathatjuk a
+	modulokat a mem&oacute;ri&aacute;b&oacute;l, modulokat
+	t&ouml;ltethet&uuml;nk be, elind&iacute;thatjuk a rendszert vagy
+	&uacute;jraind&iacute;thatjuk a
+	sz&aacute;m&iacute;t&oacute;g&eacute;pet.</para>
 
     </sect3>
-    
+
     <sect3 id="boot-loader-commands">
-      <title>Loader Built-In Commands</title>
-      
-      <para>These are the most commonly used loader commands.  For a
-        complete discussion of all available commands, please see
-        &man.loader.8;.</para>
+      <title>A rendszert&ouml;lt&#245; be&eacute;p&iacute;tett
+	parancsai</title>
+
+      <para>K&ouml;vetkezzenek a leggyakrabban haszn&aacute;lt parancsok
+	a rendszert&ouml;lt&#245;ben.  Az &ouml;sszes itt
+	el&eacute;rhet&#245; parancsot a &man.loader.8; man oldalon
+	tal&aacute;ljuk meg.</para>
 
       <variablelist>
 	<varlistentry>
-	  <term>autoboot <replaceable>seconds</replaceable></term>
+	  <term>autoboot
+	    <replaceable>m&aacute;sodperc</replaceable></term>
 
 	  <listitem>
-	    <para>Proceeds to boot the kernel if not interrupted
-	      within the time span given, in seconds.  It displays a
-	      countdown, and the default time span is 10
-	      seconds.</para>
+	    <para>Megkezdi a rendszermag bet&ouml;lt&eacute;s&eacute;t,
+	      ha nem szak&iacute;tjuk meg a v&aacute;rakoz&aacute;st
+	      m&aacute;sodpercekben megadott id&#245;tartam alatt.
+	      Ekkor egy visszasz&aacute;ml&aacute;l&aacute;st
+	      l&aacute;thatunk, ami az alap&eacute;rtelmez&eacute;s
+	      szerint 10 m&aacute;sodperct&#245;l indul.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>boot
-	    <optional><replaceable>-options</replaceable></optional>
-	    <optional><replaceable>kernelname</replaceable></optional></term>
+	    <optional><replaceable>-opci&oacute;k</replaceable></optional>
+	    <optional><replaceable>rendszermag</replaceable></optional></term>
 
 	  <listitem>
-	    <para>Immediately proceeds to boot the kernel, with the
-	      given options, if any, and with the kernel name given,
-	      if it is.</para>
+	    <para>Amennyiben l&eacute;teznek, a megadott
+	      opci&oacute;kkal azonnal megkezdi a megadott rendszermag
+	      bet&ouml;lt&eacute;s&eacute;t.</para>
 	  </listitem>
 	</varlistentry>
 
@@ -351,65 +536,84 @@
 	  <term>boot-conf</term>
 
 	  <listitem>
-	    <para>Goes through the same automatic configuration of
-	      modules based on variables as what happens at boot.
-	      This only makes sense if you use
-	      <command>unload</command> first, and change some
-	      variables, most commonly <envar>kernel</envar>.</para>
+	    <para>V&eacute;gigmegy a modulok ugyanazon automatikus
+	      konfigur&aacute;ci&oacute;j&aacute;n, ahogy az a
+	      norm&aacute;lis rendszerind&iacute;t&aacute;s sor&aacute;n
+	      is t&ouml;rt&eacute;nik.  Ezen parancs
+	      haszn&aacute;lat&aacute;nak csak akkor van &eacute;rtelme,
+	      ha el&#245;tte az <command>unload</command> parancsot
+	      haszn&aacute;ljuk, megv&aacute;ltoztatunk egy-k&eacute;t
+	      v&aacute;ltoz&oacute;t, &aacute;ltal&aacute;ban a
+	      <envar>kernel</envar>-t.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
 	  <term>help
-	    <optional><replaceable>topic</replaceable></optional></term>
+	    <optional><replaceable>t&eacute;mak&ouml;r</replaceable></optional></term>
 
 	  <listitem>
-	    <para>Shows help messages read from
-	      <filename>/boot/loader.help</filename>.  If the topic
-	      given is <literal>index</literal>, then the list of
-	      available topics is given.</para>
+	    <para>A <filename>/boot/loader.help</filename>
+	      &aacute;llom&aacute;nyban fellelhet&#245;
+	      s&uacute;g&oacute;&uuml;zeneteket mutatja meg.  Ha
+	      t&eacute;mak&ouml;rnek <literal>index</literal>et adunk
+	      meg, akkor az el&eacute;rhet&#245;
+	      t&eacute;mak&ouml;r&ouml;k list&aacute;j&aacute;t kapjuk
+	      meg.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>include <replaceable>filename</replaceable>
+	  <term>include
+	    <replaceable>&aacute;llom&aacute;nyn&eacute;v</replaceable>
 	    &hellip;</term>
 
 	  <listitem>
-	    <para>Processes the file with the given filename.  The
-	      file is read in, and interpreted line by line.  An
-	      error immediately stops the include command.</para>
+	    <para>Feldolgozza a megnevezett &aacute;llom&aacute;nyt:
+	      beolvassa, majd sorr&oacute;l-sorra &eacute;rtelmezi.  Hiba
+	      eset&eacute;n azonnal meg&aacute;ll&iacute;tja a
+	      feldolgoz&aacute;st.</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term>load <optional><option>-t</option>
-	    <replaceable>type</replaceable></optional>
-	    <replaceable>filename</replaceable></term>
+	    <replaceable>t&iacute;pus</replaceable></optional>
+	    <replaceable>&aacute;llom&aacute;nyn&eacute;v</replaceable></term>
 
 	  <listitem>
-	    <para>Loads the kernel, kernel module, or file of the
-	      type given, with the filename given.  Any arguments
-	      after filename are passed to the file.</para>
+	    <para>A n&eacute;v alapj&aacute;n bet&ouml;lti a
+	      rendszermagot, modult vagy az adott t&iacute;pus&uacute;
+	      &aacute;llom&aacute;nyt.  Az
+	      &aacute;llom&aacute;nyn&eacute;v ut&aacute;n megadott
+	      tov&aacute;bbi param&eacute;terek az
+	      &aacute;llom&aacute;nynak ad&oacute;dnak &aacute;t.</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term>ls <optional><option>-l</option></optional>
-	    <optional><replaceable>path</replaceable></optional></term>
+	    <optional><replaceable>el&eacute;r&eacute;si
+	    &uacute;tvonal</replaceable></optional></term>
 
 	  <listitem>
-	    <para>Displays a listing of files in the given path, or
-	      the root directory, if the path is not specified.  If
-	      <option>-l</option> is specified, file sizes will be
-	      shown too.</para>
+	    <para>Kilist&aacute;zza a megadott el&eacute;r&eacute;si
+	      &uacute;tvonalon tal&aacute;lhat&oacute;
+	      &aacute;llom&aacute;nyokat, vagy ennek
+	      hi&aacute;ny&aacute;ban a gy&ouml;k&eacute;r
+	      tartalm&aacute;t.  Ha hozz&aacute;tessz&uuml;k a
+	      <option>-l</option> kapcsol&oacute;t, az
+	      &aacute;llom&aacute;nyok m&eacute;rete is
+	      l&aacute;that&oacute; v&aacute;lik.</para>
 	  </listitem>
 	</varlistentry>
 	<varlistentry>
 	  <term>lsdev <optional><option>-v</option></optional></term>
 
 	  <listitem>
-	    <para>Lists all of the devices from which it may be
-	      possible to load modules. If <option>-v</option> is
-	      specified, more details are printed.</para>
+	    <para>Kilist&aacute;zza az &ouml;sszes olyan eszk&ouml;zt,
+	      ahonnan modulokat t&ouml;lthet&uuml;nk be.  Amennyiben a
+	      <option>-v</option> kapcsol&oacute;t is megadjuk,
+	      tov&aacute;bbi r&eacute;szleteket tudhatunk meg
+	      r&oacute;luk.</para>
 	  </listitem>
 	</varlistentry>
 
@@ -417,17 +621,21 @@
 	  <term>lsmod <optional><option>-v</option></optional></term>
 
 	  <listitem>
-	    <para>Displays loaded modules. If <option>-v</option> is
-	      specified, more details are shown.</para>
+	    <para>Kilist&aacute;zza a bet&ouml;lt&ouml;tt modulokat.  Ha
+	      t&ouml;bbet szeretn&eacute;nk megtudni r&oacute;luk, adjuk
+	      meg a <option>-v</option> kapcsol&oacute;t.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>more <replaceable>filename</replaceable></term>
+	  <term>more
+	    <replaceable>&aacute;llom&aacute;nyn&eacute;v</replaceable></term>
 
 	  <listitem>
-	    <para>Displays the files specified, with a pause at each
-	      <varname>LINES</varname> displayed.</para>
+	    <para>Megmutatja a megadott &aacute;llom&aacute;ny
+	      tartalm&aacute;t, minden <varname>LINES</varname>
+	      sz&aacute;m&uacute; sor ut&aacute;n sz&uuml;netet
+	      tartva.</para>
 	  </listitem>
 	</varlistentry>
 
@@ -435,17 +643,21 @@
 	  <term>reboot</term>
 
 	  <listitem>
-	    <para>Immediately reboots the system.</para>
+	    <para>Azonnal &uacute;jraind&iacute;tja a
+	      sz&aacute;m&iacute;t&oacute;g&eacute;pet.</para>
 	  </listitem>
 	</varlistentry>
 
 	<varlistentry>
-	  <term>set <replaceable>variable</replaceable></term>
+	  <term>set
+	    <replaceable>v&aacute;ltoz&oacute;</replaceable></term>
 	  <term>set
-	    <replaceable>variable</replaceable>=<replaceable>value</replaceable></term>
+	  <replaceable>v&aacute;ltoz&oacute;</replaceable>=<replaceable>&eacute;rt&eacute;k</replaceable></term>
 
 	  <listitem>
-	    <para>Sets the loader's environment variables.</para>
+	    <para>Be&aacute;ll&iacute;tja a rendszert&ouml;lt&#245;
+	      k&ouml;rnyezeti v&aacute;ltoz&oacute;j&aacute;nak
+	      &eacute;rt&eacute;k&eacute;t.</para>
 	  </listitem>
 	</varlistentry>
 
@@ -453,29 +665,34 @@
 	  <term>unload</term>
 
 	  <listitem>
-	    <para>Removes all loaded modules.</para>
+	    <para>Kidobja a mem&oacute;ri&aacute;b&oacute;l az
+	      &ouml;sszes bet&ouml;lt&ouml;tt modult.</para>
 	  </listitem>
 	</varlistentry>
       </variablelist>
     </sect3>
 
     <sect3 id="boot-loader-examples">
-      <title>Loader Examples</title>
+      <title>Rendszert&ouml;lt&#245; p&eacute;ld&aacute;k</title>
 
-      <para>Here are some practical examples of loader usage:</para>
+      <para>&Iacute;me n&eacute;h&aacute;ny konkr&eacute;t p&eacute;lda
+	a rendszert&ouml;lt&#245; haszn&aacute;lat&aacute;ra:</para>
 
       <itemizedlist>
-	<indexterm><primary>single-user mode</primary></indexterm>
+	<indexterm><primary>egyfelhaszn&aacute;l&oacute;s
+	  m&oacute;d</primary></indexterm>
 	<listitem>
-	  <para>To simply boot your usual kernel, but in single-user
-	    mode:</para>
+	  <para>&Iacute;gy ind&iacute;thatjuk
+	    egyfelhaszn&aacute;l&oacute;s m&oacute;dban az &aacute;ltalunk
+	    haszn&aacute;lt rendszermagot:</para>
 
 	  <screen><userinput>boot -s</userinput></screen>
 	</listitem>
 
 	<listitem>
-	  <para>To unload your usual kernel and modules, and then
-	    load just your old (or another) kernel:</para>
+	  <para>Dobjuk ki a bet&ouml;lt&ouml;tt rendszermagot &eacute;s
+	    a moduljait, &eacute;s t&ouml;lts&uuml;k be helyett&uuml;k a
+	    kor&aacute;bbi (vagy egy m&aacute;sik) rendszermagot:</para>
     <indexterm>
       <primary><filename>kernel.old</filename></primary>
     </indexterm>
@@ -483,15 +700,19 @@
 	  <screen><userinput>unload</userinput>
 <userinput>load <replaceable>kernel.old</replaceable></userinput></screen>
 
-	  <para>You can use <filename>kernel.GENERIC</filename> to
-	    refer to the generic kernel that comes on the install
-	    disk, or <filename>kernel.old</filename> to refer to
-	    your previously installed kernel (when you have upgraded
-	    or configured your own kernel, for example).</para>
+	  <para>Itt haszn&aacute;lhatjuk a
+	    <filename>kernel.GENERIC</filename> nevet is, amely a
+	    telep&iacute;t&#245;lemezen tal&aacute;lhat&oacute;
+	    &aacute;ltal&aacute;nos rendszermagra utal, vagy a
+	    <filename>kernel.old</filename> nevet, amely a
+	    kor&aacute;bban haszn&aacute;lt rendszermagot rejti (pl.
+	    amikor rendszermagot friss&iacute;tett&uuml;nk vagy
+	    k&eacute;sz&iacute;tett&uuml;nk magunknak).</para>
 
 	  <note>

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 17:40:57 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 299FA16A420; Sat,  6 Oct 2007 17:40:57 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A921816A419
	for <perforce@freebsd.org>; Sat,  6 Oct 2007 17:40:56 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 90A1413C447
	for <perforce@freebsd.org>; Sat,  6 Oct 2007 17:40:56 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96HeuSN008999
	for <perforce@freebsd.org>; Sat, 6 Oct 2007 17:40:56 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96HeuhR008995
	for perforce@freebsd.org; Sat, 6 Oct 2007 17:40:56 GMT
	(envelope-from gabor@freebsd.org)
Date: Sat, 6 Oct 2007 17:40:56 GMT
Message-Id: <200710061740.l96HeuhR008995@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127258 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 17:40:57 -0000

http://perforce.freebsd.org/chv.cgi?CH=127258

Change 127258 by gabor@gabor_server on 2007/10/06 17:40:04

	IFC

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/firewalls/chapter.sgml#2 integrate
.. //depot/projects/docproj_hu/books/handbook/security/chapter.sgml#2 integrate
.. //depot/projects/docproj_hu/share/sgml/catalog#4 integrate
.. //depot/projects/docproj_hu/share/sgml/freebsd.dsl#3 integrate

Differences ...

==== //depot/projects/docproj_hu/books/handbook/firewalls/chapter.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.76 2007/07/02 19:46:27 remko Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/firewalls/chapter.sgml,v 1.77 2007/10/06 00:04:22 trhodes Exp $
 -->
 
 <chapter id="firewalls">
@@ -221,7 +221,7 @@
 	  <literal>NOINET6</literal> for &os; prior to 6.0-RELEASE and
 	  <literal>NO_INET6</literal> for later releases (for example in
 	  &man.make.conf.5;) was defined during the build, it also
-	  requires<literal>options INET6</literal>.</para>
+	  requires <literal>options INET6</literal>.</para>
       </note>
 
       <para>Once the kernel module is loaded or the kernel is statically

==== //depot/projects/docproj_hu/books/handbook/security/chapter.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.314 2007/09/03 16:39:51 keramida Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/security/chapter.sgml,v 1.315 2007/10/03 20:35:35 danger Exp $
 -->
 
 <chapter id="security">
@@ -4220,12 +4220,13 @@
         <filename>~/.ssh/id_dsa</filename> or
         <filename>~/.ssh/id_rsa</filename>, whereas the public key is
         stored in <filename>~/.ssh/id_dsa.pub</filename> or
-        <filename>~/.ssh/id_rsa.pub</filename>, respectively for DSA and
-        RSA key types.  The public key must be placed in
-        <filename>~/.ssh/authorized_keys</filename> of the remote
-        machine in order for the setup to work.  Similarly, RSA version
-        1 public keys should be placed in
-        <filename>~/.ssh/authorized_keys</filename>.</para>
+	<filename>~/.ssh/id_rsa.pub</filename>, respectively for
+	<acronym>DSA</acronym> and <acronym>RSA</acronym> key types.
+	The public key must be placed in the
+	<filename>~/.ssh/authorized_keys</filename> file of the	remote
+	machine for both <acronym>RSA</acronym> or
+	<acronym>DSA</acronym> keys in order for the setup to
+	work.</para>
 
       <para>This will allow connection to the remote machine based upon
         SSH keys instead of passwords.</para>

==== //depot/projects/docproj_hu/share/sgml/catalog#4 (text+ko) ====

@@ -4,25 +4,25 @@
   -- ...................................................................... --
   -- Hungarian specific ...................................................... --
   
-  -- $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/catalog,v 1.1 2007/04/15 15:23:55 gabor Exp $ --
+  -- $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/catalog,v 1.2 2007/10/01 13:37:44 gabor Exp $ --
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//HU"
 	"articles.ent"
 
+PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//HU"
+	"bookinfo.ent"
+
 PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//HU"
 	"books.ent"
 
-PUBLIC  "-//FreeBSD//ENTITIES DocBook BookInfo Entities//HU"
-        "bookinfo.ent"
-
-PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN"
-        "freebsd.dsl"
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
+	"freebsd.dsl"
 
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//HU"
 	"freebsd.dsl"
 
-PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
-	"freebsd.ent"
+PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//HU"
+	"freebsd.dsl"
 
 PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent"

==== //depot/projects/docproj_hu/share/sgml/freebsd.dsl#3 (text+ko) ====

@@ -1,5 +1,5 @@
 <!--
-	$FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl,v 1.1 2007/04/15 15:23:55 gabor Exp $
+	$FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl,v 1.2 2007/10/01 13:37:44 gabor Exp $
 	The FreeBSD Hungarian Documentation Project
 	Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
 	Original revision: 1.22
@@ -8,7 +8,7 @@
 <!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
 <!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
 
-<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//HU">
+<!ENTITY % freebsd.l10n PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN">
 %freebsd.l10n;
 
 <!ENTITY % output.html  "IGNORE"> 

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 18:24:45 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 769E716A41B; Sat,  6 Oct 2007 18:24:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 2CB5216A419
	for <perforce@freebsd.org>; Sat,  6 Oct 2007 18:24:45 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id F007D13C4A3
	for <perforce@freebsd.org>; Sat,  6 Oct 2007 18:24:44 +0000 (UTC)
	(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96IOiwN012518
	for <perforce@freebsd.org>; Sat, 6 Oct 2007 18:24:44 GMT
	(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96IOiIm012515
	for perforce@freebsd.org; Sat, 6 Oct 2007 18:24:44 GMT
	(envelope-from gabor@freebsd.org)
Date: Sat, 6 Oct 2007 18:24:44 GMT
Message-Id: <200710061824.l96IOiIm012515@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 127259 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 18:24:45 -0000

http://perforce.freebsd.org/chv.cgi?CH=127259

Change 127259 by gabor@gabor_server on 2007/10/06 18:24:36

	- Fix build after IFC

Affected files ...

.. //depot/projects/docproj_hu/share/sgml/catalog#5 edit

Differences ...

==== //depot/projects/docproj_hu/share/sgml/catalog#5 (text+ko) ====

@@ -24,6 +24,9 @@
 PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//HU"
 	"freebsd.dsl"
 
+PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
+	"freebsd.ent"
+
 PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
 	"l10n.ent"
 

From owner-p4-projects@FreeBSD.ORG  Sat Oct  6 22:22:23 2007
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9F68116A41A; Sat,  6 Oct 2007 22:22:22 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5676216A417
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 22:22:22 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 47B6213C45A
	for <perforce@FreeBSD.org>; Sat,  6 Oct 2007 22:22:22 +0000 (UTC)
	(envelope-from zec@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l96MMMKX044736
	for <perforce@FreeBSD.org>; Sat, 6 Oct 2007 22:22:22 GMT
	(envelope-from zec@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l96MMM7U044733
	for perforce@freebsd.org; Sat, 6 Oct 2007 22:22:22 GMT
	(envelope-from zec@FreeBSD.org)
Date: Sat, 6 Oct 2007 22:22:22 GMT
Message-Id: <200710062222.l96MMM7U044733@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	zec@FreeBSD.org using -f
From: Marko Zec <zec@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 127267 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 06 Oct 2007 22:22:23 -0000

http://perforce.freebsd.org/chv.cgi?CH=127267

Change 127267 by zec@zec_tpx32 on 2007/10/06 22:21:31

	Change the M_REMOTE_VNET mbuf flag so that it won't
	collide with the newly introduced M_NOFREE flag in -HEAD
	on next IFC.
	
	Apparently we are running out of bits in mbuf flags...

Affected files ...

.. //depot/projects/vimage/src/sys/sys/mbuf.h#8 edit

Differences ...

==== //depot/projects/vimage/src/sys/sys/mbuf.h#8 (text+ko) ====

@@ -192,7 +192,7 @@
 #define	M_LASTFRAG	0x2000	/* packet is last fragment */
 #define	M_VLANTAG	0x10000	/* ether_vtag is valid */
 #define	M_PROMISC	0x20000	/* packet was not for us */
-#define	M_REMOTE_VNET	0x40000	/* mbuf crossed boundary between two vnets */
+#define	M_REMOTE_VNET	0x80000	/* mbuf crossed boundary between two vnets */
 
 /*
  * External buffer types: identify ext_buf type.